[Neuclear-develop] neuclear-pay/src/java/org/neuclear/asset AssetController.java,1.10,1.11 ExpiredHeldTransferException.java,1.6,1.7 TransferDeniedException.java,1.6,1.7 TransferLargerThanHeldException.java,1.6,1.7 TransferNotStartedException.java,1.4,1.5

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

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

Modified Files:
	AssetController.java ExpiredHeldTransferException.java 
	TransferDeniedException.java 
	TransferLargerThanHeldException.java 
	TransferNotStartedException.java 
Log Message:
Implemented new Schema for Transfer*
Working on it for Exchange*, so far all Receipts are implemented.
Added SignedNamedDocument which is a generic SignedNamedObject that works with all Signed XML.
Changed SignedNamedObject.getDigest() from byte array to String.
The whole malarchy in neuclear-pay does not build yet. The refactoring is a big job, but getting there.

Index: AssetController.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/AssetController.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** AssetController.java	5 Jan 2004 23:47:10 -0000	1.10
--- AssetController.java	10 Jan 2004 00:00:45 -0000	1.11
***************
*** 1,17 ****
  package org.neuclear.asset;
  
! import org.neuclear.asset.contracts.*;
! import org.neuclear.exchange.orders.builders.CancelExchangeReceiptBuilder;
! import org.neuclear.asset.orders.exchanges.ExchangeOrder;
! import org.neuclear.asset.orders.AssetTransactionContract;
! import org.neuclear.asset.orders.TransferOrder;
  import org.neuclear.asset.orders.AssetTransactionContract;
  import org.neuclear.asset.orders.TransferOrder;
  import org.neuclear.commons.NeuClearException;
- import org.neuclear.id.builders.NamedObjectBuilder;
  import org.neuclear.exchange.orders.CancelExchangeOrder;
  import org.neuclear.exchange.orders.ExchangeCompletionOrder;
! import org.neuclear.exchange.orders.*;
  import org.neuclear.exchange.orders.builders.CancelExchangeReceiptBuilder;
  
  /*
--- 1,13 ----
  package org.neuclear.asset;
  
! import org.neuclear.asset.contracts.Asset;
  import org.neuclear.asset.orders.AssetTransactionContract;
  import org.neuclear.asset.orders.TransferOrder;
  import org.neuclear.commons.NeuClearException;
  import org.neuclear.exchange.orders.CancelExchangeOrder;
  import org.neuclear.exchange.orders.ExchangeCompletionOrder;
! import org.neuclear.exchange.orders.ExchangeOrder;
  import org.neuclear.exchange.orders.builders.CancelExchangeReceiptBuilder;
+ import org.neuclear.id.builders.NamedObjectBuilder;
  
  /*
***************
*** 35,38 ****
--- 31,41 ----
  $Id$
  $Log$
+ Revision 1.11  2004/01/10 00:00:45  pelle
+ Implemented new Schema for Transfer*
+ Working on it for Exchange*, so far all Receipts are implemented.
+ Added SignedNamedDocument which is a generic SignedNamedObject that works with all Signed XML.
+ Changed SignedNamedObject.getDigest() from byte array to String.
+ The whole malarchy in neuclear-pay does not build yet. The refactoring is a big job, but getting there.
+ 
  Revision 1.10  2004/01/05 23:47:10  pelle
  Create new Document classification "order", which is really just inherint in the new

Index: ExpiredHeldTransferException.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/ExpiredHeldTransferException.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ExpiredHeldTransferException.java	5 Jan 2004 23:47:10 -0000	1.6
--- ExpiredHeldTransferException.java	10 Jan 2004 00:00:45 -0000	1.7
***************
*** 1,11 ****
  package org.neuclear.asset;
  
- import org.neuclear.asset.orders.exchanges.Exchange;
- import org.neuclear.exchange.orders.ExchangeCompletionOrder;
- import org.neuclear.exchange.orders.ExchangeCompletionOrder;
  import org.neuclear.exchange.orders.ExchangeCompletionOrder;
  
- import java.util.Date;
- 
  /**
   * User: pelleb
--- 1,6 ----
***************
*** 26,30 ****
  
      public String getSubMessage() {
!         return "Not possible to complete held payment at this time: " + held.getValueTime();
      }
  }
--- 21,25 ----
  
      public String getSubMessage() {
!         return "Not possible to complete held payment at this time: " + held.getValuetime();
      }
  }

Index: TransferDeniedException.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/TransferDeniedException.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TransferDeniedException.java	5 Jan 2004 23:47:10 -0000	1.6
--- TransferDeniedException.java	10 Jan 2004 00:00:45 -0000	1.7
***************
*** 1,6 ****
  package org.neuclear.asset;
  
- import org.neuclear.asset.orders.TransferOrder;
- import org.neuclear.exchange.orders.CancelExchangeOrder;
  import org.neuclear.asset.orders.AssetTransactionContract;
  import org.neuclear.exchange.orders.CancelExchangeOrder;
--- 1,4 ----
***************
*** 27,30 ****
--- 25,35 ----
  $Id$
  $Log$
+ Revision 1.7  2004/01/10 00:00:45  pelle
+ Implemented new Schema for Transfer*
+ Working on it for Exchange*, so far all Receipts are implemented.
+ Added SignedNamedDocument which is a generic SignedNamedObject that works with all Signed XML.
+ Changed SignedNamedObject.getDigest() from byte array to String.
+ The whole malarchy in neuclear-pay does not build yet. The refactoring is a big job, but getting there.
+ 
  Revision 1.6  2004/01/05 23:47:10  pelle
  Create new Document classification "order", which is really just inherint in the new

Index: TransferLargerThanHeldException.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/TransferLargerThanHeldException.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TransferLargerThanHeldException.java	5 Jan 2004 23:47:10 -0000	1.6
--- TransferLargerThanHeldException.java	10 Jan 2004 00:00:45 -0000	1.7
***************
*** 2,7 ****
  
  
- import org.neuclear.exchange.orders.ExchangeOrderReceipt;
- import org.neuclear.exchange.orders.ExchangeCompletionOrder;
  import org.neuclear.exchange.orders.ExchangeCompletionOrder;
  
--- 2,5 ----

Index: TransferNotStartedException.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/TransferNotStartedException.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TransferNotStartedException.java	5 Jan 2004 23:47:10 -0000	1.4
--- TransferNotStartedException.java	10 Jan 2004 00:00:45 -0000	1.5
***************
*** 2,6 ****
  
  import org.neuclear.asset.orders.TransferReceipt;
- import org.neuclear.asset.orders.TransferReceipt;
  
  import java.util.Date;
--- 2,5 ----