[Neuclear-develop] neuclear-id/src/java/org/neuclear/signers/servlet SigningServlet.java,1.27,1.28

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

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

Modified Files:
	SigningServlet.java 
Log Message:
Now builds.
Now need to do unit tests

Index: SigningServlet.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/signers/servlet/SigningServlet.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** SigningServlet.java	19 Dec 2003 18:03:35 -0000	1.27
--- SigningServlet.java	13 Jan 2004 15:11:35 -0000	1.28
***************
*** 2,5 ****
--- 2,9 ----
   * $Id$
   * $Log$
+  * Revision 1.28  2004/01/13 15:11:35  pelle
+  * Now builds.
+  * Now need to do unit tests
+  *
   * Revision 1.27  2003/12/19 18:03:35  pelle
   * Revamped a lot of exception handling throughout the framework, it has been simplified in most places:
***************
*** 263,266 ****
--- 267,271 ----
  import org.neuclear.id.SignedNamedObject;
  import org.neuclear.id.builders.NamedObjectBuilder;
+ import org.neuclear.id.builders.Builder;
  import org.neuclear.id.verifier.VerifyingReader;
  import org.neuclear.xml.XMLException;
***************
*** 323,332 ****
          ServletTools.printHeader(out, request, getTitle());
          final String endpoint = request.getParameter("endpoint");
!         final NamedObjectBuilder named = sigreq.getUnsigned();
!         final String parent = NSTools.getSignatoryURI(named.getName());
          boolean isSigned = false;
!         if (!signer.canSignFor(parent)) {
               out.println("<h3>Can not Sign for:");
!             out.println(parent);
              out.println("</h3>");
          }
--- 328,337 ----
          ServletTools.printHeader(out, request, getTitle());
          final String endpoint = request.getParameter("endpoint");
!         final Builder named = sigreq.getUnsigned();
!         final String username = sigreq.getUserid();
          boolean isSigned = false;
!         if (!signer.canSignFor(username)) {
               out.println("<h3>Can not Sign for:");
!             out.println(username);
              out.println("</h3>");
          }
***************
*** 352,359 ****
          if (isReadyToSign(request)) {
  
!             out.println("<div id=\"log\" style=\"background:#003;color:#EEE\"><tt><ul><li>Signing with " + parent + "...</li>");
              out.flush();
              try {
!                 isSigned = sign(named, out);
  
              } catch (InvalidNamedObjectException e) {
--- 357,364 ----
          if (isReadyToSign(request)) {
  
!             out.println("<div id=\"log\" style=\"background:#003;color:#EEE\"><tt><ul><li>Signing with " + username + "...</li>");
              out.flush();
              try {
!                 isSigned = sign(named,username, out);
  
              } catch (InvalidNamedObjectException e) {
***************
*** 397,404 ****
      }
  
!     private boolean sign(final NamedObjectBuilder named, final PrintWriter out) throws NeuClearException, XMLException {
          boolean isSigned;
!         context.log("SIGN: Signing with " + named.getSignatory().getName());
!         final SignedNamedObject signed = named.sign(signer);
          isSigned = true;
          out.println("<li>Signed</li>");
--- 402,409 ----
      }
  
!     private boolean sign(final Builder named, String username,final PrintWriter out) throws NeuClearException, XMLException {
          boolean isSigned;
!         context.log("SIGN: Signing with " + username);
!         final SignedNamedObject signed = named.convert(username,signer);
          isSigned = true;
          out.println("<li>Signed</li>");