|
From: Pelle B. <pe...@us...> - 2004-04-05 16:44:55
|
Update of /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/orders In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25941/src/java/org/neuclear/asset/orders Modified Files: AssetTransactionContract.java TransferGlobals.java TransferOrder.java Log Message: Created new ServiceBuilder class for creating services. A service is an identity that has a seperate service URL and Service Public Key. Index: TransferOrder.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/orders/TransferOrder.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** TransferOrder.java 2 Apr 2004 23:04:36 -0000 1.7 --- TransferOrder.java 5 Apr 2004 16:31:41 -0000 1.8 *************** *** 2,11 **** import org.dom4j.Element; - import org.neuclear.asset.contracts.Asset; import org.neuclear.asset.contracts.AssetGlobals; ! import org.neuclear.id.InvalidNamedObjectException; ! import org.neuclear.id.NamedObjectReader; ! import org.neuclear.id.SignedNamedCore; ! import org.neuclear.id.SignedNamedObject; /** --- 2,7 ---- import org.dom4j.Element; import org.neuclear.asset.contracts.AssetGlobals; ! import org.neuclear.id.*; /** *************** *** 16,20 **** public final class TransferOrder extends AssetTransactionContract { ! private TransferOrder(final SignedNamedCore core, final Asset asset, final String recipient, final Value amount, final String comment) { super(core, asset); this.amount = amount; --- 12,16 ---- public final class TransferOrder extends AssetTransactionContract { ! private TransferOrder(final SignedNamedCore core, final Service asset, final String recipient, final Value amount, final String comment) { super(core, asset); this.amount = amount; Index: TransferGlobals.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/orders/TransferGlobals.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** TransferGlobals.java 2 Apr 2004 23:04:36 -0000 1.9 --- TransferGlobals.java 5 Apr 2004 16:31:41 -0000 1.10 *************** *** 35,38 **** --- 35,41 ---- $Id$ $Log$ + Revision 1.10 2004/04/05 16:31:41 pelle + Created new ServiceBuilder class for creating services. A service is an identity that has a seperate service URL and Service Public Key. + Revision 1.9 2004/04/02 23:04:36 pelle Got TransferOrder and Builder working with their test cases. *************** *** 274,278 **** public static final SignedNamedObject parseEmbedded(Element elem, QName name) throws InvalidNamedObjectException { ! Element embedded = elem.element(name); if (embedded == null) throw new InvalidNamedObjectException("Element: " + elem.getName() + " doesnt contain a " + name.getQualifiedName()); --- 277,282 ---- public static final SignedNamedObject parseEmbedded(Element elem, QName name) throws InvalidNamedObjectException { ! final Element embedded = elem.element(name).createCopy(); ! DocumentHelper.createDocument(embedded); if (embedded == null) throw new InvalidNamedObjectException("Element: " + elem.getName() + " doesnt contain a " + name.getQualifiedName()); Index: AssetTransactionContract.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/orders/AssetTransactionContract.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AssetTransactionContract.java 10 Jan 2004 00:00:45 -0000 1.2 --- AssetTransactionContract.java 5 Apr 2004 16:31:41 -0000 1.3 *************** *** 1,5 **** package org.neuclear.asset.orders; ! import org.neuclear.asset.contracts.Asset; import org.neuclear.id.SignedNamedCore; import org.neuclear.id.SignedNamedObject; --- 1,5 ---- package org.neuclear.asset.orders; ! import org.neuclear.id.Service; import org.neuclear.id.SignedNamedCore; import org.neuclear.id.SignedNamedObject; *************** *** 12,15 **** --- 12,18 ---- * $Id$ * $Log$ + * Revision 1.3 2004/04/05 16:31:41 pelle + * Created new ServiceBuilder class for creating services. A service is an identity that has a seperate service URL and Service Public Key. + * * Revision 1.2 2004/01/10 00:00:45 pelle * Implemented new Schema for Transfer* *************** *** 18,40 **** * Changed SignedNamedObject.getDigest() from byte array to String. * The whole malarchy in neuclear-pay does not build yet. The refactoring is a big job, but getting there. ! * * Revision 1.1 2004/01/05 23:47:09 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.11 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.10 2003/12/19 18:02:35 pelle * Revamped a lot of exception handling throughout the framework, it has been simplified in most places: * - For most cases the main exception to worry about now is InvalidNamedObjectException. * - Most lowerlevel exception that cant be handled meaningful are now wrapped in the LowLevelException, a ! * runtime exception. * - Source and Store patterns each now have their own exceptions that generalizes the various physical ! * exceptions that can happen in that area. ! * * Revision 1.9 2003/12/10 23:52:39 pelle * Did some cleaning up in the builders --- 21,43 ---- * Changed SignedNamedObject.getDigest() from byte array to String. * The whole malarchy in neuclear-pay does not build yet. The refactoring is a big job, but getting there. ! * <p/> * Revision 1.1 2004/01/05 23:47:09 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. ! * <p/> * Revision 1.11 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. ! * <p/> * Revision 1.10 2003/12/19 18:02:35 pelle * Revamped a lot of exception handling throughout the framework, it has been simplified in most places: * - For most cases the main exception to worry about now is InvalidNamedObjectException. * - Most lowerlevel exception that cant be handled meaningful are now wrapped in the LowLevelException, a ! * runtime exception. * - Source and Store patterns each now have their own exceptions that generalizes the various physical ! * exceptions that can happen in that area. ! * <p/> * Revision 1.9 2003/12/10 23:52:39 pelle * Did some cleaning up in the builders *************** *** 43,47 **** * 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. --- 46,50 ---- * We are close to 0.8 final of ID, 0.11 final of XMLSIG and 0.5 of commons. * Will release shortly. ! * <p/> * Revision 1.8 2003/11/28 00:11:50 pelle * Getting the NeuClear web transactions working. *************** *** 87,93 **** */ public abstract class AssetTransactionContract extends SignedNamedObject { ! private final Asset asset; ! protected AssetTransactionContract(final SignedNamedCore core, final Asset asset) { super(core); this.asset = asset; --- 90,96 ---- */ public abstract class AssetTransactionContract extends SignedNamedObject { ! private final Service asset; ! protected AssetTransactionContract(final SignedNamedCore core, final Service asset) { super(core); this.asset = asset; *************** *** 95,99 **** ! public final Asset getAsset() { return asset; } --- 98,102 ---- ! public final Service getAsset() { return asset; } |