Menu
▾
▴
[Neuclear-develop] neuclear-pay/src/java/org/neuclear/asset AssetController.java,1.9,1.10 ExpiredHeldTransferException.java,1.5,1.6 InvalidTransferException.java,1.3,1.4 TransferDeniedException.java,1.5,1.6 TransferLargerThanHeldException.java,1.5,1.6 TransferNotStartedException.java,1.3,1.4
|
From: <pe...@us...> - 2004-01-05 23:47:13
|
Update of /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset
In directory sc8-pr-cvs1:/tmp/cvs-serv15193/src/java/org/neuclear/asset
Modified Files:
AssetController.java ExpiredHeldTransferException.java
InvalidTransferException.java TransferDeniedException.java
TransferLargerThanHeldException.java
TransferNotStartedException.java
Log Message:
Create new Document classification "order", which is really just inherint in the new
package layout.
Got rid of much of the inheritance that was lying around and thought a bit further about the format of the exchange orders.
Index: AssetController.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/AssetController.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** AssetController.java 3 Jan 2004 20:36:25 -0000 1.9
--- AssetController.java 5 Jan 2004 23:47:10 -0000 1.10
***************
*** 2,8 ****
import org.neuclear.asset.contracts.*;
! import org.neuclear.asset.contracts.builders.CancelExchangeReceiptBuilder;
import org.neuclear.commons.NeuClearException;
import org.neuclear.id.builders.NamedObjectBuilder;
/*
--- 2,17 ----
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;
/*
***************
*** 26,29 ****
--- 35,43 ----
$Id$
$Log$
+ Revision 1.10 2004/01/05 23:47:10 pelle
+ Create new Document classification "order", which is really just inherint in the new
+ package layout.
+ Got rid of much of the inheritance that was lying around and thought a bit further about the format of the exchange orders.
+
Revision 1.9 2004/01/03 20:36:25 pelle
Renamed HeldTransfer to Exchange
***************
*** 34,38 ****
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.
--- 48,52 ----
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 TransferOrder presents it to the signer
and forwards it to AssetControlServlet. (Which throws an XML Parser Exception) I think the XMLReaderServlet is bust.
***************
*** 66,71 ****
Issuer is now Asset which is a subclass of Identity
AssetController supports more than one Asset. Which is important for most non ecurrency implementations.
! TransferRequest/Receipt and its Exchange companions are now SignedNamedObjects. Thus to create them you must use
! their matching TransferRequest/ReceiptBuilder classes.
PaymentProcessor has been renamed CurrencyController. I will extract a superclass later to be named AbstractLedgerController
which will handle all neuclear-ledger based AssetControllers.
--- 80,85 ----
Issuer is now Asset which is a subclass of Identity
AssetController supports more than one Asset. Which is important for most non ecurrency implementations.
! TransferOrder/Receipt and its Exchange companions are now SignedNamedObjects. Thus to create them you must use
! their matching TransferOrder/ReceiptBuilder classes.
PaymentProcessor has been renamed CurrencyController. I will extract a superclass later to be named AbstractLedgerController
which will handle all neuclear-ledger based AssetControllers.
***************
*** 99,110 ****
*/
public final NamedObjectBuilder process(final AssetTransactionContract contract) throws TransferDeniedException, LowLevelPaymentException, InvalidTransferException, NeuClearException {
! if (contract instanceof TransferRequest)
! return process((TransferRequest) contract);
! if (contract instanceof ExchangeRequest)
! return process((ExchangeRequest) contract);
! if (contract instanceof CompleteExchangeRequest)
! return process((CompleteExchangeRequest) contract);
! if (contract instanceof CancelExchangeRequest)
! return process((CancelExchangeRequest) contract);
return null;
--- 113,124 ----
*/
public final NamedObjectBuilder process(final AssetTransactionContract contract) throws TransferDeniedException, LowLevelPaymentException, InvalidTransferException, NeuClearException {
! if (contract instanceof TransferOrder)
! return process((TransferOrder) contract);
! if (contract instanceof org.neuclear.exchange.orders.ExchangeOrder)
! return process((ExchangeOrder) contract);
! if (contract instanceof ExchangeCompletionOrder)
! return process((ExchangeCompletionOrder) contract);
! if (contract instanceof CancelExchangeOrder)
! return process((CancelExchangeOrder) contract);
return null;
***************
*** 123,127 ****
* Performs an assetName transfer.
*
! * @param req TransferRequest
* @return Unsigned Receipt
* @throws LowLevelPaymentException
--- 137,141 ----
* Performs an assetName transfer.
*
! * @param req TransferOrder
* @return Unsigned Receipt
* @throws LowLevelPaymentException
***************
*** 129,133 ****
* @throws InvalidTransferException
*/
! public abstract org.neuclear.asset.contracts.builders.TransferReceiptBuilder process(TransferRequest req) throws LowLevelPaymentException, TransferDeniedException, InvalidTransferException, NeuClearException;
/**
--- 143,147 ----
* @throws InvalidTransferException
*/
! public abstract org.neuclear.asset.orders.builders.TransferReceiptBuilder process(TransferOrder req) throws LowLevelPaymentException, TransferDeniedException, InvalidTransferException, NeuClearException;
/**
***************
*** 136,140 ****
* HeldTransfer Object.
*
! * @param req Valid ExchangeRequest
* @return Unsigned ExchangeReceiptBuilder
* @throws LowLevelPaymentException
--- 150,154 ----
* HeldTransfer Object.
*
! * @param req Valid ExchangeOrder
* @return Unsigned ExchangeReceiptBuilder
* @throws LowLevelPaymentException
***************
*** 142,146 ****
* @throws InvalidTransferException
*/
! public abstract org.neuclear.asset.contracts.builders.ExchangeReceiptBuilder process(ExchangeRequest req) throws LowLevelPaymentException, TransferDeniedException, InvalidTransferException, NeuClearException;
/**
--- 156,160 ----
* @throws InvalidTransferException
*/
! public abstract org.neuclear.exchange.orders.builders.ExchangeReceiptBuilder process(ExchangeOrder req) throws LowLevelPaymentException, TransferDeniedException, InvalidTransferException, NeuClearException;
/**
***************
*** 153,157 ****
* @throws InvalidTransferException
*/
! public abstract org.neuclear.asset.contracts.builders.TransferReceiptBuilder process(CompleteExchangeRequest complete) throws LowLevelPaymentException, TransferDeniedException, InvalidTransferException, NeuClearException;
/**
--- 167,171 ----
* @throws InvalidTransferException
*/
! public abstract org.neuclear.asset.orders.builders.TransferReceiptBuilder process(ExchangeCompletionOrder complete) throws LowLevelPaymentException, TransferDeniedException, InvalidTransferException, NeuClearException;
/**
***************
*** 165,169 ****
*/
! public abstract CancelExchangeReceiptBuilder process(CancelExchangeRequest cancel) throws LowLevelPaymentException, TransferDeniedException, InvalidTransferException, NeuClearException;
--- 179,183 ----
*/
! public abstract CancelExchangeReceiptBuilder process(CancelExchangeOrder cancel) throws LowLevelPaymentException, TransferDeniedException, InvalidTransferException, NeuClearException;
Index: ExpiredHeldTransferException.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/ExpiredHeldTransferException.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ExpiredHeldTransferException.java 3 Jan 2004 20:36:26 -0000 1.5
--- ExpiredHeldTransferException.java 5 Jan 2004 23:47:10 -0000 1.6
***************
*** 1,6 ****
package org.neuclear.asset;
! import org.neuclear.asset.contracts.Exchange;
! import org.neuclear.asset.contracts.CompleteExchangeRequest;
import java.util.Date;
--- 1,8 ----
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;
***************
*** 12,23 ****
*/
public final class ExpiredHeldTransferException extends InvalidTransferException {
! public ExpiredHeldTransferException(final CompleteExchangeRequest held) {
super("expired");
this.held = held;
}
! private final CompleteExchangeRequest held;
! public CompleteExchangeRequest getRequest() {
return held;
}
--- 14,25 ----
*/
public final class ExpiredHeldTransferException extends InvalidTransferException {
! public ExpiredHeldTransferException(final ExchangeCompletionOrder held) {
super("expired");
this.held = held;
}
! private final ExchangeCompletionOrder held;
! public ExchangeCompletionOrder getRequest() {
return held;
}
Index: InvalidTransferException.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/InvalidTransferException.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** InvalidTransferException.java 3 Jan 2004 20:36:26 -0000 1.3
--- InvalidTransferException.java 5 Jan 2004 23:47:10 -0000 1.4
***************
*** 21,24 ****
--- 21,29 ----
$Id$
$Log$
+ Revision 1.4 2004/01/05 23:47:10 pelle
+ Create new Document classification "order", which is really just inherint in the new
+ package layout.
+ Got rid of much of the inheritance that was lying around and thought a bit further about the format of the exchange orders.
+
Revision 1.3 2004/01/03 20:36:26 pelle
Renamed HeldTransfer to Exchange
***************
*** 39,44 ****
Issuer is now Asset which is a subclass of Identity
AssetController supports more than one Asset. Which is important for most non ecurrency implementations.
! TransferRequest/Receipt and its Exchange companions are now SignedNamedObjects. Thus to create them you must use
! their matching TransferRequest/ReceiptBuilder classes.
PaymentProcessor has been renamed CurrencyController. I will extract a superclass later to be named AbstractLedgerController
which will handle all neuclear-ledger based AssetControllers.
--- 44,49 ----
Issuer is now Asset which is a subclass of Identity
AssetController supports more than one Asset. Which is important for most non ecurrency implementations.
! TransferOrder/Receipt and its Exchange companions are now SignedNamedObjects. Thus to create them you must use
! their matching TransferOrder/ReceiptBuilder classes.
PaymentProcessor has been renamed CurrencyController. I will extract a superclass later to be named AbstractLedgerController
which will handle all neuclear-ledger based AssetControllers.
Index: TransferDeniedException.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/TransferDeniedException.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TransferDeniedException.java 3 Jan 2004 20:36:26 -0000 1.5
--- TransferDeniedException.java 5 Jan 2004 23:47:10 -0000 1.6
***************
*** 1,7 ****
package org.neuclear.asset;
! import org.neuclear.asset.contracts.TransferRequest;
! import org.neuclear.asset.contracts.CancelExchangeRequest;
! import org.neuclear.asset.contracts.AssetTransactionContract;
import org.neuclear.id.SignedNamedObject;
--- 1,8 ----
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;
import org.neuclear.id.SignedNamedObject;
***************
*** 26,29 ****
--- 27,35 ----
$Id$
$Log$
+ Revision 1.6 2004/01/05 23:47:10 pelle
+ Create new Document classification "order", which is really just inherint in the new
+ package layout.
+ Got rid of much of the inheritance that was lying around and thought a bit further about the format of the exchange orders.
+
Revision 1.5 2004/01/03 20:36:26 pelle
Renamed HeldTransfer to Exchange
***************
*** 49,54 ****
Issuer is now Asset which is a subclass of Identity
AssetController supports more than one Asset. Which is important for most non ecurrency implementations.
! TransferRequest/Receipt and its Exchange companions are now SignedNamedObjects. Thus to create them you must use
! their matching TransferRequest/ReceiptBuilder classes.
PaymentProcessor has been renamed CurrencyController. I will extract a superclass later to be named AbstractLedgerController
which will handle all neuclear-ledger based AssetControllers.
--- 55,60 ----
Issuer is now Asset which is a subclass of Identity
AssetController supports more than one Asset. Which is important for most non ecurrency implementations.
! TransferOrder/Receipt and its Exchange companions are now SignedNamedObjects. Thus to create them you must use
! their matching TransferOrder/ReceiptBuilder classes.
PaymentProcessor has been renamed CurrencyController. I will extract a superclass later to be named AbstractLedgerController
which will handle all neuclear-ledger based AssetControllers.
***************
*** 72,76 ****
this.req = req;
}
! public TransferDeniedException(final CancelExchangeRequest req) {
this.req = req;
}
--- 78,82 ----
this.req = req;
}
! public TransferDeniedException(final CancelExchangeOrder req) {
this.req = req;
}
Index: TransferLargerThanHeldException.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/TransferLargerThanHeldException.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TransferLargerThanHeldException.java 3 Jan 2004 20:36:26 -0000 1.5
--- TransferLargerThanHeldException.java 5 Jan 2004 23:47:10 -0000 1.6
***************
*** 2,7 ****
! import org.neuclear.asset.contracts.ExchangeReceipt;
! import org.neuclear.asset.contracts.CompleteExchangeRequest;
/**
--- 2,8 ----
! import org.neuclear.exchange.orders.ExchangeOrderReceipt;
! import org.neuclear.exchange.orders.ExchangeCompletionOrder;
! import org.neuclear.exchange.orders.ExchangeCompletionOrder;
/**
***************
*** 11,15 ****
*/
public final class TransferLargerThanHeldException extends InvalidTransferException {
! public TransferLargerThanHeldException(final CompleteExchangeRequest complete,final double amount) {
super("amount too large");
this.complete = complete;
--- 12,16 ----
*/
public final class TransferLargerThanHeldException extends InvalidTransferException {
! public TransferLargerThanHeldException(final ExchangeCompletionOrder complete,final double amount) {
super("amount too large");
this.complete = complete;
***************
*** 18,25 ****
}
! private final CompleteExchangeRequest complete;
private final double amount;
! public final CompleteExchangeRequest getRequest() {
return complete;
}
--- 19,26 ----
}
! private final ExchangeCompletionOrder complete;
private final double amount;
! public final ExchangeCompletionOrder getRequest() {
return complete;
}
Index: TransferNotStartedException.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/TransferNotStartedException.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TransferNotStartedException.java 21 Nov 2003 04:43:04 -0000 1.3
--- TransferNotStartedException.java 5 Jan 2004 23:47:10 -0000 1.4
***************
*** 1,5 ****
package org.neuclear.asset;
! import org.neuclear.asset.contracts.TransferReceipt;
import java.util.Date;
--- 1,6 ----
package org.neuclear.asset;
! import org.neuclear.asset.orders.TransferReceipt;
! import org.neuclear.asset.orders.TransferReceipt;
import java.util.Date;
|
