[Neuclear-develop] neuclear-pay/src/java/org/neuclear/asset/receiver AssetControllerReceiver.java,1.5,1.6

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

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

Modified Files:
	AssetControllerReceiver.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: AssetControllerReceiver.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/receiver/AssetControllerReceiver.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** AssetControllerReceiver.java	21 Nov 2003 04:43:04 -0000	1.5
--- AssetControllerReceiver.java	22 Nov 2003 00:22:29 -0000	1.6
***************
*** 1,20 ****
  package org.neuclear.asset.receiver;
  
! import org.neuclear.asset.*;
  import org.neuclear.asset.contracts.*;
! import org.neuclear.asset.contracts.builders.TransferReceiptBuilder;
! import org.neuclear.asset.contracts.builders.TransferBuilder;
  import org.neuclear.id.SignedNamedObject;
  import org.neuclear.id.builders.NamedObjectBuilder;
  import org.neuclear.id.verifier.VerifyingReader;
- import org.neuclear.ledger.InvalidTransactionException;
- import org.neuclear.ledger.LowlevelLedgerException;
- import org.neuclear.ledger.UnBalancedTransactionException;
- import org.neuclear.ledger.UnknownBookException;
  import org.neuclear.receiver.Receiver;
  import org.neuclear.receiver.UnsupportedTransaction;
- import org.neuclear.commons.crypto.signers.Signer;
- import org.neuclear.commons.crypto.CryptoException;
- import org.neuclear.commons.NeuClearException;
  import org.neuclear.xml.ElementProxy;
  import org.neuclear.xml.xmlsec.XMLSecurityException;
--- 1,14 ----
  package org.neuclear.asset.receiver;
  
! import org.neuclear.asset.AssetController;
! import org.neuclear.asset.TransferException;
  import org.neuclear.asset.contracts.*;
! import org.neuclear.commons.NeuClearException;
! import org.neuclear.commons.crypto.signers.Signer;
  import org.neuclear.id.SignedNamedObject;
  import org.neuclear.id.builders.NamedObjectBuilder;
  import org.neuclear.id.verifier.VerifyingReader;
  import org.neuclear.receiver.Receiver;
  import org.neuclear.receiver.UnsupportedTransaction;
  import org.neuclear.xml.ElementProxy;
  import org.neuclear.xml.xmlsec.XMLSecurityException;
***************
*** 58,62 ****
       * @throws UnsupportedTransaction 
       */
!     public final ElementProxy receive(final SignedNamedObject obj) throws UnsupportedTransaction {
          if (obj instanceof AssetTransactionContract) {
              final TransferContract transfer = (TransferContract) obj;
--- 52,56 ----
       * @throws UnsupportedTransaction 
       */
!     public final ElementProxy receive(final SignedNamedObject obj) throws NeuClearException {
          if (obj instanceof AssetTransactionContract) {
              final TransferContract transfer = (TransferContract) obj;
***************
*** 70,89 ****
                  //TODO do something with receipt
  
-             } catch (InvalidTransferException e) {
-                 e.printStackTrace();  //TODO Handle exception
-             } catch (LowLevelPaymentException e) {
-                 e.printStackTrace();  //TODO Handle exception
              } catch (XMLSecurityException e) {
!                 e.printStackTrace();  //TODO Handle exception
!             } catch (TransferDeniedException e) {
!                 e.printStackTrace();  //TODO Handle exception
!             } catch (CryptoException e) {
!                 e.printStackTrace();  //TODO Handle exception
!             } catch (NeuClearException e) {
!                 e.printStackTrace();  //TODO Handle exception
              }
          } else
              throw new UnsupportedTransaction(obj);
-         return null;
      }
  
--- 64,75 ----
                  //TODO do something with receipt
  
              } catch (XMLSecurityException e) {
!                 throw new NeuClearException(e);
! 
!             } catch (TransferException e) {
!                 throw new NeuClearException(e);
              }
          } else
              throw new UnsupportedTransaction(obj);
      }