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

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

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

Modified Files:
	SigningServlet.java 
Log Message:
End of work day clean up

Index: SigningServlet.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/signers/servlet/SigningServlet.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** SigningServlet.java	16 Dec 2003 23:17:07 -0000	1.24
--- SigningServlet.java	16 Dec 2003 23:44:10 -0000	1.25
***************
*** 2,5 ****
--- 2,8 ----
   * $Id$
   * $Log$
+  * Revision 1.25  2003/12/16 23:44:10  pelle
+  * End of work day clean up
+  *
   * Revision 1.24  2003/12/16 23:17:07  pelle
   * Work done on the SigningServlet. The two phase web model is now only an option.
***************
*** 310,315 ****
          final String endpoint = request.getParameter("endpoint");
          final NamedObjectBuilder named = sigreq.getUnsigned();
          boolean isSigned = false;
! 
          out.println("<table bgcolor=\"#708070\"><tr><td><h4 style=\"color: white\">");
          if (isSigned)
--- 313,323 ----
          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>");
!         }
          out.println("<table bgcolor=\"#708070\"><tr><td><h4 style=\"color: white\">");
          if (isSigned)
***************
*** 332,336 ****
          out.println("</td></tr></table>");
          if (isReadyToSign(request)) {
-             final String parent = NSTools.getSignatoryURI(named.getName());
  
              out.println("<div id=\"log\" style=\"background:#003;color:#EEE\"><tt><ul><li>Signing with " + parent + "...</li>");
--- 340,343 ----
***************
*** 345,349 ****
              } catch (UserCancelsException e) {
  //                System.out.println("<br><font color=\"red\"><b>ERROR: User Cancellation</b></font><br>");
!                 out.println("<li><font color=\"red\"><b>User Cancellation</b></font></li>");
                  isSigned = false;
              } catch (NonExistingSignerException e) {
--- 352,357 ----
              } catch (UserCancelsException e) {
  //                System.out.println("<br><font color=\"red\"><b>ERROR: User Cancellation</b></font><br>");
!                 out.println("<li><font color=\"red\"><b>You Cancelled</b></font></li>");
!                 out.println("<li onclick=\"history.back(2)\"><b>Click to Go back</b></li>");
                  isSigned = false;
              } catch (NonExistingSignerException e) {
***************
*** 381,385 ****
          boolean isSigned;
          try {
!             context.log("SIGN: Signing with " + signer);
              final SignedNamedObject signed = named.sign(signer);
              isSigned = true;
--- 389,393 ----
          boolean isSigned;
          try {
!             context.log("SIGN: Signing with " + named.getSignatory().getName());
              final SignedNamedObject signed = named.sign(signer);
              isSigned = true;
***************
*** 389,392 ****
--- 397,401 ----
          } catch (InvalidPassphraseException e) {
              out.println("<li><font color=\"red\"><b>ERROR: Wrong Passphrase</b></font></li>");
+             out.flush();
              isSigned = sign(named,out);
          }
***************
*** 395,399 ****
  
      protected void printSecondStageForm(HttpServletRequest request, final PrintWriter out, SignatureRequest sigreq, final String endpoint) {
!         out.println("<table><tr><td ><h4>Do you wish to sign this?</h4></td></tr></table>");
      }
  
--- 404,408 ----
  
      protected void printSecondStageForm(HttpServletRequest request, final PrintWriter out, SignatureRequest sigreq, final String endpoint) {
!         //out.println("<table><tr><td ><h4>Do you wish to sign this?</h4></td></tr></table>");
      }