|
From: <pe...@us...> - 2003-12-12 15:12:53
|
Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/receiver
In directory sc8-pr-cvs1:/tmp/cvs-serv4750/src/java/org/neuclear/receiver
Modified Files:
ReceiverServlet.java
Log Message:
The ReceiverServletTest now passes.
Add first stab at a SigningServletTest which currently doesnt pass.
Index: ReceiverServlet.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/receiver/ReceiverServlet.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ReceiverServlet.java 12 Dec 2003 00:13:11 -0000 1.12
--- ReceiverServlet.java 12 Dec 2003 15:12:50 -0000 1.13
***************
*** 2,5 ****
--- 2,9 ----
* $Id$
* $Log$
+ * Revision 1.13 2003/12/12 15:12:50 pelle
+ * The ReceiverServletTest now passes.
+ * Add first stab at a SigningServletTest which currently doesnt pass.
+ *
* Revision 1.12 2003/12/12 00:13:11 pelle
* This may actually work now. Need to put a few more test cases in to make sure.
***************
*** 106,109 ****
--- 110,114 ----
import org.neuclear.id.verifier.VerifyingReader;
import org.neuclear.xml.ElementProxy;
+ import org.neuclear.xml.XMLException;
import org.neuclear.xml.soap.XMLInputStreamServlet;
***************
*** 121,126 ****
}
! protected final void handleInputStream(final InputStream is, final HttpServletRequest request, final HttpServletResponse response) throws IOException {
! final PrintWriter writer = response.getWriter();
final boolean isXML = request.getContentType().equals("text/xml");
if (isXML) {
--- 126,130 ----
}
! protected final void handleInputStream(final InputStream is, final HttpServletRequest request, final HttpServletResponse response) throws IOException, NeuClearException, XMLException {
final boolean isXML = request.getContentType().equals("text/xml");
if (isXML) {
***************
*** 128,153 ****
} else {
response.setContentType("text/html");
- writer.print("<html><head><title>ReceiverServler</title></head><body>");
}
! 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());
! else
! writer.print(receipt.getElement().getName());
! } 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();
--- 132,154 ----
} else {
response.setContentType("text/html");
}
! final PrintWriter writer = response.getWriter();
! if (!isXML)
! writer.print("<html><head><title>ReceiverServler</title></head><body>");
! 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());
! else{
! writer.print("<h1>");
! writer.print(receipt.getElement().getName());
! writer.print("</h1>");
}
+
writer.close();
|