Menu
▾
▴
[Neuclear-develop] neuclear-pay/src/java/org/neuclear/asset AssetController.java,1.8,1.9 ExpiredHeldTransferException.java,1.4,1.5 InvalidTransferException.java,1.2,1.3 NonExistantHoldException.java,1.2,1.3 TransferDeniedException.java,1.4,1.5 TransferLargerThanHeldException.java,1.4,1.5
|
From: <pe...@us...> - 2004-01-03 20:36:29
|
Update of /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset
In directory sc8-pr-cvs1:/tmp/cvs-serv10127/src/java/org/neuclear/asset
Modified Files:
AssetController.java ExpiredHeldTransferException.java
InvalidTransferException.java NonExistantHoldException.java
TransferDeniedException.java
TransferLargerThanHeldException.java
Log Message:
Renamed HeldTransfer to Exchange
Dropped valuetime from the request objects.
Doesnt yet compile. New commit to follow soon.
Index: AssetController.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/AssetController.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** AssetController.java 22 Nov 2003 00:22:29 -0000 1.8
--- AssetController.java 3 Jan 2004 20:36:25 -0000 1.9
***************
*** 2,6 ****
import org.neuclear.asset.contracts.*;
! import org.neuclear.asset.contracts.builders.CancelHeldTransferReceiptBuilder;
import org.neuclear.commons.NeuClearException;
import org.neuclear.id.builders.NamedObjectBuilder;
--- 2,6 ----
import org.neuclear.asset.contracts.*;
! import org.neuclear.asset.contracts.builders.CancelExchangeReceiptBuilder;
import org.neuclear.commons.NeuClearException;
import org.neuclear.id.builders.NamedObjectBuilder;
***************
*** 26,29 ****
--- 26,34 ----
$Id$
$Log$
+ Revision 1.9 2004/01/03 20:36:25 pelle
+ Renamed HeldTransfer to Exchange
+ Dropped valuetime from the request objects.
+ Doesnt yet compile. New commit to follow soon.
+
Revision 1.8 2003/11/22 00:22:29 pelle
All unit tests in commons, id and xmlsec now work.
***************
*** 61,65 ****
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 Held 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
--- 66,70 ----
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
***************
*** 96,105 ****
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;
--- 101,110 ----
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;
***************
*** 131,141 ****
* HeldTransfer Object.
*
! * @param req Valid HeldTransferRequest
! * @return Unsigned HeldTransferReceiptBuilder
* @throws LowLevelPaymentException
* @throws TransferDeniedException
* @throws InvalidTransferException
*/
! public abstract org.neuclear.asset.contracts.builders.HeldTransferReceiptBuilder process(HeldTransferRequest req) throws LowLevelPaymentException, TransferDeniedException, InvalidTransferException, NeuClearException;
/**
--- 136,146 ----
* HeldTransfer Object.
*
! * @param req Valid ExchangeRequest
! * @return Unsigned ExchangeReceiptBuilder
* @throws LowLevelPaymentException
* @throws TransferDeniedException
* @throws InvalidTransferException
*/
! public abstract org.neuclear.asset.contracts.builders.ExchangeReceiptBuilder process(ExchangeRequest req) 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;
/**
--- 153,157 ----
* @throws InvalidTransferException
*/
! public abstract org.neuclear.asset.contracts.builders.TransferReceiptBuilder process(CompleteExchangeRequest complete) throws LowLevelPaymentException, TransferDeniedException, InvalidTransferException, NeuClearException;
/**
***************
*** 154,158 ****
*
* @param cancel
! * @return Unsigned CancelHeldTransferReceiptBuilder
* @throws LowLevelPaymentException
* @throws TransferDeniedException
--- 159,163 ----
*
* @param cancel
! * @return Unsigned CancelExchangeReceiptBuilder
* @throws LowLevelPaymentException
* @throws TransferDeniedException
***************
*** 160,164 ****
*/
! public abstract CancelHeldTransferReceiptBuilder process(CancelHeldTransferRequest cancel) throws LowLevelPaymentException, TransferDeniedException, InvalidTransferException, NeuClearException;
--- 165,169 ----
*/
! public abstract CancelExchangeReceiptBuilder process(CancelExchangeRequest 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.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ExpiredHeldTransferException.java 21 Nov 2003 04:43:04 -0000 1.4
--- ExpiredHeldTransferException.java 3 Jan 2004 20:36:26 -0000 1.5
***************
*** 1,6 ****
package org.neuclear.asset;
! import org.neuclear.asset.contracts.Held;
! import org.neuclear.asset.contracts.CompleteHeldTransferRequest;
import java.util.Date;
--- 1,6 ----
package org.neuclear.asset;
! import org.neuclear.asset.contracts.Exchange;
! import org.neuclear.asset.contracts.CompleteExchangeRequest;
import java.util.Date;
***************
*** 12,23 ****
*/
public final class ExpiredHeldTransferException extends InvalidTransferException {
! public ExpiredHeldTransferException(final CompleteHeldTransferRequest held) {
super("expired");
this.held = held;
}
! private final CompleteHeldTransferRequest held;
! public CompleteHeldTransferRequest getRequest() {
return held;
}
--- 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;
}
Index: InvalidTransferException.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/InvalidTransferException.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** InvalidTransferException.java 21 Nov 2003 04:43:04 -0000 1.2
--- InvalidTransferException.java 3 Jan 2004 20:36:26 -0000 1.3
***************
*** 21,24 ****
--- 21,29 ----
$Id$
$Log$
+ Revision 1.3 2004/01/03 20:36:26 pelle
+ Renamed HeldTransfer to Exchange
+ Dropped valuetime from the request objects.
+ Doesnt yet compile. New commit to follow soon.
+
Revision 1.2 2003/11/21 04:43:04 pelle
EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
***************
*** 34,38 ****
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 Held 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
--- 39,43 ----
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
Index: NonExistantHoldException.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/NonExistantHoldException.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** NonExistantHoldException.java 21 Nov 2003 04:43:04 -0000 1.2
--- NonExistantHoldException.java 3 Jan 2004 20:36:26 -0000 1.3
***************
*** 7,10 ****
--- 7,15 ----
* $Id$
* $Log$
+ * Revision 1.3 2004/01/03 20:36:26 pelle
+ * Renamed HeldTransfer to Exchange
+ * Dropped valuetime from the request objects.
+ * Doesnt yet compile. New commit to follow soon.
+ *
* Revision 1.2 2003/11/21 04:43:04 pelle
* EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
***************
*** 21,25 ****
public final class NonExistantHoldException extends InvalidTransferException{
public NonExistantHoldException(final String holdid) {
! super("Held transaction:"+holdid+" doesnt exist");
}
}
--- 26,30 ----
public final class NonExistantHoldException extends InvalidTransferException{
public NonExistantHoldException(final String holdid) {
! super("Exchange transaction:"+holdid+" doesnt exist");
}
}
Index: TransferDeniedException.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/TransferDeniedException.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TransferDeniedException.java 21 Nov 2003 04:43:04 -0000 1.4
--- TransferDeniedException.java 3 Jan 2004 20:36:26 -0000 1.5
***************
*** 2,6 ****
import org.neuclear.asset.contracts.TransferRequest;
! import org.neuclear.asset.contracts.CancelHeldTransferRequest;
import org.neuclear.asset.contracts.AssetTransactionContract;
import org.neuclear.id.SignedNamedObject;
--- 2,6 ----
import org.neuclear.asset.contracts.TransferRequest;
! import org.neuclear.asset.contracts.CancelExchangeRequest;
import org.neuclear.asset.contracts.AssetTransactionContract;
import org.neuclear.id.SignedNamedObject;
***************
*** 26,29 ****
--- 26,34 ----
$Id$
$Log$
+ Revision 1.5 2004/01/03 20:36:26 pelle
+ Renamed HeldTransfer to Exchange
+ Dropped valuetime from the request objects.
+ Doesnt yet compile. New commit to follow soon.
+
Revision 1.4 2003/11/21 04:43:04 pelle
EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
***************
*** 44,48 ****
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 Held 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
--- 49,53 ----
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
***************
*** 67,71 ****
this.req = req;
}
! public TransferDeniedException(final CancelHeldTransferRequest req) {
this.req = req;
}
--- 72,76 ----
this.req = req;
}
! public TransferDeniedException(final CancelExchangeRequest req) {
this.req = req;
}
Index: TransferLargerThanHeldException.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/TransferLargerThanHeldException.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TransferLargerThanHeldException.java 21 Nov 2003 04:43:04 -0000 1.4
--- TransferLargerThanHeldException.java 3 Jan 2004 20:36:26 -0000 1.5
***************
*** 2,7 ****
! import org.neuclear.asset.contracts.HeldTransferReceipt;
! import org.neuclear.asset.contracts.CompleteHeldTransferRequest;
/**
--- 2,7 ----
! import org.neuclear.asset.contracts.ExchangeReceipt;
! import org.neuclear.asset.contracts.CompleteExchangeRequest;
/**
***************
*** 11,15 ****
*/
public final class TransferLargerThanHeldException extends InvalidTransferException {
! public TransferLargerThanHeldException(final CompleteHeldTransferRequest complete,final double amount) {
super("amount too large");
this.complete = complete;
--- 11,15 ----
*/
public final class TransferLargerThanHeldException extends InvalidTransferException {
! public TransferLargerThanHeldException(final CompleteExchangeRequest complete,final double amount) {
super("amount too large");
this.complete = complete;
***************
*** 18,25 ****
}
! private final CompleteHeldTransferRequest complete;
private final double amount;
! public final CompleteHeldTransferRequest getRequest() {
return complete;
}
--- 18,25 ----
}
! private final CompleteExchangeRequest complete;
private final double amount;
! public final CompleteExchangeRequest getRequest() {
return complete;
}
|
