[Neuclear-develop] neuclear-pay/src/java/org/neuclear/asset/servlet AssetControllerServlet.java,1.3,1.4 TransferRequestServlet.java,1.2,1.3

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

Update of /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/servlet
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4049/src/java/org/neuclear/asset/servlet

Modified Files:
	AssetControllerServlet.java TransferRequestServlet.java 
Log Message:
Split Identity into Signatory and Identity class.
Identity remains a signed named object and will in the future just be used for self declared information.
Signatory now contains the PublicKey etc and is NOT a signed object.

Index: TransferRequestServlet.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/servlet/TransferRequestServlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TransferRequestServlet.java	2 Mar 2004 18:58:35 -0000	1.2
--- TransferRequestServlet.java	1 Apr 2004 23:18:33 -0000	1.3
***************
*** 2,15 ****
  
  import org.neuclear.asset.InvalidTransferException;
- import org.neuclear.asset.orders.builders.TransferOrderBuilder;
- import org.neuclear.asset.orders.Amount;
  import org.neuclear.asset.contracts.Asset;
  import org.neuclear.commons.NeuClearException;
  import org.neuclear.commons.Utility;
- import org.neuclear.commons.time.TimeTools;
  import org.neuclear.id.Identity;
  import org.neuclear.id.InvalidNamedObjectException;
  import org.neuclear.id.builders.Builder;
! import org.neuclear.id.resolver.NSResolver;
  import org.neuclear.id.signers.SignatureRequestServlet;
  
--- 2,14 ----
  
  import org.neuclear.asset.InvalidTransferException;
  import org.neuclear.asset.contracts.Asset;
+ import org.neuclear.asset.orders.Amount;
+ import org.neuclear.asset.orders.builders.TransferOrderBuilder;
  import org.neuclear.commons.NeuClearException;
  import org.neuclear.commons.Utility;
  import org.neuclear.id.Identity;
  import org.neuclear.id.InvalidNamedObjectException;
  import org.neuclear.id.builders.Builder;
! import org.neuclear.id.resolver.Resolver;
  import org.neuclear.id.signers.SignatureRequestServlet;
  
***************
*** 36,39 ****
--- 35,43 ----
  $Id$
  $Log$
+ Revision 1.3  2004/04/01 23:18:33  pelle
+ Split Identity into Signatory and Identity class.
+ Identity remains a signed named object and will in the future just be used for self declared information.
+ Signatory now contains the PublicKey etc and is NOT a signed object.
+ 
  Revision 1.2  2004/03/02 18:58:35  pelle
  Further cleanups in neuclear-id. Moved everything under id.
***************
*** 83,99 ****
   * Time: 6:37:19 PM
   */
! public class TransferRequestServlet extends SignatureRequestServlet{
      protected Builder createBuilder(HttpServletRequest request) throws NeuClearException {
!         Asset asset=(Asset) NSResolver.resolveIdentity(getServiceid());
!         Identity user=(Identity) request.getUserPrincipal();
!         if (user==null)
!             user=NSResolver.resolveIdentity(request.getParameter("sender"));
!         Identity to=NSResolver.resolveIdentity(request.getParameter("recipient"));
!         double amount=Double.parseDouble(Utility.denullString(request.getParameter("amount"),"0"));
!         String comment=Utility.denullString(request.getParameter("comment"));
          try {
!             return new TransferOrderBuilder(asset,to,new Amount(amount),comment);
          } catch (InvalidTransferException e) {
!             throw new InvalidNamedObjectException(user.getName(),e);
          }
      }
--- 87,103 ----
   * Time: 6:37:19 PM
   */
! public class TransferRequestServlet extends SignatureRequestServlet {
      protected Builder createBuilder(HttpServletRequest request) throws NeuClearException {
!         Asset asset = (Asset) Resolver.resolveIdentity(getServiceid());
!         Identity user = (Identity) request.getUserPrincipal();
!         if (user == null)
!             user = Resolver.resolveIdentity(request.getParameter("sender"));
!         Identity to = Resolver.resolveIdentity(request.getParameter("recipient"));
!         double amount = Double.parseDouble(Utility.denullString(request.getParameter("amount"), "0"));
!         String comment = Utility.denullString(request.getParameter("comment"));
          try {
!             return new TransferOrderBuilder(asset, to, new Amount(amount), comment);
          } catch (InvalidTransferException e) {
!             throw new InvalidNamedObjectException(user.getName(), e);
          }
      }

Index: AssetControllerServlet.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/servlet/AssetControllerServlet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AssetControllerServlet.java	21 Mar 2004 00:48:45 -0000	1.3
--- AssetControllerServlet.java	1 Apr 2004 23:18:33 -0000	1.4
***************
*** 8,12 ****
  import org.neuclear.commons.servlets.ServletTools;
  import org.neuclear.id.receiver.ReceiverServlet;
! import org.neuclear.id.resolver.NSResolver;
  
  import javax.servlet.ServletConfig;
--- 8,12 ----
  import org.neuclear.commons.servlets.ServletTools;
  import org.neuclear.id.receiver.ReceiverServlet;
! import org.neuclear.id.resolver.Resolver;
  
  import javax.servlet.ServletConfig;
***************
*** 33,36 ****
--- 33,41 ----
  $Id$
  $Log$
+ Revision 1.4  2004/04/01 23:18:33  pelle
+ Split Identity into Signatory and Identity class.
+ Identity remains a signed named object and will in the future just be used for self declared information.
+ Signatory now contains the PublicKey etc and is NOT a signed object.
+ 
  Revision 1.3  2004/03/21 00:48:45  pelle
  The problem with Enveloped signatures has now been fixed. It was a problem in the way transforms work. I have bandaided it, but in the future if better support for transforms need to be made, we need to rethink it a bit. Perhaps using the new crypto channel's in neuclear-commons.
***************
*** 111,115 ****
          TransferGlobals.registerReaders();
          try {
!             asset = (Asset) NSResolver.resolveIdentity(getServiceid());
              final AssetController receiver = new CurrencyController(null,
                      getSigner(),
--- 116,120 ----
          TransferGlobals.registerReaders();
          try {
!             asset = (Asset) Resolver.resolveIdentity(getServiceid());
              final AssetController receiver = new CurrencyController(null,
                      getSigner(),