[Neuclear-develop] neuclear-pay/src/webapp/SECURE transfer.jsp,1.9,1.10

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

Update of /cvsroot/neuclear/neuclear-pay/src/webapp/SECURE
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5208/src/webapp/SECURE

Modified Files:
	transfer.jsp 
Log Message:
Fixed Exchange tests and Cactus tests working on web app.

Index: transfer.jsp
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/webapp/SECURE/transfer.jsp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** transfer.jsp	5 Apr 2004 16:31:45 -0000	1.9
--- transfer.jsp	14 Apr 2004 23:51:13 -0000	1.10
***************
*** 1,5 ****
  <%@ page import="org.neuclear.id.Identity,
                   org.neuclear.commons.Utility,
!                  org.neuclear.asset.orders.builders.TransferRequestBuilder,
                   org.neuclear.id.resolver.Resolver,
                   org.neuclear.asset.contracts.Asset,
--- 1,5 ----
  <%@ page import="org.neuclear.id.Identity,
                   org.neuclear.commons.Utility,
!                  org.neuclear.asset.orders.builders.TransferOrderBuilder,
                   org.neuclear.id.resolver.Resolver,
                   org.neuclear.asset.contracts.Asset,
***************
*** 7,23 ****
                   org.neuclear.id.builders.SignatureRequestBuilder,
                   org.neuclear.asset.contracts.AssetGlobals,
!                  org.neuclear.asset.orders.transfers.TransferGlobals,
                   org.neuclear.asset.servlet.AssetControllerServlet,
                   org.neuclear.id.SignedNamedObject,
                   org.neuclear.commons.crypto.Base64,
                   org.neuclear.commons.servlets.ServletTools,
!                  org.neuclear.asset.orders.transfers.TransferGlobals,
!                  org.neuclear.id.Service"%>
  <%
      AssetGlobals.registerReaders();
      TransferGlobals.registerReaders();
!     Identity userns=(Identity) request.getUserPrincipal();
      String service=ServletTools.getInitParam("service",config);
!     Service asset=(Service)Resolver.resolveIdentity(service);
      String recipient=Utility.denullString(request.getParameter("recipient"));
      double amount=Double.parseDouble(Utility.denullString(request.getParameter("amount"),"0"));
--- 7,25 ----
                   org.neuclear.id.builders.SignatureRequestBuilder,
                   org.neuclear.asset.contracts.AssetGlobals,
! 
                   org.neuclear.asset.servlet.AssetControllerServlet,
                   org.neuclear.id.SignedNamedObject,
                   org.neuclear.commons.crypto.Base64,
                   org.neuclear.commons.servlets.ServletTools,
!                  org.neuclear.id.Service,
!                  org.neuclear.asset.orders.TransferGlobals,
!                  org.neuclear.id.Signatory,
!                  org.neuclear.asset.orders.Amount"%>
  <%
      AssetGlobals.registerReaders();
      TransferGlobals.registerReaders();
!     Signatory userns=(Signatory) request.getUserPrincipal();
      String service=ServletTools.getInitParam("service",config);
! //    Service asset=(Service)Resolver.resolveIdentity(service);
      String recipient=Utility.denullString(request.getParameter("recipient"));
      double amount=Double.parseDouble(Utility.denullString(request.getParameter("amount"),"0"));
***************
*** 49,65 ****
  </p>
  <% } else {
!     TransferRequestBuilder transfer=new TransferRequestBuilder(
!             asset,
!             userns,
!             Resolver.resolveIdentity(recipient),
!             amount,
!             TimeTools.now(),
              comment
      ) ;
!     SignatureRequestBuilder sigreq=new SignatureRequestBuilder(service,userns.getName(),transfer,comment);
!     SignedNamedObject sig=sigreq.sign(getSigner());
  
  %>
! <form action="<%=userns.getSigner()%>" method="POST">
  <input name="neuclear-request" value="<%=Base64.encode(sig.getEncoded().getBytes())%>" type="hidden">
  <input name="endpoint" value="<%=ServletTools.getAbsoluteURL(request, "/Asset")%>" type="hidden">
--- 51,65 ----
  </p>
  <% } else {
!     TransferOrderBuilder transfer=new TransferOrderBuilder(
!             service,
!             recipient,
!             new Amount(amount),
              comment
      ) ;
!     SignatureRequestBuilder sigreq=new SignatureRequestBuilder(transfer,comment);
!     SignedNamedObject sig=sigreq.sign();
  
  %>
! <form action="http://localhost:11870/Signer" method="POST">
  <input name="neuclear-request" value="<%=Base64.encode(sig.getEncoded().getBytes())%>" type="hidden">
  <input name="endpoint" value="<%=ServletTools.getAbsoluteURL(request, "/Asset")%>" type="hidden">