Menu
▾
▴
[Neuclear-develop] neuclear-pay/src/java/org/neuclear/asset/contracts Asset.java,1.9,1.10 AssetTransactionContract.java,1.8,1.9
|
From: <pe...@us...> - 2003-12-10 23:52:42
|
Update of /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/contracts
In directory sc8-pr-cvs1:/tmp/cvs-serv988/src/java/org/neuclear/asset/contracts
Modified Files:
Asset.java AssetTransactionContract.java
Log Message:
Did some cleaning up in the builders
Fixed some stuff in IdentityCreator
New maven goal to create executable jarapp
We are close to 0.8 final of ID, 0.11 final of XMLSIG and 0.5 of commons.
Will release shortly.
Index: Asset.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/contracts/Asset.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Asset.java 21 Nov 2003 04:43:04 -0000 1.9
--- Asset.java 10 Dec 2003 23:52:39 -0000 1.10
***************
*** 6,11 ****
import org.neuclear.commons.Utility;
import org.neuclear.id.*;
- import org.neuclear.id.verifier.VerifyingReader;
- import org.neuclear.senders.SoapSender;
import org.neuclear.xml.xmlsec.KeyInfo;
import org.neuclear.xml.xmlsec.XMLSecTools;
--- 6,9 ----
***************
*** 13,17 ****
import java.security.PublicKey;
- import java.sql.Timestamp;
/*
--- 11,14 ----
***************
*** 35,38 ****
--- 32,42 ----
$Id$
$Log$
+ Revision 1.10 2003/12/10 23:52:39 pelle
+ Did some cleaning up in the builders
+ Fixed some stuff in IdentityCreator
+ New maven goal to create executable jarapp
+ We are close to 0.8 final of ID, 0.11 final of XMLSIG and 0.5 of commons.
+ Will release shortly.
+
Revision 1.9 2003/11/21 04:43:04 pelle
EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
***************
*** 48,52 ****
Refactored the relationship between SignedNamedObject and NamedObjectBuilder a bit.
SignedNamedObject now contains the full xml which is returned with getEncoded()
! This means that it is now possible to further send on or process a SignedNamedObject, leaving
NamedObjectBuilder for its original purposes of purely generating new Contracts.
NamedObjectBuilder.sign() now returns a SignedNamedObject which is the prefered way of processing it.
--- 52,56 ----
Refactored the relationship between SignedNamedObject and NamedObjectBuilder a bit.
SignedNamedObject now contains the full xml which is returned with getEncoded()
! This means that it is now possible to further receive on or process a SignedNamedObject, leaving
NamedObjectBuilder for its original purposes of purely generating new Contracts.
NamedObjectBuilder.sign() now returns a SignedNamedObject which is the prefered way of processing it.
***************
*** 98,124 ****
*/
public final class Asset extends Identity {
! protected Asset(final SignedNamedCore core, final String repository, final String signer, final String logger, final String receiver, final PublicKey pub, final String assetController, final int decimal, final double minimumTransaction) throws NeuClearException {
super(core, repository, signer, logger, receiver, pub);
- this.assetController = assetController;
this.decimal = decimal;
this.multiplier = (int) Math.round(Math.pow(10, -decimal));
! this.minimumTransaction=minimumTransaction;
! }
!
!
! public final String getControllerURL() {
! return assetController;
}
- /**
- * Sends a contract to the Assets controller.
- *
- * @param obj NamedObjectBuilder
- * @return The receipt
- * @throws NeuClearException
- */
- public final SignedNamedObject send(final SignedNamedObject obj) throws NeuClearException {
- return SoapSender.quickSend(assetController, obj);
- }
/**
--- 102,112 ----
*/
public final class Asset extends Identity {
! protected Asset(final SignedNamedCore core, final String repository, final String signer, final String logger, final String receiver, final PublicKey pub, final int decimal, final double minimumTransaction) throws NeuClearException {
super(core, repository, signer, logger, receiver, pub);
this.decimal = decimal;
this.multiplier = (int) Math.round(Math.pow(10, -decimal));
! this.minimumTransaction = minimumTransaction;
}
/**
***************
*** 157,161 ****
if (!elem.getNamespace().equals(AssetGlobals.createNameSpace()))
throw new UnsupportedOperationException("");
- final String assetController = elem.attributeValue("controller");
final String repository = elem.attributeValue(DocumentHelper.createQName("repository", NSTools.NS_NEUID));
final String signer = elem.attributeValue(DocumentHelper.createQName("signer", NSTools.NS_NEUID));
--- 145,148 ----
***************
*** 171,182 ****
final double minimum = (!Utility.isEmpty(min)) ? Double.parseDouble(min) : 0;
! return new Asset(core, repository, signer, logger, receiver, pub, assetController, decimal, minimum);
}
-
}
- private final String assetController;
private final int decimal;
private final int multiplier;
--- 158,167 ----
final double minimum = (!Utility.isEmpty(min)) ? Double.parseDouble(min) : 0;
! return new Asset(core, repository, signer, logger, receiver, pub, decimal, minimum);
}
}
private final int decimal;
private final int multiplier;
Index: AssetTransactionContract.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/contracts/AssetTransactionContract.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** AssetTransactionContract.java 28 Nov 2003 00:11:50 -0000 1.8
--- AssetTransactionContract.java 10 Dec 2003 23:52:39 -0000 1.9
***************
*** 21,27 ****
* $Id$
* $Log$
* Revision 1.8 2003/11/28 00:11:50 pelle
* Getting the NeuClear web transactions working.
! *
* Revision 1.7 2003/11/22 00:22:28 pelle
* All unit tests in commons, id and xmlsec now work.
--- 21,34 ----
* $Id$
* $Log$
+ * Revision 1.9 2003/12/10 23:52:39 pelle
+ * Did some cleaning up in the builders
+ * Fixed some stuff in IdentityCreator
+ * New maven goal to create executable jarapp
+ * We are close to 0.8 final of ID, 0.11 final of XMLSIG and 0.5 of commons.
+ * Will release shortly.
+ *
* Revision 1.8 2003/11/28 00:11:50 pelle
* Getting the NeuClear web transactions working.
! * <p/>
* Revision 1.7 2003/11/22 00:22:28 pelle
* All unit tests in commons, id and xmlsec now work.
***************
*** 43,47 ****
* Refactored the relationship between SignedNamedObject and NamedObjectBuilder a bit.
* SignedNamedObject now contains the full xml which is returned with getEncoded()
! * This means that it is now possible to further send on or process a SignedNamedObject, leaving
* NamedObjectBuilder for its original purposes of purely generating new Contracts.
* NamedObjectBuilder.sign() now returns a SignedNamedObject which is the prefered way of processing it.
--- 50,54 ----
* Refactored the relationship between SignedNamedObject and NamedObjectBuilder a bit.
* SignedNamedObject now contains the full xml which is returned with getEncoded()
! * This means that it is now possible to further receive on or process a SignedNamedObject, leaving
* NamedObjectBuilder for its original purposes of purely generating new Contracts.
* NamedObjectBuilder.sign() now returns a SignedNamedObject which is the prefered way of processing it.
|
