[Neuclear-develop] neuclear-id/src/java/org/neuclear/receiver ReceiverServlet.java,1.14,1.15

[<pe...@us...>]

Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/receiver
In directory sc8-pr-cvs1:/tmp/cvs-serv26213/src/java/org/neuclear/receiver

Modified Files:
	ReceiverServlet.java 
Log Message:
added ServletTools.getInitParam() which first tries the ServletConfig, then the context config.
All the web.xml's have been updated to support this. Also various further generalizations have been done throughout
for getServiceid(), getTitle(), getSigner()

Index: ReceiverServlet.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/receiver/ReceiverServlet.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ReceiverServlet.java	14 Dec 2003 20:53:04 -0000	1.14
--- ReceiverServlet.java	15 Dec 2003 23:33:04 -0000	1.15
***************
*** 2,5 ****
--- 2,10 ----
   * $Id$
   * $Log$
+  * Revision 1.15  2003/12/15 23:33:04  pelle
+  * added ServletTools.getInitParam() which first tries the ServletConfig, then the context config.
+  * All the web.xml's have been updated to support this. Also various further generalizations have been done throughout
+  * for getServiceid(), getTitle(), getSigner()
+  *
   * Revision 1.14  2003/12/14 20:53:04  pelle
   * Added ServletPassPhraseAgent which uses ThreadLocal to transfer the passphrase to the signer.
***************
*** 116,119 ****
--- 121,125 ----
  import org.dom4j.Element;
  import org.neuclear.commons.NeuClearException;
+ import org.neuclear.commons.servlets.ServletTools;
  import org.neuclear.commons.crypto.signers.Signer;
  import org.neuclear.commons.crypto.signers.ServletSignerFactory;
***************
*** 137,147 ****
          super.init(config);
          try {
              signer=createSigner(config);
!         } catch (GeneralSecurityException e) {
!             e.printStackTrace();  //To change body of catch statement use Options | File Templates.
!         } catch (NeuClearException e) {
!             e.printStackTrace();  //To change body of catch statement use Options | File Templates.
!         } catch (IOException e) {
!             e.printStackTrace();  //To change body of catch statement use Options | File Templates.
          }
      }
--- 143,152 ----
          super.init(config);
          try {
+             serviceid = ServletTools.getInitParam("serviceid",config);
+             title = ServletTools.getInitParam("title",config);
              signer=createSigner(config);
!         } catch (Exception e) {
!             ctx.log("Error in ReceiverServlet: "+e.getLocalizedMessage());
!             throw new ServletException(e);
          }
      }
***************
*** 185,196 ****
      public Signer getSigner(){
          return signer;
!     }
      protected Signer createSigner(ServletConfig config) throws GeneralSecurityException, NeuClearException, IOException {
          return ServletSignerFactory.getInstance().createSigner(config);
      }
  
      private Receiver receiver;
      private Signer signer;
      private static final Element OK = DocumentHelper.createElement("Status");
  
      {
--- 190,209 ----
      public Signer getSigner(){
          return signer;
!     }      ;
      protected Signer createSigner(ServletConfig config) throws GeneralSecurityException, NeuClearException, IOException {
          return ServletSignerFactory.getInstance().createSigner(config);
      }
+     public final String getTitle(){
+         return title;
+     }
+     public final String getServiceid() {
+         return serviceid;
+     }
  
      private Receiver receiver;
      private Signer signer;
      private static final Element OK = DocumentHelper.createElement("Status");
+     private String serviceid;
+     private String title;
  
      {