[Neuclear-develop] neuclear-id/src/java/org/neuclear/receiver ReceiverServlet.java,1.9,1.10

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

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

Modified Files:
	ReceiverServlet.java 
Log Message:
Getting the NeuClear web transactions working.

Index: ReceiverServlet.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/receiver/ReceiverServlet.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ReceiverServlet.java	24 Nov 2003 23:33:37 -0000	1.9
--- ReceiverServlet.java	28 Nov 2003 00:12:58 -0000	1.10
***************
*** 2,5 ****
--- 2,8 ----
   * $Id$
   * $Log$
+  * Revision 1.10  2003/11/28 00:12:58  pelle
+  * Getting the NeuClear web transactions working.
+  *
   * Revision 1.9  2003/11/24 23:33:37  pelle
   * More Cactus unit testing going on.
***************
*** 94,100 ****
  import org.dom4j.Element;
  import org.neuclear.commons.NeuClearException;
  import org.neuclear.id.verifier.VerifyingReader;
  import org.neuclear.xml.ElementProxy;
- import org.neuclear.xml.XMLException;
  import org.neuclear.xml.soap.XMLInputStreamServlet;
  
--- 97,103 ----
  import org.dom4j.Element;
  import org.neuclear.commons.NeuClearException;
+ import org.neuclear.id.SignedNamedObject;
  import org.neuclear.id.verifier.VerifyingReader;
  import org.neuclear.xml.ElementProxy;
  import org.neuclear.xml.soap.XMLInputStreamServlet;
  
***************
*** 122,126 ****
          }
          try {
!             ElementProxy receipt = receiver.receive(VerifyingReader.getInstance().read(is));
              if (isXML)
                  writer.print(receipt.canonicalize());
--- 125,135 ----
          }
          try {
! 
!             final SignedNamedObject obj = VerifyingReader.getInstance().read(is);
!             if (obj == null)
!                 throw new NeuClearException("Missing Request");
!             ctx.log("NeuClear: Got Request " + obj.getName());
!             ctx.log(obj.getEncoded());
!             ElementProxy receipt = receiver.receive(obj);
              if (isXML)
                  writer.print(receipt.canonicalize());
***************
*** 128,135 ****
                  writer.print(receipt.getTagName());
  
!         } catch (NeuClearException e) {
!             e.printStackTrace(writer);
!         } catch (XMLException e) {
              e.printStackTrace(writer);
          }
          writer.close();
--- 137,146 ----
                  writer.print(receipt.getTagName());
  
!         } catch (Exception e) {
!             writer.println("<h1>Error</h1><h3>");
!             writer.println(e.getLocalizedMessage());
!             writer.println("</h3><pre>");
              e.printStackTrace(writer);
+             writer.println("</pre>");
          }
          writer.close();