Update of /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/contracts/builders
In directory sc8-pr-cvs1:/tmp/cvs-serv4480/src/java/org/neuclear/asset/contracts/builders
Modified Files:
CancelHeldTransferReceiptBuilder.java
CancelHeldTransferRequestBuilder.java TransferBuilder.java
Log Message:
Updated various areas in NSTools.
Updated URI Validation in particular to support new expanded format
Updated createUniqueID and friends to be a lot more unique and more efficient.
In CryptoTools updated getRandom() to finally use a SecureRandom.
Changed CryptoTools.getFormatURLSafe to getBase36 because that is what it really is.
Index: CancelHeldTransferReceiptBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/contracts/builders/CancelHeldTransferReceiptBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CancelHeldTransferReceiptBuilder.java 21 Nov 2003 04:43:03 -0000 1.2
--- CancelHeldTransferReceiptBuilder.java 6 Dec 2003 00:16:10 -0000 1.3
***************
*** 1,13 ****
package org.neuclear.asset.contracts.builders;
- import org.neuclear.asset.contracts.Asset;
- import org.neuclear.asset.contracts.TransferGlobals;
- import org.neuclear.asset.contracts.HeldTransferReceipt;
- import org.neuclear.asset.contracts.CancelHeldTransferRequest;
import org.neuclear.asset.InvalidTransferException;
import org.neuclear.asset.NegativeTransferException;
! import org.neuclear.id.Identity;
! import org.neuclear.id.NSTools;
import org.neuclear.commons.NeuClearException;
/**
--- 1,10 ----
package org.neuclear.asset.contracts.builders;
import org.neuclear.asset.InvalidTransferException;
import org.neuclear.asset.NegativeTransferException;
! import org.neuclear.asset.contracts.CancelHeldTransferRequest;
! import org.neuclear.asset.contracts.TransferGlobals;
import org.neuclear.commons.NeuClearException;
+ import org.neuclear.id.NSTools;
/**
***************
*** 18,21 ****
--- 15,25 ----
* $Id$
* $Log$
+ * Revision 1.3 2003/12/06 00:16:10 pelle
+ * Updated various areas in NSTools.
+ * Updated URI Validation in particular to support new expanded format
+ * Updated createUniqueID and friends to be a lot more unique and more efficient.
+ * In CryptoTools updated getRandom() to finally use a SecureRandom.
+ * Changed CryptoTools.getFormatURLSafe to getBase36 because that is what it really is.
+ *
* Revision 1.2 2003/11/21 04:43:03 pelle
* EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
***************
*** 23,36 ****
* Anything that can be final has been made final throughout everyting. We've used IDEA's Inspector tool to find all instance of variables that could be final.
* This should hopefully make everything more stable (and secure).
! *
* Revision 1.1 2003/11/10 17:42:07 pelle
* The AssetController interface has been more or less finalized.
* CurrencyController fully implemented
* AssetControlClient implementes a remote client for communicating with AssetControllers
- *
*/
public final class CancelHeldTransferReceiptBuilder extends CancelHeldTransferBuilder {
public CancelHeldTransferReceiptBuilder(final CancelHeldTransferRequest req) throws InvalidTransferException, NegativeTransferException, NeuClearException {
! super(NSTools.createUniqueNamedID(req.getAsset().getName(),req.getSignatory().getName()),TransferGlobals.CANCEL_RCPT_TAGNAME, req.getAsset(),req.getHoldId());
}
--- 27,39 ----
* Anything that can be final has been made final throughout everyting. We've used IDEA's Inspector tool to find all instance of variables that could be final.
* This should hopefully make everything more stable (and secure).
! * <p/>
* Revision 1.1 2003/11/10 17:42:07 pelle
* The AssetController interface has been more or less finalized.
* CurrencyController fully implemented
* AssetControlClient implementes a remote client for communicating with AssetControllers
*/
public final class CancelHeldTransferReceiptBuilder extends CancelHeldTransferBuilder {
public CancelHeldTransferReceiptBuilder(final CancelHeldTransferRequest req) throws InvalidTransferException, NegativeTransferException, NeuClearException {
! super(NSTools.createUniqueTransactionID(req.getAsset().getName(), req.getSignatory().getName()), TransferGlobals.CANCEL_RCPT_TAGNAME, req.getAsset(), req.getHoldId());
}
Index: CancelHeldTransferRequestBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/contracts/builders/CancelHeldTransferRequestBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CancelHeldTransferRequestBuilder.java 21 Nov 2003 04:43:03 -0000 1.2
--- CancelHeldTransferRequestBuilder.java 6 Dec 2003 00:16:10 -0000 1.3
***************
*** 1,12 ****
package org.neuclear.asset.contracts.builders;
- import org.neuclear.asset.contracts.Asset;
- import org.neuclear.asset.contracts.TransferGlobals;
- import org.neuclear.asset.contracts.HeldTransferReceipt;
import org.neuclear.asset.InvalidTransferException;
import org.neuclear.asset.NegativeTransferException;
! import org.neuclear.id.Identity;
! import org.neuclear.id.NSTools;
import org.neuclear.commons.NeuClearException;
/**
--- 1,10 ----
package org.neuclear.asset.contracts.builders;
import org.neuclear.asset.InvalidTransferException;
import org.neuclear.asset.NegativeTransferException;
! import org.neuclear.asset.contracts.HeldTransferReceipt;
! import org.neuclear.asset.contracts.TransferGlobals;
import org.neuclear.commons.NeuClearException;
+ import org.neuclear.id.NSTools;
/**
***************
*** 17,20 ****
--- 15,25 ----
* $Id$
* $Log$
+ * Revision 1.3 2003/12/06 00:16:10 pelle
+ * Updated various areas in NSTools.
+ * Updated URI Validation in particular to support new expanded format
+ * Updated createUniqueID and friends to be a lot more unique and more efficient.
+ * In CryptoTools updated getRandom() to finally use a SecureRandom.
+ * Changed CryptoTools.getFormatURLSafe to getBase36 because that is what it really is.
+ *
* Revision 1.2 2003/11/21 04:43:03 pelle
* EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
***************
*** 22,35 ****
* Anything that can be final has been made final throughout everyting. We've used IDEA's Inspector tool to find all instance of variables that could be final.
* This should hopefully make everything more stable (and secure).
! *
* Revision 1.1 2003/11/10 17:42:07 pelle
* The AssetController interface has been more or less finalized.
* CurrencyController fully implemented
* AssetControlClient implementes a remote client for communicating with AssetControllers
- *
*/
public final class CancelHeldTransferRequestBuilder extends CancelHeldTransferBuilder {
public CancelHeldTransferRequestBuilder(final HeldTransferReceipt held) throws InvalidTransferException, NegativeTransferException, NeuClearException {
! super(NSTools.createUniqueNamedID(held.getTo().getName(),held.getAsset().getName()),TransferGlobals.CANCEL_TAGNAME, held.getAsset(),held.getName());
}
--- 27,39 ----
* Anything that can be final has been made final throughout everyting. We've used IDEA's Inspector tool to find all instance of variables that could be final.
* This should hopefully make everything more stable (and secure).
! * <p/>
* Revision 1.1 2003/11/10 17:42:07 pelle
* The AssetController interface has been more or less finalized.
* CurrencyController fully implemented
* AssetControlClient implementes a remote client for communicating with AssetControllers
*/
public final class CancelHeldTransferRequestBuilder extends CancelHeldTransferBuilder {
public CancelHeldTransferRequestBuilder(final HeldTransferReceipt held) throws InvalidTransferException, NegativeTransferException, NeuClearException {
! super(NSTools.createUniqueTransactionID(held.getTo().getName(), held.getAsset().getName()), TransferGlobals.CANCEL_TAGNAME, held.getAsset(), held.getName());
}
Index: TransferBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/contracts/builders/TransferBuilder.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** TransferBuilder.java 28 Nov 2003 00:11:50 -0000 1.7
--- TransferBuilder.java 6 Dec 2003 00:16:10 -0000 1.8
***************
*** 35,38 ****
--- 35,45 ----
$Id$
$Log$
+ Revision 1.8 2003/12/06 00:16:10 pelle
+ Updated various areas in NSTools.
+ Updated URI Validation in particular to support new expanded format
+ Updated createUniqueID and friends to be a lot more unique and more efficient.
+ In CryptoTools updated getRandom() to finally use a SecureRandom.
+ Changed CryptoTools.getFormatURLSafe to getBase36 because that is what it really is.
+
Revision 1.7 2003/11/28 00:11:50 pelle
Getting the NeuClear web transactions working.
***************
*** 90,94 ****
public abstract class TransferBuilder extends NamedObjectBuilder {
protected TransferBuilder(final String tagname, final Asset asset, final Identity signer, final Identity to, final double amount, final Date valuetime, final String comment) throws InvalidTransferException, NegativeTransferException, NeuClearException {
! super(NSTools.createUniqueNamedID(signer.getName(), to.getName()), TransferGlobals.createQName(tagname));
if (amount < 0)
throw new NegativeTransferException(amount);
--- 97,101 ----
public abstract class TransferBuilder extends NamedObjectBuilder {
protected TransferBuilder(final String tagname, final Asset asset, final Identity signer, final Identity to, final double amount, final Date valuetime, final String comment) throws InvalidTransferException, NegativeTransferException, NeuClearException {
! super(NSTools.createUniqueTransactionID(signer.getName(), to.getName()), TransferGlobals.createQName(tagname));
if (amount < 0)
throw new NegativeTransferException(amount);
|