Menu
▾
▴
[Neuclear-develop] neuclear-pay/src/java/org/neuclear/exchange/orders/builders CancelExchangeOrderBuilder.java,1.1,1.2 CancelExchangeReceiptBuilder.java,1.4,1.5 ExchangeCompletedReceiptBuilder.java,1.1,1.2 ExchangeCompletionOrderBuilder.java,1.1,1.2 ExchangeOrderBuilder.java,1.2,1.3 ExchangeOrderReceiptBuilder.java,1.1,1.2
|
From: Pelle B. <pe...@us...> - 2004-04-05 16:45:05
|
Update of /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/orders/builders In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25941/src/java/org/neuclear/exchange/orders/builders Modified Files: CancelExchangeOrderBuilder.java CancelExchangeReceiptBuilder.java ExchangeCompletedReceiptBuilder.java ExchangeCompletionOrderBuilder.java ExchangeOrderBuilder.java ExchangeOrderReceiptBuilder.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: ExchangeOrderBuilder.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/orders/builders/ExchangeOrderBuilder.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ExchangeOrderBuilder.java 12 Jan 2004 22:39:15 -0000 1.2 --- ExchangeOrderBuilder.java 5 Apr 2004 16:31:43 -0000 1.3 *************** *** 4,18 **** import org.neuclear.asset.InvalidTransferException; import org.neuclear.asset.NegativeTransferException; - import org.neuclear.asset.contracts.Asset; import org.neuclear.asset.orders.TransferGlobals; import org.neuclear.asset.orders.Value; import org.neuclear.commons.NeuClearException; import org.neuclear.commons.Utility; import org.neuclear.exchange.contracts.ExchangeAgent; - import org.neuclear.exchange.orders.ExchangeGlobals; import org.neuclear.exchange.orders.BidItem; ! import org.neuclear.xml.xmlsec.SignedElement; import org.neuclear.id.builders.Builder; /* NeuClear Distributed Transaction Clearing Platform --- 4,20 ---- import org.neuclear.asset.InvalidTransferException; import org.neuclear.asset.NegativeTransferException; import org.neuclear.asset.orders.TransferGlobals; import org.neuclear.asset.orders.Value; import org.neuclear.commons.NeuClearException; import org.neuclear.commons.Utility; + import org.neuclear.commons.time.TimeTools; import org.neuclear.exchange.contracts.ExchangeAgent; import org.neuclear.exchange.orders.BidItem; ! import org.neuclear.exchange.orders.ExchangeOrderGlobals; ! import org.neuclear.id.Service; import org.neuclear.id.builders.Builder; + import java.util.Date; + /* NeuClear Distributed Transaction Clearing Platform *************** *** 35,38 **** --- 37,43 ---- $Id$ $Log$ + Revision 1.3 2004/04/05 16:31:43 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/12 22:39:15 pelle Completed all the builders and contracts. *************** *** 128,136 **** */ public class ExchangeOrderBuilder extends Builder { ! protected ExchangeOrderBuilder(final Asset asset, final ExchangeAgent agent, final Value amount, final BidItem items[], final String comment) throws InvalidTransferException, NegativeTransferException, NeuClearException { ! super(ExchangeGlobals.createQName(ExchangeGlobals.EXCHANGE_TAGNAME)); if (amount.getAmount() < 0) throw new NegativeTransferException(amount); ! if (asset==null) throw new InvalidTransferException("assetName"); if (agent == null) --- 133,141 ---- */ public class ExchangeOrderBuilder extends Builder { ! protected ExchangeOrderBuilder(final Service asset, final ExchangeAgent agent, final Value amount, final Date expiry, final BidItem items[], final String comment) throws InvalidTransferException, NegativeTransferException, NeuClearException { ! super(ExchangeOrderGlobals.createQName(ExchangeOrderGlobals.EXCHANGE_TAGNAME)); if (amount.getAmount() < 0) throw new NegativeTransferException(amount); ! if (asset == null) throw new InvalidTransferException("assetName"); if (agent == null) *************** *** 138,148 **** final Element element = getElement(); ! element.add(ExchangeGlobals.createElement(ExchangeGlobals.AGENT_TAG, agent.getName())); element.add(TransferGlobals.createElement(TransferGlobals.ASSET_TAG, asset.getName())); element.add(TransferGlobals.createValueTag(amount)); for (int i = 0; i < items.length; i++) { BidItem item = items[i]; ! Element bidelem=element.addElement(ExchangeGlobals.BID_ITEM_TAG); bidelem.addElement(TransferGlobals.createQName(TransferGlobals.ASSET_TAG)).setText(item.getAsset().getName()); bidelem.add(TransferGlobals.createValueTag(item.getAmount())); --- 143,154 ---- final Element element = getElement(); ! element.add(ExchangeOrderGlobals.createElement(ExchangeOrderGlobals.AGENT_TAG, agent.getName())); element.add(TransferGlobals.createElement(TransferGlobals.ASSET_TAG, asset.getName())); element.add(TransferGlobals.createValueTag(amount)); + element.add(ExchangeOrderGlobals.createElement(ExchangeOrderGlobals.EXPIRY_TAG, TimeTools.formatTimeStamp(expiry))); for (int i = 0; i < items.length; i++) { BidItem item = items[i]; ! Element bidelem = element.addElement(ExchangeOrderGlobals.BID_ITEM_TAG); bidelem.addElement(TransferGlobals.createQName(TransferGlobals.ASSET_TAG)).setText(item.getAsset().getName()); bidelem.add(TransferGlobals.createValueTag(item.getAmount())); Index: ExchangeOrderReceiptBuilder.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/orders/builders/ExchangeOrderReceiptBuilder.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ExchangeOrderReceiptBuilder.java 12 Jan 2004 22:39:15 -0000 1.1 --- ExchangeOrderReceiptBuilder.java 5 Apr 2004 16:31:43 -0000 1.2 *************** *** 5,10 **** import org.neuclear.asset.orders.builders.ReceiptBuilder; import org.neuclear.commons.NeuClearException; - import org.neuclear.exchange.orders.ExchangeGlobals; import org.neuclear.exchange.orders.ExchangeOrder; import java.util.Date; --- 5,10 ---- import org.neuclear.asset.orders.builders.ReceiptBuilder; import org.neuclear.commons.NeuClearException; import org.neuclear.exchange.orders.ExchangeOrder; + import org.neuclear.exchange.orders.ExchangeOrderGlobals; import java.util.Date; *************** *** 30,33 **** --- 30,36 ---- $Id$ $Log$ + Revision 1.2 2004/04/05 16:31:43 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.1 2004/01/12 22:39:15 pelle Completed all the builders and contracts. *************** *** 94,99 **** */ public final class ExchangeOrderReceiptBuilder extends ReceiptBuilder { ! public ExchangeOrderReceiptBuilder(final ExchangeOrder order,Date valuetime) throws InvalidTransferException, NegativeTransferException, NeuClearException { ! super(ExchangeGlobals.createQName(ExchangeGlobals.EXCHANGE_RCPT_TAGNAME), order,valuetime); } } --- 97,102 ---- */ public final class ExchangeOrderReceiptBuilder extends ReceiptBuilder { ! public ExchangeOrderReceiptBuilder(final ExchangeOrder order, Date valuetime) throws InvalidTransferException, NegativeTransferException, NeuClearException { ! super(ExchangeOrderGlobals.createQName(ExchangeOrderGlobals.EXCHANGE_RCPT_TAGNAME), order, valuetime); } } Index: CancelExchangeReceiptBuilder.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/orders/builders/CancelExchangeReceiptBuilder.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** CancelExchangeReceiptBuilder.java 13 Jan 2004 15:11:17 -0000 1.4 --- CancelExchangeReceiptBuilder.java 5 Apr 2004 16:31:43 -0000 1.5 *************** *** 3,12 **** import org.neuclear.asset.InvalidTransferException; import org.neuclear.asset.NegativeTransferException; - import org.neuclear.asset.orders.TransferGlobals; import org.neuclear.asset.orders.builders.ReceiptBuilder; import org.neuclear.commons.NeuClearException; import org.neuclear.exchange.orders.CancelExchangeOrder; ! import org.neuclear.exchange.orders.ExchangeGlobals; ! import org.neuclear.id.NSTools; import java.util.Date; --- 3,10 ---- import org.neuclear.asset.InvalidTransferException; import org.neuclear.asset.NegativeTransferException; import org.neuclear.asset.orders.builders.ReceiptBuilder; import org.neuclear.commons.NeuClearException; import org.neuclear.exchange.orders.CancelExchangeOrder; ! import org.neuclear.exchange.orders.ExchangeOrderGlobals; import java.util.Date; *************** *** 19,31 **** * $Id$ * $Log$ * Revision 1.4 2004/01/13 15:11:17 pelle * Now builds. * Now need to do unit tests ! * * Revision 1.3 2004/01/12 22:39:14 pelle * Completed all the builders and contracts. * Added a new abstract Value class to contain either an amount or a list of serial numbers. * Now ready to finish off the AssetControllers. ! * * Revision 1.2 2004/01/10 00:00:46 pelle * Implemented new Schema for Transfer* --- 17,32 ---- * $Id$ * $Log$ + * Revision 1.5 2004/04/05 16:31:43 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.4 2004/01/13 15:11:17 pelle * Now builds. * Now need to do unit tests ! * <p/> * Revision 1.3 2004/01/12 22:39:14 pelle * Completed all the builders and contracts. * Added a new abstract Value class to contain either an amount or a list of serial numbers. * Now ready to finish off the AssetControllers. ! * <p/> * Revision 1.2 2004/01/10 00:00:46 pelle * Implemented new Schema for Transfer* *************** *** 34,48 **** * 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:10 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.1 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.3 2003/12/06 00:16:10 pelle * Updated various areas in NSTools. --- 35,49 ---- * 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:10 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.1 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.3 2003/12/06 00:16:10 pelle * Updated various areas in NSTools. *************** *** 51,55 **** * 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. --- 52,56 ---- * In CryptoTools updated getRandom() to finally use a SecureRandom. * Changed CryptoTools.getFormatURLSafe to getBase36 because that is what it really is. ! * <p/> * Revision 1.2 2003/11/21 04:43:03 pelle * EncryptedFileStore now works. It uses the PBECipher with DES3 afair. *************** *** 64,69 **** */ public final class CancelExchangeReceiptBuilder extends ReceiptBuilder { ! public CancelExchangeReceiptBuilder(final CancelExchangeOrder req,Date time) throws InvalidTransferException, NegativeTransferException, NeuClearException { ! super(ExchangeGlobals.createQName(ExchangeGlobals.CANCEL_RCPT_TAGNAME), req,time); } --- 65,70 ---- */ public final class CancelExchangeReceiptBuilder extends ReceiptBuilder { ! public CancelExchangeReceiptBuilder(final CancelExchangeOrder req, Date time) throws InvalidTransferException, NegativeTransferException, NeuClearException { ! super(ExchangeOrderGlobals.createQName(ExchangeOrderGlobals.CANCEL_RCPT_TAGNAME), req, time); } Index: CancelExchangeOrderBuilder.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/orders/builders/CancelExchangeOrderBuilder.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CancelExchangeOrderBuilder.java 12 Jan 2004 22:39:14 -0000 1.1 --- CancelExchangeOrderBuilder.java 5 Apr 2004 16:31:43 -0000 1.2 *************** *** 1,9 **** package org.neuclear.exchange.orders.builders; import org.neuclear.id.builders.EmbeddedSignedObjectBuilder; - import org.neuclear.id.SignedNamedObject; - import org.neuclear.exchange.orders.ExchangeOrder; - import org.neuclear.exchange.orders.ExchangeGlobals; - import org.dom4j.QName; /** --- 1,7 ---- package org.neuclear.exchange.orders.builders; + import org.neuclear.exchange.orders.ExchangeOrderGlobals; + import org.neuclear.exchange.orders.ExchangeOrderReceipt; import org.neuclear.id.builders.EmbeddedSignedObjectBuilder; /** *************** *** 15,20 **** */ public class CancelExchangeOrderBuilder extends EmbeddedSignedObjectBuilder { ! public CancelExchangeOrderBuilder(final ExchangeOrder embedded) { ! super(ExchangeGlobals.createQName(ExchangeGlobals.CANCEL_TAGNAME), embedded); } } --- 13,18 ---- */ public class CancelExchangeOrderBuilder extends EmbeddedSignedObjectBuilder { ! public CancelExchangeOrderBuilder(final ExchangeOrderReceipt embedded) { ! super(ExchangeOrderGlobals.createQName(ExchangeOrderGlobals.CANCEL_TAGNAME), embedded); } } Index: ExchangeCompletionOrderBuilder.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/orders/builders/ExchangeCompletionOrderBuilder.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ExchangeCompletionOrderBuilder.java 12 Jan 2004 22:39:15 -0000 1.1 --- ExchangeCompletionOrderBuilder.java 5 Apr 2004 16:31:43 -0000 1.2 *************** *** 1,15 **** package org.neuclear.exchange.orders.builders; ! import org.neuclear.id.builders.EmbeddedSignedObjectBuilder; ! import org.neuclear.id.SignedNamedObject; ! import org.neuclear.exchange.orders.ExchangeOrder; ! import org.neuclear.exchange.orders.ExchangeGlobals; import org.neuclear.asset.orders.TransferGlobals; import org.neuclear.asset.orders.Value; - import org.neuclear.asset.InvalidTransferException; import org.neuclear.commons.Utility; import org.neuclear.commons.time.TimeTools; ! import org.dom4j.QName; ! import org.dom4j.Element; import java.util.Date; --- 1,13 ---- package org.neuclear.exchange.orders.builders; ! import org.dom4j.Element; ! import org.neuclear.asset.InvalidTransferException; import org.neuclear.asset.orders.TransferGlobals; import org.neuclear.asset.orders.Value; import org.neuclear.commons.Utility; import org.neuclear.commons.time.TimeTools; ! import org.neuclear.exchange.orders.ExchangeOrderGlobals; ! import org.neuclear.exchange.orders.ExchangeOrderReceipt; ! import org.neuclear.id.builders.EmbeddedSignedObjectBuilder; import java.util.Date; *************** *** 22,30 **** * To change this template use Options | File Templates. */ ! public class ExchangeCompletionOrderBuilder extends EmbeddedSignedObjectBuilder{ ! public ExchangeCompletionOrderBuilder(final ExchangeOrder embedded, final Date exchangedate,final Value amount, final String comment) throws InvalidTransferException { ! super(ExchangeGlobals.createQName(ExchangeGlobals.COMPLETE_TAGNAME), embedded); final Element element = getElement(); ! getElement().addElement(ExchangeGlobals.EXCHANGE_TIME_TAGNAME).setText(TimeTools.formatTimeStamp(exchangedate)); element.add(TransferGlobals.createValueTag(amount)); --- 20,30 ---- * To change this template use Options | File Templates. */ ! public class ExchangeCompletionOrderBuilder extends EmbeddedSignedObjectBuilder { ! public ExchangeCompletionOrderBuilder(final ExchangeOrderReceipt embedded, final Date exchangedate, final String recipient, final Value amount, final String comment) throws InvalidTransferException { ! super(ExchangeOrderGlobals.createQName(ExchangeOrderGlobals.COMPLETE_TAGNAME), embedded); final Element element = getElement(); ! element.add(TransferGlobals.createElement(TransferGlobals.RECIPIENT_TAG, recipient)); ! ! getElement().addElement(ExchangeOrderGlobals.createQName(ExchangeOrderGlobals.EXCHANGE_TIME_TAGNAME)).setText(TimeTools.formatTimeStamp(exchangedate)); element.add(TransferGlobals.createValueTag(amount)); Index: ExchangeCompletedReceiptBuilder.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/orders/builders/ExchangeCompletedReceiptBuilder.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ExchangeCompletedReceiptBuilder.java 12 Jan 2004 22:39:14 -0000 1.1 --- ExchangeCompletedReceiptBuilder.java 5 Apr 2004 16:31:43 -0000 1.2 *************** *** 5,11 **** import org.neuclear.asset.orders.builders.ReceiptBuilder; import org.neuclear.commons.NeuClearException; - import org.neuclear.exchange.orders.ExchangeGlobals; - import org.neuclear.exchange.orders.ExchangeOrder; import org.neuclear.exchange.orders.ExchangeCompletionOrder; import java.util.Date; --- 5,10 ---- import org.neuclear.asset.orders.builders.ReceiptBuilder; import org.neuclear.commons.NeuClearException; import org.neuclear.exchange.orders.ExchangeCompletionOrder; + import org.neuclear.exchange.orders.ExchangeOrderGlobals; import java.util.Date; *************** *** 31,34 **** --- 30,36 ---- $Id$ $Log$ + Revision 1.2 2004/04/05 16:31:43 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.1 2004/01/12 22:39:14 pelle Completed all the builders and contracts. *************** *** 95,100 **** */ public final class ExchangeCompletedReceiptBuilder extends ReceiptBuilder { ! public ExchangeCompletedReceiptBuilder(final ExchangeCompletionOrder order,Date valuetime) throws InvalidTransferException, NegativeTransferException, NeuClearException { ! super(ExchangeGlobals.createQName(ExchangeGlobals.COMPLETE_RCPT_TAGNAME), order,valuetime); } } --- 97,102 ---- */ public final class ExchangeCompletedReceiptBuilder extends ReceiptBuilder { ! public ExchangeCompletedReceiptBuilder(final ExchangeCompletionOrder order, Date valuetime) throws InvalidTransferException, NegativeTransferException, NeuClearException { ! super(ExchangeOrderGlobals.createQName(ExchangeOrderGlobals.COMPLETE_RCPT_TAGNAME), order, valuetime); } } |
