[Neuclear-develop] neuclear-pay/src/java/org/neuclear/asset AssetController.java,1.7,1.8

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

Update of /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset
In directory sc8-pr-cvs1:/tmp/cvs-serv16822/src/java/org/neuclear/asset

Modified Files:
	AssetController.java 
Log Message:
All unit tests in commons, id and xmlsec now work.
AssetController now successfully processes payments in the unit test.
Payment Web App has working form that creates a TransferRequest presents it to the signer
and forwards it to AssetControlServlet. (Which throws an XML Parser Exception) I think the XMLReaderServlet is bust.

Index: AssetController.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/AssetController.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** AssetController.java	21 Nov 2003 04:43:04 -0000	1.7
--- AssetController.java	22 Nov 2003 00:22:29 -0000	1.8
***************
*** 3,8 ****
  import org.neuclear.asset.contracts.*;
  import org.neuclear.asset.contracts.builders.CancelHeldTransferReceiptBuilder;
- import org.neuclear.id.builders.NamedObjectBuilder;
  import org.neuclear.commons.NeuClearException;
  
  /*
--- 3,8 ----
  import org.neuclear.asset.contracts.*;
  import org.neuclear.asset.contracts.builders.CancelHeldTransferReceiptBuilder;
  import org.neuclear.commons.NeuClearException;
+ import org.neuclear.id.builders.NamedObjectBuilder;
  
  /*
***************
*** 26,29 ****
--- 26,35 ----
  $Id$
  $Log$
+ Revision 1.8  2003/11/22 00:22:29  pelle
+ All unit tests in commons, id and xmlsec now work.
+ AssetController now successfully processes payments in the unit test.
+ Payment Web App has working form that creates a TransferRequest presents it to the signer
+ and forwards it to AssetControlServlet. (Which throws an XML Parser Exception) I think the XMLReaderServlet is bust.
+ 
  Revision 1.7  2003/11/21 04:43:04  pelle
  EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
***************
*** 89,99 ****
      public final NamedObjectBuilder process(final AssetTransactionContract contract) throws TransferDeniedException, LowLevelPaymentException, InvalidTransferException, NeuClearException {
          if (contract instanceof TransferRequest)
!             return processTransfer((TransferRequest) contract);
          if (contract instanceof HeldTransferRequest)
!             return processHeldTransfer((HeldTransferRequest) contract);
          if (contract instanceof CompleteHeldTransferRequest)
!             return processCompleteHold((CompleteHeldTransferRequest) contract);
          if (contract instanceof CancelHeldTransferRequest)
!             return processCancelHold((CancelHeldTransferRequest) contract);
  
          return null;
--- 95,105 ----
      public final NamedObjectBuilder process(final AssetTransactionContract contract) throws TransferDeniedException, LowLevelPaymentException, InvalidTransferException, NeuClearException {
          if (contract instanceof TransferRequest)
!             return process((TransferRequest) contract);
          if (contract instanceof HeldTransferRequest)
!             return process((HeldTransferRequest) contract);
          if (contract instanceof CompleteHeldTransferRequest)
!             return process((CompleteHeldTransferRequest) contract);
          if (contract instanceof CancelHeldTransferRequest)
!             return process((CancelHeldTransferRequest) contract);
  
          return null;
***************
*** 118,122 ****
       * @throws InvalidTransferException 
       */
!     public abstract org.neuclear.asset.contracts.builders.TransferReceiptBuilder processTransfer(TransferRequest req) throws LowLevelPaymentException, TransferDeniedException, InvalidTransferException, NeuClearException;
  
      /**
--- 124,128 ----
       * @throws InvalidTransferException 
       */
!     public abstract org.neuclear.asset.contracts.builders.TransferReceiptBuilder process(TransferRequest req) throws LowLevelPaymentException, TransferDeniedException, InvalidTransferException, NeuClearException;
  
      /**
***************
*** 131,135 ****
       * @throws InvalidTransferException 
       */
!     public abstract org.neuclear.asset.contracts.builders.HeldTransferReceiptBuilder processHeldTransfer(HeldTransferRequest req) throws LowLevelPaymentException, TransferDeniedException, InvalidTransferException, NeuClearException;
  
      /**
--- 137,141 ----
       * @throws InvalidTransferException 
       */
!     public abstract org.neuclear.asset.contracts.builders.HeldTransferReceiptBuilder process(HeldTransferRequest req) throws LowLevelPaymentException, TransferDeniedException, InvalidTransferException, NeuClearException;
  
      /**
***************
*** 142,146 ****
       * @throws InvalidTransferException 
       */
!     public abstract org.neuclear.asset.contracts.builders.TransferReceiptBuilder processCompleteHold(CompleteHeldTransferRequest complete) throws LowLevelPaymentException, TransferDeniedException, InvalidTransferException, NeuClearException;
  
      /**
--- 148,152 ----
       * @throws InvalidTransferException 
       */
!     public abstract org.neuclear.asset.contracts.builders.TransferReceiptBuilder process(CompleteHeldTransferRequest complete) throws LowLevelPaymentException, TransferDeniedException, InvalidTransferException, NeuClearException;
  
      /**
***************
*** 154,158 ****
       */
  
!     public abstract CancelHeldTransferReceiptBuilder processCancelHold(CancelHeldTransferRequest cancel) throws LowLevelPaymentException, TransferDeniedException, InvalidTransferException, NeuClearException;
  
      //TODO Add getBalance
--- 160,166 ----
       */
  
!     public abstract CancelHeldTransferReceiptBuilder process(CancelHeldTransferRequest cancel) throws LowLevelPaymentException, TransferDeniedException, InvalidTransferException, NeuClearException;
! 
! 
  
      //TODO Add getBalance