Menu
▾
▴
[Neuclear-develop] neuclear-pay/src/java/org/neuclear/asset/contracts/builders AssetBuilder.java,1.3,1.4 CancelHeldTransferBuilder.java,1.3,1.4 CancelHeldTransferReceiptBuilder.java,1.1,1.2 CancelHeldTransferRequestBuilder.java,1.1,1.2 CompleteHeldTransferRequestBuilder.java,1.1,1.2 HeldTransferReceiptBuilder.java,1.2,1.3 HeldTransferRequestBuilder.java,1.2,1.3 TransferBuilder.java,1.5,1.6 TransferReceiptBuilder.java,1.3,1.4 TransferRequestBuilder.java,1.3,1.4
Update of /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/contracts/builders
In directory sc8-pr-cvs1:/tmp/cvs-serv10286/src/java/org/neuclear/asset/contracts/builders
Modified Files:
AssetBuilder.java CancelHeldTransferBuilder.java
CancelHeldTransferReceiptBuilder.java
CancelHeldTransferRequestBuilder.java
CompleteHeldTransferRequestBuilder.java
HeldTransferReceiptBuilder.java
HeldTransferRequestBuilder.java TransferBuilder.java
TransferReceiptBuilder.java TransferRequestBuilder.java
Log Message:
EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
Otherwise You will Finaliate.
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).
Index: AssetBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/contracts/builders/AssetBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AssetBuilder.java 20 Nov 2003 23:40:50 -0000 1.3
--- AssetBuilder.java 21 Nov 2003 04:43:03 -0000 1.4
***************
*** 8,11 ****
--- 8,12 ----
import org.neuclear.commons.crypto.signers.TestCaseSigner;
import org.neuclear.id.builders.IdentityBuilder;
+ import org.neuclear.id.SignedNamedObject;
import org.neuclear.store.FileStore;
import org.neuclear.store.Store;
***************
*** 35,38 ****
--- 36,45 ----
$Id$
$Log$
+ Revision 1.4 2003/11/21 04:43:03 pelle
+ EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
+ Otherwise You will Finaliate.
+ 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.3 2003/11/20 23:40:50 pelle
Getting all the tests to work in id
***************
*** 84,88 ****
* Time: 3:13:27 PM
*/
! public class AssetBuilder extends IdentityBuilder {
/**
* Used to create new Assets
--- 91,95 ----
* Time: 3:13:27 PM
*/
! public final class AssetBuilder extends IdentityBuilder {
/**
* Used to create new Assets
***************
*** 97,103 ****
* @param minimum Minimum transaction size
*/
! public AssetBuilder(String name, PublicKey allow, String repository, String signer, String logger, String receiver, String controller, int decimal, double minimum) {
super(AssetGlobals.createQName(AssetGlobals.ASSET_TAGNAME), name, allow, repository, signer, logger, receiver);
! Element elem = getElement();
AssetGlobals.createAttribute(elem, "controller", controller);
AssetGlobals.createAttribute(elem, "decimalpoints", Integer.toString(decimal));
--- 104,110 ----
* @param minimum Minimum transaction size
*/
! public AssetBuilder(final String name, final PublicKey allow, final String repository, final String signer, final String logger, final String receiver, final String controller, final int decimal, final double minimum) throws NeuClearException {
super(AssetGlobals.createQName(AssetGlobals.ASSET_TAGNAME), name, allow, repository, signer, logger, receiver);
! final Element elem = getElement();
AssetGlobals.createAttribute(elem, "controller", controller);
AssetGlobals.createAttribute(elem, "decimalpoints", Integer.toString(decimal));
***************
*** 106,117 ****
}
! public static void main(String args[]) {
try {
! JCESigner signer = new TestCaseSigner();
String assetname = "neu://test/bux";
if (args.length > 0)
assetname = args[0];
! AssetBuilder assetraw = new AssetBuilder(assetname,
signer.getPublicKey(assetname),
"http://repository.neuclear.org/",
--- 113,124 ----
}
! public static void main(final String[] args) {
try {
! final JCESigner signer = new TestCaseSigner();
String assetname = "neu://test/bux";
if (args.length > 0)
assetname = args[0];
! final AssetBuilder assetraw = new AssetBuilder(assetname,
signer.getPublicKey(assetname),
"http://repository.neuclear.org/",
***************
*** 123,128 ****
0.01
);
! Asset asset = (Asset) assetraw.sign(signer);
! Store store = new FileStore("target/testdata/assets");
store.receive(asset);
} catch (GeneralSecurityException e) {
--- 130,135 ----
0.01
);
! final Asset asset= (Asset) assetraw.sign(signer);
! final Store store = new FileStore("target/testdata/repository");
store.receive(asset);
} catch (GeneralSecurityException e) {
Index: CancelHeldTransferBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/contracts/builders/CancelHeldTransferBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CancelHeldTransferBuilder.java 12 Nov 2003 23:47:04 -0000 1.3
--- CancelHeldTransferBuilder.java 21 Nov 2003 04:43:03 -0000 1.4
***************
*** 7,10 ****
--- 7,11 ----
import org.neuclear.asset.contracts.TransferGlobals;
import org.neuclear.id.builders.NamedObjectBuilder;
+ import org.neuclear.commons.NeuClearException;
/*
***************
*** 28,31 ****
--- 29,38 ----
$Id$
$Log$
+ Revision 1.4 2003/11/21 04:43:03 pelle
+ EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
+ Otherwise You will Finaliate.
+ 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.3 2003/11/12 23:47:04 pelle
Much work done in creating good test environment.
***************
*** 73,77 ****
*/
public abstract class CancelHeldTransferBuilder extends NamedObjectBuilder {
! protected CancelHeldTransferBuilder(String tagname, String name, Asset asset, String holdid) throws InvalidTransferException, NegativeTransferException {
super(name, TransferGlobals.createQName(tagname));
if (asset == null)
--- 80,84 ----
*/
public abstract class CancelHeldTransferBuilder extends NamedObjectBuilder {
! protected CancelHeldTransferBuilder(final String tagname, final String name, final Asset asset, final String holdid) throws InvalidTransferException, NegativeTransferException, NeuClearException {
super(name, TransferGlobals.createQName(tagname));
if (asset == null)
***************
*** 81,85 ****
this.asset = asset;
! Element element = getElement();
element.add(TransferGlobals.createAttribute(element, "assetName", asset.getName()));
element.add(TransferGlobals.createAttribute(element, "holdid", holdid));
--- 88,92 ----
this.asset = asset;
! final Element element = getElement();
element.add(TransferGlobals.createAttribute(element, "assetName", asset.getName()));
element.add(TransferGlobals.createAttribute(element, "holdid", holdid));
Index: CancelHeldTransferReceiptBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/contracts/builders/CancelHeldTransferReceiptBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CancelHeldTransferReceiptBuilder.java 10 Nov 2003 17:42:07 -0000 1.1
--- CancelHeldTransferReceiptBuilder.java 21 Nov 2003 04:43:03 -0000 1.2
***************
*** 9,12 ****
--- 9,13 ----
import org.neuclear.id.Identity;
import org.neuclear.id.NSTools;
+ import org.neuclear.commons.NeuClearException;
/**
***************
*** 17,20 ****
--- 18,27 ----
* $Id$
* $Log$
+ * Revision 1.2 2003/11/21 04:43:03 pelle
+ * EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
+ * Otherwise You will Finaliate.
+ * 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.
***************
*** 23,28 ****
*
*/
! public class CancelHeldTransferReceiptBuilder extends CancelHeldTransferBuilder {
! public CancelHeldTransferReceiptBuilder(CancelHeldTransferRequest req) throws InvalidTransferException, NegativeTransferException {
super(NSTools.createUniqueNamedID(req.getAsset().getName(),req.getSignatory().getName()),TransferGlobals.CANCEL_RCPT_TAGNAME, req.getAsset(),req.getHoldId());
}
--- 30,35 ----
*
*/
! 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());
}
Index: CancelHeldTransferRequestBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/contracts/builders/CancelHeldTransferRequestBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CancelHeldTransferRequestBuilder.java 10 Nov 2003 17:42:07 -0000 1.1
--- CancelHeldTransferRequestBuilder.java 21 Nov 2003 04:43:03 -0000 1.2
***************
*** 8,11 ****
--- 8,12 ----
import org.neuclear.id.Identity;
import org.neuclear.id.NSTools;
+ import org.neuclear.commons.NeuClearException;
/**
***************
*** 16,19 ****
--- 17,26 ----
* $Id$
* $Log$
+ * Revision 1.2 2003/11/21 04:43:03 pelle
+ * EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
+ * Otherwise You will Finaliate.
+ * 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.
***************
*** 22,27 ****
*
*/
! public class CancelHeldTransferRequestBuilder extends CancelHeldTransferBuilder {
! public CancelHeldTransferRequestBuilder(HeldTransferReceipt held) throws InvalidTransferException, NegativeTransferException {
super(NSTools.createUniqueNamedID(held.getTo().getName(),held.getAsset().getName()),TransferGlobals.CANCEL_TAGNAME, held.getAsset(),held.getName());
}
--- 29,34 ----
*
*/
! 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());
}
Index: CompleteHeldTransferRequestBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/contracts/builders/CompleteHeldTransferRequestBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CompleteHeldTransferRequestBuilder.java 10 Nov 2003 17:42:07 -0000 1.1
--- CompleteHeldTransferRequestBuilder.java 21 Nov 2003 04:43:03 -0000 1.2
***************
*** 9,12 ****
--- 9,13 ----
import org.neuclear.asset.NegativeTransferException;
import org.neuclear.id.Identity;
+ import org.neuclear.commons.NeuClearException;
import java.util.Date;
***************
*** 32,35 ****
--- 33,42 ----
$Id$
$Log$
+ Revision 1.2 2003/11/21 04:43:03 pelle
+ EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
+ Otherwise You will Finaliate.
+ 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.
***************
*** 66,71 ****
* Time: 6:28:26 PM
*/
! public class CompleteHeldTransferRequestBuilder extends TransferBuilder {
! public CompleteHeldTransferRequestBuilder(HeldTransferReceipt req,Identity signatory,String id,Date valuetime,double amount, String comment) throws InvalidTransferException, NegativeTransferException {
super(TransferGlobals.COMPLETE_TAGNAME,
req.getAsset(),
--- 73,78 ----
* Time: 6:28:26 PM
*/
! public final class CompleteHeldTransferRequestBuilder extends TransferBuilder {
! public CompleteHeldTransferRequestBuilder(final HeldTransferReceipt req,final Identity signatory,final String id,final Date valuetime,final double amount, final String comment) throws InvalidTransferException, NegativeTransferException, NeuClearException {
super(TransferGlobals.COMPLETE_TAGNAME,
req.getAsset(),
***************
*** 75,79 ****
valuetime,
comment);
! Element element = getElement();
element.add(TransferGlobals.createAttribute(element, "sender", req.getFrom().getName()));
element.add(TransferGlobals.createAttribute(element, "holdid", req.getName()));
--- 82,86 ----
valuetime,
comment);
! final Element element = getElement();
element.add(TransferGlobals.createAttribute(element, "sender", req.getFrom().getName()));
element.add(TransferGlobals.createAttribute(element, "holdid", req.getName()));
Index: HeldTransferReceiptBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/contracts/builders/HeldTransferReceiptBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** HeldTransferReceiptBuilder.java 11 Nov 2003 21:17:19 -0000 1.2
--- HeldTransferReceiptBuilder.java 21 Nov 2003 04:43:03 -0000 1.3
***************
*** 7,10 ****
--- 7,11 ----
import org.neuclear.asset.contracts.TransferGlobals;
import org.neuclear.commons.time.TimeTools;
+ import org.neuclear.commons.NeuClearException;
/*
***************
*** 28,31 ****
--- 29,38 ----
$Id$
$Log$
+ Revision 1.3 2003/11/21 04:43:03 pelle
+ EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
+ Otherwise You will Finaliate.
+ 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.2 2003/11/11 21:17:19 pelle
Further vital reshuffling.
***************
*** 53,60 ****
* Time: 8:05:15 PM
*/
! public class HeldTransferReceiptBuilder extends TransferReceiptBuilder {
! public HeldTransferReceiptBuilder(HeldTransferRequest req, String id) throws InvalidTransferException, NegativeTransferException {
super(TransferGlobals.HELD_XFER_RCPT_TAGNAME, req, id);
! Element element = getElement();
element.add(TransferGlobals.createAttribute(element, "helduntil", TimeTools.formatTimeStamp(req.getHeldUntil())));
--- 60,67 ----
* Time: 8:05:15 PM
*/
! public final class HeldTransferReceiptBuilder extends TransferReceiptBuilder {
! public HeldTransferReceiptBuilder(final HeldTransferRequest req, final String id) throws InvalidTransferException, NegativeTransferException, NeuClearException {
super(TransferGlobals.HELD_XFER_RCPT_TAGNAME, req, id);
! final Element element = getElement();
element.add(TransferGlobals.createAttribute(element, "helduntil", TimeTools.formatTimeStamp(req.getHeldUntil())));
Index: HeldTransferRequestBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/contracts/builders/HeldTransferRequestBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** HeldTransferRequestBuilder.java 11 Nov 2003 21:17:19 -0000 1.2
--- HeldTransferRequestBuilder.java 21 Nov 2003 04:43:03 -0000 1.3
***************
*** 8,11 ****
--- 8,12 ----
import org.neuclear.id.Identity;
import org.neuclear.commons.time.TimeTools;
+ import org.neuclear.commons.NeuClearException;
import java.util.Date;
***************
*** 31,34 ****
--- 32,41 ----
$Id$
$Log$
+ Revision 1.3 2003/11/21 04:43:03 pelle
+ EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
+ Otherwise You will Finaliate.
+ 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.2 2003/11/11 21:17:19 pelle
Further vital reshuffling.
***************
*** 56,64 ****
* Time: 7:59:13 PM
*/
! public class HeldTransferRequestBuilder extends TransferRequestBuilder {
! public HeldTransferRequestBuilder(Asset asset, Identity signer, Identity to, double amount, Date valuetime, String comment, Date helduntil) throws InvalidTransferException, NegativeTransferException {
super(TransferGlobals.HELD_XFER_TAGNAME, asset, signer, to, amount, valuetime, comment);
! Element element = getElement();
element.add(TransferGlobals.createAttribute(element, "helduntil", TimeTools.formatTimeStamp(helduntil)));
--- 63,71 ----
* Time: 7:59:13 PM
*/
! public final class HeldTransferRequestBuilder extends TransferRequestBuilder {
! public HeldTransferRequestBuilder(final Asset asset, final Identity signer, final Identity to, final double amount, final Date valuetime, final String comment, final Date helduntil) throws InvalidTransferException, NegativeTransferException, NeuClearException {
super(TransferGlobals.HELD_XFER_TAGNAME, asset, signer, to, amount, valuetime, comment);
! final Element element = getElement();
element.add(TransferGlobals.createAttribute(element, "helduntil", TimeTools.formatTimeStamp(helduntil)));
Index: TransferBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/contracts/builders/TransferBuilder.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TransferBuilder.java 12 Nov 2003 23:47:04 -0000 1.5
--- TransferBuilder.java 21 Nov 2003 04:43:03 -0000 1.6
***************
*** 7,10 ****
--- 7,11 ----
import org.neuclear.asset.contracts.TransferGlobals;
import org.neuclear.commons.Utility;
+ import org.neuclear.commons.NeuClearException;
import org.neuclear.commons.time.TimeTools;
import org.neuclear.id.Identity;
***************
*** 34,37 ****
--- 35,44 ----
$Id$
$Log$
+ Revision 1.6 2003/11/21 04:43:03 pelle
+ EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
+ Otherwise You will Finaliate.
+ 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.5 2003/11/12 23:47:04 pelle
Much work done in creating good test environment.
***************
*** 79,83 ****
*/
public abstract class TransferBuilder extends NamedObjectBuilder {
! protected TransferBuilder(String tagname, Asset asset, Identity signer, Identity to, double amount, Date valuetime, String comment) throws InvalidTransferException, NegativeTransferException {
super(NSTools.createUniqueNamedID(signer.getName(), to.getName()), TransferGlobals.createQName(tagname));
if (amount < 0)
--- 86,90 ----
*/
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)
***************
*** 91,95 ****
this.asset = asset;
! Element element = getElement();
element.add(TransferGlobals.createAttribute(element, "recipient", to.getName()));
element.add(TransferGlobals.createAttribute(element, "assetName", asset.getName()));
--- 98,102 ----
this.asset = asset;
! final Element element = getElement();
element.add(TransferGlobals.createAttribute(element, "recipient", to.getName()));
element.add(TransferGlobals.createAttribute(element, "assetName", asset.getName()));
Index: TransferReceiptBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/contracts/builders/TransferReceiptBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TransferReceiptBuilder.java 10 Nov 2003 17:42:07 -0000 1.3
--- TransferReceiptBuilder.java 21 Nov 2003 04:43:03 -0000 1.4
***************
*** 5,8 ****
--- 5,9 ----
import org.neuclear.asset.InvalidTransferException;
import org.neuclear.asset.NegativeTransferException;
+ import org.neuclear.commons.NeuClearException;
import java.util.Date;
***************
*** 28,31 ****
--- 29,38 ----
$Id$
$Log$
+ Revision 1.4 2003/11/21 04:43:03 pelle
+ EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
+ Otherwise You will Finaliate.
+ 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.3 2003/11/10 17:42:07 pelle
The AssetController interface has been more or less finalized.
***************
*** 63,70 ****
*/
public class TransferReceiptBuilder extends TransferBuilder {
! public TransferReceiptBuilder(TransferRequest req,String id) throws InvalidTransferException, NegativeTransferException {
this(TransferGlobals.XFER_RCPT_TAGNAME,req,id);
}
! public TransferReceiptBuilder(CompleteHeldTransferRequest req,String id) throws InvalidTransferException, NegativeTransferException {
super(TransferGlobals.XFER_RCPT_TAGNAME,
req.getAsset(),
--- 70,77 ----
*/
public class TransferReceiptBuilder extends TransferBuilder {
! public TransferReceiptBuilder(final TransferRequest req,final String id) throws InvalidTransferException, NegativeTransferException, NeuClearException {
this(TransferGlobals.XFER_RCPT_TAGNAME,req,id);
}
! public TransferReceiptBuilder(final CompleteHeldTransferRequest req,final String id) throws InvalidTransferException, NegativeTransferException, NeuClearException {
super(TransferGlobals.XFER_RCPT_TAGNAME,
req.getAsset(),
***************
*** 74,83 ****
req.getValueTime(),
req.getComment());
! Element element = getElement();
element.add(TransferGlobals.createAttribute(element, "sender", req.getFrom().getName()));
element.add(TransferGlobals.createAttribute(element, "holdid", req.getHoldId()));
}
! TransferReceiptBuilder(String tagname,TransferRequest req,String id) throws InvalidTransferException, NegativeTransferException {
super(tagname,
req.getAsset(),
--- 81,90 ----
req.getValueTime(),
req.getComment());
! final Element element = getElement();
element.add(TransferGlobals.createAttribute(element, "sender", req.getFrom().getName()));
element.add(TransferGlobals.createAttribute(element, "holdid", req.getHoldId()));
}
! TransferReceiptBuilder(final String tagname,final TransferRequest req,final String id) throws InvalidTransferException, NegativeTransferException, NeuClearException {
super(tagname,
req.getAsset(),
***************
*** 87,91 ****
req.getValueTime(),
req.getComment());
! Element element = getElement();
element.add(TransferGlobals.createAttribute(element, "sender", req.getFrom().getName()));
element.add(TransferGlobals.createAttribute(element, "reqid", req.getName()));
--- 94,98 ----
req.getValueTime(),
req.getComment());
! final Element element = getElement();
element.add(TransferGlobals.createAttribute(element, "sender", req.getFrom().getName()));
element.add(TransferGlobals.createAttribute(element, "reqid", req.getName()));
Index: TransferRequestBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/contracts/builders/TransferRequestBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TransferRequestBuilder.java 10 Nov 2003 17:42:07 -0000 1.3
--- TransferRequestBuilder.java 21 Nov 2003 04:43:03 -0000 1.4
***************
*** 7,10 ****
--- 7,11 ----
import org.neuclear.id.Identity;
import org.neuclear.id.NSTools;
+ import org.neuclear.commons.NeuClearException;
import java.util.Date;
***************
*** 30,33 ****
--- 31,40 ----
$Id$
$Log$
+ Revision 1.4 2003/11/21 04:43:03 pelle
+ EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
+ Otherwise You will Finaliate.
+ 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.3 2003/11/10 17:42:07 pelle
The AssetController interface has been more or less finalized.
***************
*** 65,72 ****
*/
public class TransferRequestBuilder extends TransferBuilder {
! public TransferRequestBuilder(Asset asset, Identity signer, Identity to, double amount, Date valuetime, String comment) throws InvalidTransferException, NegativeTransferException {
this(TransferGlobals.XFER_TAGNAME, asset, signer, to, amount, valuetime, comment);
}
! TransferRequestBuilder(String tagname,Asset asset, Identity signer, Identity to, double amount, Date valuetime, String comment) throws InvalidTransferException, NegativeTransferException {
super(tagname, asset, signer, to, amount, valuetime, comment);
}
--- 72,79 ----
*/
public class TransferRequestBuilder extends TransferBuilder {
! public TransferRequestBuilder(final Asset asset, final Identity signer, final Identity to, final double amount, final Date valuetime, final String comment) throws InvalidTransferException, NegativeTransferException, NeuClearException {
this(TransferGlobals.XFER_TAGNAME, asset, signer, to, amount, valuetime, comment);
}
! TransferRequestBuilder(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(tagname, asset, signer, to, amount, valuetime, comment);
}
|
