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

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

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

Modified Files:
	StorageServlet.java 
Log Message:
Updated Root Key. This will be the root key for the remainder of the beta period. With version 1.0 I will update it with a new key.
VerifyingTest works now and also does a pass for fake ones. Will have to think of better ways of making fake Identities to break it.
Cleaned up much of the tests and they all pass now.
The FileStoreTests need to be rethought out, by adding a test key.

Index: StorageServlet.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/store/servlet/StorageServlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** StorageServlet.java	22 Sep 2003 19:24:02 -0000	1.2
--- StorageServlet.java	2 Oct 2003 23:29:03 -0000	1.3
***************
*** 9,21 ****
  package org.neuclear.store.servlet;
  
! import org.neuclear.receiver.ReceiverServlet;
  import org.neuclear.store.FileStore;
  import org.neuclear.store.Store;
  import org.neudist.utils.Utility;
  
  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");
--- 9,25 ----
  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.neudist.utils.Utility;
+ import org.neudist.xml.soap.SOAPException;
+ import org.neudist.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");
***************
*** 24,30 ****
          System.out.println("NEUDIST: Setting up store at: " + storePath);
          store = new FileStore(storePath);
-         setReceiver(store);
-     }
  
  
      private Store getStore() {
--- 28,33 ----
          System.out.println("NEUDIST: Setting up store at: " + storePath);
          store = new FileStore(storePath);
  
+     }
  
      private Store getStore() {
***************
*** 33,36 ****
--- 36,50 ----
  
      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;
+     }
  
  }