|
From: <pe...@us...> - 2004-01-10 00:01:22
|
Update of /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/controllers/currency
In directory sc8-pr-cvs1:/tmp/cvs-serv22932/src/java/org/neuclear/asset/controllers/currency
Modified Files:
CurrencyController.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: CurrencyController.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/controllers/currency/CurrencyController.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** CurrencyController.java 5 Jan 2004 23:47:09 -0000 1.10
--- CurrencyController.java 10 Jan 2004 00:00:44 -0000 1.11
***************
*** 2,21 ****
import org.neuclear.asset.*;
import org.neuclear.exchange.orders.CancelExchangeOrder;
import org.neuclear.exchange.orders.ExchangeCompletionOrder;
- import org.neuclear.exchange.orders.ExchangeCompletionOrder;
import org.neuclear.exchange.orders.ExchangeOrder;
- import org.neuclear.asset.orders.TransferOrder;
- import org.neuclear.asset.orders.builders.TransferReceiptBuilder;
- import org.neuclear.asset.contracts.*;
import org.neuclear.exchange.orders.builders.CancelExchangeReceiptBuilder;
import org.neuclear.exchange.orders.builders.ExchangeReceiptBuilder;
- import org.neuclear.exchange.orders.builders.ExchangeReceiptBuilder;
- import org.neuclear.asset.orders.builders.TransferReceiptBuilder;
- import org.neuclear.commons.NeuClearException;
import org.neuclear.id.Identity;
import org.neuclear.id.resolver.NSResolver;
import org.neuclear.ledger.*;
import java.util.Date;
import java.util.Iterator;
--- 2,20 ----
import org.neuclear.asset.*;
+ import org.neuclear.asset.contracts.Asset;
+ import org.neuclear.asset.orders.TransferOrder;
+ import org.neuclear.asset.orders.builders.TransferReceiptBuilder;
+ import org.neuclear.commons.NeuClearException;
+ import org.neuclear.commons.time.TimeTools;
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.exchange.orders.builders.ExchangeReceiptBuilder;
import org.neuclear.id.Identity;
import org.neuclear.id.resolver.NSResolver;
import org.neuclear.ledger.*;
+ import java.sql.Timestamp;
import java.util.Date;
import java.util.Iterator;
***************
*** 55,61 ****
throw new TransferDeniedException(req);
final Book from = getBook(req.getFrom());
! final Book to = getBook(req.getTo());
! final PostedTransaction posted = from.transfer(to, req.getAmount(), req.getComment(), req.getValueTime());
return new TransferReceiptBuilder(req, createTransactionId(req, posted));
} catch (UnknownBookException e) {
--- 54,61 ----
throw new TransferDeniedException(req);
final Book from = getBook(req.getFrom());
! final Book to = getBook(req.getRecipient());
! final Timestamp valuetime =TimeTools.now();
! final PostedTransaction posted = from.transfer(to, req.getAmount(), req.getComment(), valuetime);
return new TransferReceiptBuilder(req, createTransactionId(req, posted));
} catch (UnknownBookException e) {
|