[Neuclear-develop] neuclear-id/src/java/org/neuclear/store/servlet StorageServlet.java,1.4,1.5

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

Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/store/servlet
In directory sc8-pr-cvs1:/tmp/cvs-serv12836/src/java/org/neuclear/store/servlet

Modified Files:
	StorageServlet.java 
Log Message:
Signers now can generatekeys via the generateKey() method.
Refactored the relationship between SignedNamedObject and NamedObjectBuilder a bit.
SignedNamedObject now contains the full xml which is returned with getEncoded()
This means that it is now possible to further send on or process a SignedNamedObject, leaving
NamedObjectBuilder for its original purposes of purely generating new Contracts.
NamedObjectBuilder.sign() now returns a SignedNamedObject which is the prefered way of processing it.
Updated all major interfaces that used the old model to use the new model.

Index: StorageServlet.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/store/servlet/StorageServlet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** StorageServlet.java	11 Nov 2003 21:18:44 -0000	1.4
--- StorageServlet.java	19 Nov 2003 23:33:59 -0000	1.5
***************
*** 9,50 ****
  package org.neuclear.store.servlet;
  
- import org.dom4j.DocumentHelper;
- import org.dom4j.Element;
- import org.neuclear.id.builders.NamedObjectBuilder;
- import org.neuclear.store.FileStore;
- import org.neuclear.store.Store;
  import org.neuclear.commons.Utility;
! import org.neuclear.xml.soap.SOAPException;
! import org.neuclear.xml.soap.SOAPServlet;
  
  import javax.servlet.ServletConfig;
  import javax.servlet.ServletException;
  
! public class StorageServlet extends SOAPServlet {
      public void init(ServletConfig config) throws ServletException {
          System.out.println("NEUDIST: Initialising StorageServlet");
          super.init(config);
!         String storePath = config.getServletContext().getRealPath(Utility.denullString(config.getInitParameter("basedir"), "/WEB-INF/store"));
          System.out.println("NEUDIST: Setting up store at: " + storePath);
!         store = new FileStore(storePath);
! 
!     }
  
-     private Store getStore() {
-         return store;
      }
  
!     private Store store;
  
-     protected Element handleSOAPRequest(Element request, String soapAction) throws SOAPException {
-         try {
-             store.receive(new NamedObjectBuilder(request));
-         } catch (Exception e) {
-             Element error = DocumentHelper.createElement("Error");
-             error.setText(e.getMessage());
-             return error;
-         }
-         return request;
-     }
  
  }
--- 9,31 ----
  package org.neuclear.store.servlet;
  
  import org.neuclear.commons.Utility;
! import org.neuclear.receiver.ReceiverServlet;
! import org.neuclear.store.FileStore;
  
  import javax.servlet.ServletConfig;
  import javax.servlet.ServletException;
  
! public class StorageServlet extends ReceiverServlet {
      public void init(ServletConfig config) throws ServletException {
          System.out.println("NEUDIST: Initialising StorageServlet");
          super.init(config);
!         storePath = config.getServletContext().getRealPath(Utility.denullString(config.getInitParameter("basedir"), "/WEB-INF/store"));
          System.out.println("NEUDIST: Setting up store at: " + storePath);
!         setReceiver(new FileStore(storePath));
  
      }
  
!     private String storePath;
  
  
  }