Menu
▾
▴
[Neuclear-develop] neuclear-pay/src/java/org/neuclear/exchange/orders ExchangeOrderGlobals.java,NONE,1.1 BidItem.java,1.1,1.2 CancelExchangeOrder.java,1.5,1.6 CancelExchangeReceipt.java,1.4,1.5 ExchangeCompletedReceipt.java,1.2,1.3 ExchangeCompletionOrder.java,1.7,1.8 ExchangeOrder.java,1.7,1.8 ExchangeOrderReceipt.java,1.4,1.5 ExchangeTransactionContract.java,1.2,1.3 ExchangeGlobals.java,1.4,NONE
|
From: Pelle B. <pe...@us...> - 2004-04-05 16:44:26
|
Update of /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/orders In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25941/src/java/org/neuclear/exchange/orders Modified Files: BidItem.java CancelExchangeOrder.java CancelExchangeReceipt.java ExchangeCompletedReceipt.java ExchangeCompletionOrder.java ExchangeOrder.java ExchangeOrderReceipt.java ExchangeTransactionContract.java Added Files: ExchangeOrderGlobals.java Removed Files: ExchangeGlobals.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: CancelExchangeOrder.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/orders/CancelExchangeOrder.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** CancelExchangeOrder.java 13 Jan 2004 15:11:18 -0000 1.5 --- CancelExchangeOrder.java 5 Apr 2004 16:31:43 -0000 1.6 *************** *** 2,9 **** import org.dom4j.Element; - import org.neuclear.asset.contracts.Asset; - import org.neuclear.asset.contracts.AssetGlobals; import org.neuclear.asset.orders.TransferGlobals; - import org.neuclear.exchange.contracts.ExchangeAgent; import org.neuclear.id.InvalidNamedObjectException; import org.neuclear.id.NamedObjectReader; --- 2,6 ---- *************** *** 16,26 **** * Time: 5:35:26 PM */ ! public final class CancelExchangeOrder extends ExchangeTransactionContract{ ! private CancelExchangeOrder(final SignedNamedCore core, final ExchangeOrderReceipt receipt) { super(core, receipt.getAsset(), receipt.getAgent()); ! this.receipt=receipt; } ! public ExchangeOrderReceipt getReceipt(){ return receipt; } --- 13,24 ---- * Time: 5:35:26 PM */ ! public final class CancelExchangeOrder extends ExchangeTransactionContract { ! private CancelExchangeOrder(final SignedNamedCore core, final ExchangeOrderReceipt receipt) { super(core, receipt.getAsset(), receipt.getAgent()); ! this.receipt = receipt; } ! ! public ExchangeOrderReceipt getReceipt() { return receipt; } *************** *** 37,49 **** */ public final SignedNamedObject read(final SignedNamedCore core, final Element elem) throws InvalidNamedObjectException { ! if (!elem.getNamespace().equals(AssetGlobals.NS_ASSET)) ! throw new InvalidNamedObjectException(core.getName(),"Not in XML NameSpace: "+AssetGlobals.NS_ASSET.getURI()); ! if (elem.getName().equals(ExchangeGlobals.CANCEL_TAGNAME)) return new CancelExchangeOrder(core, ! (ExchangeOrderReceipt) TransferGlobals.parseEmbedded(elem,ExchangeGlobals.createQName(ExchangeGlobals.EXCHANGE_RCPT_TAGNAME)) ! ); ! throw new InvalidNamedObjectException(core.getName(),"Not Matched"); } } --- 35,46 ---- */ public final SignedNamedObject read(final SignedNamedCore core, final Element elem) throws InvalidNamedObjectException { ! if (!elem.getNamespace().equals(ExchangeOrderGlobals.NS_EXCHANGE)) ! throw new InvalidNamedObjectException(core.getName(), "Not in XML NameSpace: " + ExchangeOrderGlobals.NS_EXCHANGE.getURI()); ! if (elem.getName().equals(ExchangeOrderGlobals.CANCEL_TAGNAME)) return new CancelExchangeOrder(core, ! (ExchangeOrderReceipt) TransferGlobals.parseEmbedded(elem, ExchangeOrderGlobals.createQName(ExchangeOrderGlobals.EXCHANGE_RCPT_TAGNAME))); ! throw new InvalidNamedObjectException(core.getName(), "Not Matched"); } } Index: CancelExchangeReceipt.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/orders/CancelExchangeReceipt.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** CancelExchangeReceipt.java 3 Mar 2004 23:28:14 -0000 1.4 --- CancelExchangeReceipt.java 5 Apr 2004 16:31:43 -0000 1.5 *************** *** 1,6 **** package org.neuclear.exchange.orders; import org.dom4j.Element; - import org.neuclear.asset.contracts.AssetGlobals; import org.neuclear.asset.orders.TransferGlobals; import org.neuclear.id.InvalidNamedObjectException; --- 1,6 ---- package org.neuclear.exchange.orders; + import org.dom4j.DocumentHelper; import org.dom4j.Element; import org.neuclear.asset.orders.TransferGlobals; import org.neuclear.id.InvalidNamedObjectException; *************** *** 30,34 **** } ! public Timestamp getCanceltime() { return new Timestamp(canceltime); } --- 30,34 ---- } ! public Timestamp getCancellationTime() { return new Timestamp(canceltime); } *************** *** 45,54 **** */ public final SignedNamedObject read(final SignedNamedCore core, final Element elem) throws InvalidNamedObjectException { ! if (!elem.getNamespace().equals(AssetGlobals.NS_ASSET)) ! throw new InvalidNamedObjectException(core.getName(), "Not in XML NameSpace: " + AssetGlobals.NS_ASSET.getURI()); ! if (elem.getName().equals(ExchangeGlobals.CANCEL_RCPT_TAGNAME)) { final Date valuetime = TransferGlobals.parseValueTimeElement(elem); ! CancelExchangeOrder order = (CancelExchangeOrder) VerifyingReader.getInstance().read(elem.element(ExchangeGlobals.createQName(ExchangeGlobals.CANCEL_TAGNAME))); return new CancelExchangeReceipt(core, order, valuetime); } --- 45,56 ---- */ public final SignedNamedObject read(final SignedNamedCore core, final Element elem) throws InvalidNamedObjectException { ! if (!elem.getNamespace().equals(ExchangeOrderGlobals.NS_EXCHANGE)) ! throw new InvalidNamedObjectException(core.getName(), "Not in XML NameSpace: " + ExchangeOrderGlobals.NS_EXCHANGE.getURI()); ! if (elem.getName().equals(ExchangeOrderGlobals.CANCEL_RCPT_TAGNAME)) { final Date valuetime = TransferGlobals.parseValueTimeElement(elem); ! final Element orderElement = elem.element(ExchangeOrderGlobals.createQName(ExchangeOrderGlobals.CANCEL_TAGNAME)).createCopy(); ! DocumentHelper.createDocument(orderElement); ! CancelExchangeOrder order = (CancelExchangeOrder) VerifyingReader.getInstance().read(orderElement); return new CancelExchangeReceipt(core, order, valuetime); } Index: ExchangeCompletionOrder.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/orders/ExchangeCompletionOrder.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ExchangeCompletionOrder.java 2 Apr 2004 23:04:36 -0000 1.7 --- ExchangeCompletionOrder.java 5 Apr 2004 16:31:43 -0000 1.8 *************** *** 2,6 **** import org.dom4j.Element; - import org.neuclear.asset.contracts.AssetGlobals; import org.neuclear.asset.orders.TransferGlobals; import org.neuclear.asset.orders.Value; --- 2,5 ---- *************** *** 62,74 **** */ public final SignedNamedObject read(final SignedNamedCore core, final Element elem) throws InvalidNamedObjectException { ! if (!elem.getNamespace().equals(AssetGlobals.NS_ASSET)) ! throw new InvalidNamedObjectException(core.getName(), "Not in XML NameSpace: " + AssetGlobals.NS_ASSET.getURI()); ! if (elem.getName().equals(ExchangeGlobals.COMPLETE_TAGNAME)) { return new ExchangeCompletionOrder(core, ! (ExchangeOrderReceipt) TransferGlobals.parseEmbedded(elem, ExchangeGlobals.createQName(ExchangeGlobals.EXCHANGE_RCPT_TAGNAME)), TransferGlobals.parseRecipientTag(elem), TransferGlobals.parseValueTag(elem), ! TransferGlobals.parseTimeStampElement(elem, ExchangeGlobals.createQName(ExchangeGlobals.EXCHANGE_TIME_TAGNAME)), TransferGlobals.parseCommentElement(elem)); } --- 61,73 ---- */ public final SignedNamedObject read(final SignedNamedCore core, final Element elem) throws InvalidNamedObjectException { ! if (!elem.getNamespace().equals(ExchangeOrderGlobals.NS_EXCHANGE)) ! throw new InvalidNamedObjectException(core.getName(), "Not in XML NameSpace: " + ExchangeOrderGlobals.NS_EXCHANGE.getURI()); ! if (elem.getName().equals(ExchangeOrderGlobals.COMPLETE_TAGNAME)) { return new ExchangeCompletionOrder(core, ! (ExchangeOrderReceipt) TransferGlobals.parseEmbedded(elem, ExchangeOrderGlobals.createQName(ExchangeOrderGlobals.EXCHANGE_RCPT_TAGNAME)), TransferGlobals.parseRecipientTag(elem), TransferGlobals.parseValueTag(elem), ! TransferGlobals.parseTimeStampElement(elem, ExchangeOrderGlobals.createQName(ExchangeOrderGlobals.EXCHANGE_TIME_TAGNAME)), TransferGlobals.parseCommentElement(elem)); } Index: BidItem.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/orders/BidItem.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BidItem.java 12 Jan 2004 22:39:15 -0000 1.1 --- BidItem.java 5 Apr 2004 16:31:43 -0000 1.2 *************** *** 11,15 **** * To change this template use Options | File Templates. */ ! public class BidItem { public BidItem(Asset asset, Value amount) { this.asset = asset; --- 11,15 ---- * To change this template use Options | File Templates. */ ! public class BidItem { public BidItem(Asset asset, Value amount) { this.asset = asset; Index: ExchangeTransactionContract.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/orders/ExchangeTransactionContract.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ExchangeTransactionContract.java 10 Jan 2004 00:00:46 -0000 1.2 --- ExchangeTransactionContract.java 5 Apr 2004 16:31:43 -0000 1.3 *************** *** 1,7 **** package org.neuclear.exchange.orders; - import org.neuclear.asset.contracts.Asset; import org.neuclear.asset.orders.AssetTransactionContract; import org.neuclear.exchange.contracts.ExchangeAgent; import org.neuclear.id.SignedNamedCore; --- 1,7 ---- package org.neuclear.exchange.orders; import org.neuclear.asset.orders.AssetTransactionContract; import org.neuclear.exchange.contracts.ExchangeAgent; + import org.neuclear.id.Service; import org.neuclear.id.SignedNamedCore; *************** *** 26,29 **** --- 26,32 ---- $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/10 00:00:46 pelle Implemented new Schema for Transfer* *************** *** 44,55 **** * Time: 7:31:15 PM */ ! public abstract class ExchangeTransactionContract extends AssetTransactionContract{ ! ExchangeTransactionContract(SignedNamedCore core, Asset asset,ExchangeAgent agent) { super(core, asset); ! this.agent=agent; } ! public final ExchangeAgent getAgent(){ return agent; } private final ExchangeAgent agent; } --- 47,60 ---- * Time: 7:31:15 PM */ ! public abstract class ExchangeTransactionContract extends AssetTransactionContract { ! ExchangeTransactionContract(SignedNamedCore core, Service asset, ExchangeAgent agent) { super(core, asset); ! this.agent = agent; } ! ! public final ExchangeAgent getAgent() { return agent; } + private final ExchangeAgent agent; } Index: ExchangeOrderReceipt.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/orders/ExchangeOrderReceipt.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ExchangeOrderReceipt.java 12 Jan 2004 22:39:15 -0000 1.4 --- ExchangeOrderReceipt.java 5 Apr 2004 16:31:43 -0000 1.5 *************** *** 2,6 **** import org.dom4j.Element; - import org.neuclear.asset.contracts.AssetGlobals; import org.neuclear.asset.orders.TransferGlobals; import org.neuclear.id.InvalidNamedObjectException; --- 2,5 ---- *************** *** 19,28 **** public final class ExchangeOrderReceipt extends ExchangeTransactionContract { ! private ExchangeOrderReceipt(final SignedNamedCore core, final ExchangeOrder order,final Date valuetime) { super(core, order.getAsset(), order.getAgent()); this.valuetime = valuetime.getTime(); ! this.order=order; } ! public ExchangeOrder getOrder(){ return order; } --- 18,28 ---- public final class ExchangeOrderReceipt extends ExchangeTransactionContract { ! private ExchangeOrderReceipt(final SignedNamedCore core, final ExchangeOrder order, final Date valuetime) { super(core, order.getAsset(), order.getAgent()); this.valuetime = valuetime.getTime(); ! this.order = order; } ! ! public ExchangeOrder getOrder() { return order; } *************** *** 43,55 **** */ public final SignedNamedObject read(final SignedNamedCore core, final Element elem) throws InvalidNamedObjectException { ! if (!elem.getNamespace().equals(AssetGlobals.NS_ASSET)) ! throw new InvalidNamedObjectException(core.getName(),"Not in XML NameSpace: "+AssetGlobals.NS_ASSET.getURI()); ! if (elem.getName().equals(ExchangeGlobals.EXCHANGE_RCPT_TAGNAME)){ return new ExchangeOrderReceipt(core, ! (ExchangeOrder) TransferGlobals.parseEmbedded(elem,ExchangeGlobals.createQName(ExchangeGlobals.EXCHANGE_TAGNAME)), TransferGlobals.parseValueTimeElement(elem)); } ! throw new InvalidNamedObjectException(core.getName(),"Not Matched"); } } --- 43,55 ---- */ public final SignedNamedObject read(final SignedNamedCore core, final Element elem) throws InvalidNamedObjectException { ! if (!elem.getNamespace().equals(ExchangeOrderGlobals.NS_EXCHANGE)) ! throw new InvalidNamedObjectException(core.getName(), "Not in XML NameSpace: " + ExchangeOrderGlobals.NS_EXCHANGE.getURI()); ! if (elem.getName().equals(ExchangeOrderGlobals.EXCHANGE_RCPT_TAGNAME)) { return new ExchangeOrderReceipt(core, ! (ExchangeOrder) TransferGlobals.parseEmbedded(elem, ExchangeOrderGlobals.createQName(ExchangeOrderGlobals.EXCHANGE_TAGNAME)), TransferGlobals.parseValueTimeElement(elem)); } ! throw new InvalidNamedObjectException(core.getName(), "Not Matched"); } } Index: ExchangeCompletedReceipt.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/orders/ExchangeCompletedReceipt.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ExchangeCompletedReceipt.java 10 Jan 2004 00:00:46 -0000 1.2 --- ExchangeCompletedReceipt.java 5 Apr 2004 16:31:43 -0000 1.3 *************** *** 2,6 **** import org.dom4j.Element; - import org.neuclear.asset.contracts.AssetGlobals; import org.neuclear.asset.orders.TransferGlobals; import org.neuclear.id.InvalidNamedObjectException; --- 2,5 ---- *************** *** 32,35 **** --- 31,37 ---- $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/10 00:00:46 pelle Implemented new Schema for Transfer* *************** *** 50,58 **** * Time: 7:38:36 PM */ ! public final class ExchangeCompletedReceipt extends ExchangeTransactionContract{ private ExchangeCompletedReceipt(SignedNamedCore core, ExchangeCompletionOrder order, Date valuetime) { super(core, order.getAsset(), order.getAgent()); this.valuetime = valuetime.getTime(); ! this.order=order; } --- 52,60 ---- * Time: 7:38:36 PM */ ! public final class ExchangeCompletedReceipt extends ExchangeTransactionContract { private ExchangeCompletedReceipt(SignedNamedCore core, ExchangeCompletionOrder order, Date valuetime) { super(core, order.getAsset(), order.getAgent()); this.valuetime = valuetime.getTime(); ! this.order = order; } *************** *** 61,65 **** } ! public final Timestamp getValueTime(){ return new Timestamp(valuetime); } --- 63,67 ---- } ! public final Timestamp getValueTime() { return new Timestamp(valuetime); } *************** *** 76,88 **** */ public final SignedNamedObject read(final SignedNamedCore core, final Element elem) throws InvalidNamedObjectException { ! if (!elem.getNamespace().equals(AssetGlobals.NS_ASSET)) ! throw new InvalidNamedObjectException(core.getName(),"Not in XML NameSpace: "+AssetGlobals.NS_ASSET.getURI()); ! if (elem.getName().equals(ExchangeGlobals.COMPLETE_RCPT_TAGNAME)){ return new ExchangeCompletedReceipt(core, ! (ExchangeCompletionOrder) TransferGlobals.parseEmbedded(elem,ExchangeGlobals.createQName(ExchangeGlobals.COMPLETE_TAGNAME)), TransferGlobals.parseValueTimeElement(elem)); } ! throw new InvalidNamedObjectException(core.getName(),"Not Matched"); } } --- 78,90 ---- */ public final SignedNamedObject read(final SignedNamedCore core, final Element elem) throws InvalidNamedObjectException { ! if (!elem.getNamespace().equals(ExchangeOrderGlobals.NS_EXCHANGE)) ! throw new InvalidNamedObjectException(core.getName(), "Not in XML NameSpace: " + ExchangeOrderGlobals.NS_EXCHANGE.getURI()); ! if (elem.getName().equals(ExchangeOrderGlobals.COMPLETE_RCPT_TAGNAME)) { return new ExchangeCompletedReceipt(core, ! (ExchangeCompletionOrder) TransferGlobals.parseEmbedded(elem, ExchangeOrderGlobals.createQName(ExchangeOrderGlobals.COMPLETE_TAGNAME)), TransferGlobals.parseValueTimeElement(elem)); } ! throw new InvalidNamedObjectException(core.getName(), "Not Matched"); } } --- NEW FILE: ExchangeOrderGlobals.java --- package org.neuclear.exchange.orders; import org.dom4j.*; import org.neuclear.asset.orders.TransferGlobals; import org.neuclear.exchange.contracts.ExchangeAgent; import org.neuclear.id.InvalidNamedObjectException; import org.neuclear.id.NameResolutionException; import org.neuclear.id.Service; import org.neuclear.id.resolver.Resolver; import org.neuclear.id.verifier.VerifyingReader; /* NeuClear Distributed Transaction Clearing Platform (C) 2003 Pelle Braendgaard This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA $Id: ExchangeOrderGlobals.java,v 1.1 2004/04/05 16:31:43 pelle Exp $ $Log: ExchangeOrderGlobals.java,v $ Revision 1.1 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/04/01 23:18:33 pelle Split Identity into Signatory and Identity class. Identity remains a signed named object and will in the future just be used for self declared information. Signatory now contains the PublicKey etc and is NOT a signed object. Revision 1.3 2004/01/11 00:39:06 pelle Cleaned up the schemas even more they now all verifiy. The Order/Receipt pairs for neuclear pay, should now work. They all have Readers using the latest Schema. The TransferBuilders are done and the ExchangeBuilders are nearly there. The new EmbeddedSignedNamedObject builder is useful for creating new Receipts. The new ReceiptBuilder uses this to create the embedded transaction. ExchangeOrders now have the concept of BidItem's, you could create an ExchangeOrder bidding on various items at the same time, to be exchanged as one atomic multiparty exchange. Still doesnt build yet, but very close now ;-) Revision 1.2 2004/01/10 00:00:46 pelle Implemented new Schema for Transfer* Working on it for Exchange*, so far all Receipts are implemented. Added SignedNamedDocument which is a generic SignedNamedObject that works with all Signed XML. 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/06 23:26:48 pelle Started restructuring the original xml schemas. Updated the Exchange and transfer orders. 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.6 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.5 2003/11/28 00:11:50 pelle Getting the NeuClear web transactions working. Revision 1.4 2003/11/22 00:22:28 pelle All unit tests in commons, id and xmlsec now work. AssetController now successfully processes payments in the unit test. Payment Web App has working form that creates a TransferOrder presents it to the signer and forwards it to AssetControlServlet. (Which throws an XML Parser Exception) I think the XMLReaderServlet is bust. Revision 1.3 2003/11/21 04:43:04 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/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 Revision 1.1 2003/11/09 03:32:56 pelle More missing files from earlier commits. IDEA is acting strangly. Revision 1.3 2003/11/06 23:47:43 pelle Major Refactoring of CurrencyController. Factored out AssetController to be new abstract parent class together with most of its support classes. Created (Half way) AssetControlClient, which can perform transactions on external AssetControllers via NeuClear. Created the first attempt at the ExchangeAgent. This will need use of the AssetControlClient. SOAPTools was changed to return a stream. This is required by the VerifyingReader in NeuClear. Revision 1.2 2003/10/25 00:38:43 pelle Fixed SmtpSender it now sends the messages. Refactored CommandLineSigner. Now it simply signs files read from command line. However new class IdentityCreator is subclassed and creates new Identities. You can subclass CommandLineSigner to create your own variants. Several problems with configuration. Trying to solve at the moment. Updated PicoContainer to beta-2 Revision 1.1 2003/10/03 23:48:29 pelle Did various security related updates in the pay package with regards to immutability of fields etc. PaymentReceiver should now be operational. Real testing needs to be done including in particular setting the private key of the Receiver. A new class TransferGlobals contains usefull settings for making life easier in the other contract based classes. TransferContract the signed contract is functional and has a matching TransferRequestBuilder class for programmatically creating TransferRequests for signing. TransferReceiptBuilder has been created for use by Transfer processors. It is used in the PaymentReceiver. */ /** * User: pelleb * Date: Oct 3, 2003 * Time: 3:55:06 PM */ public final class ExchangeOrderGlobals { private ExchangeOrderGlobals() { // Instantiation is not allowed } public static Namespace createNameSpace() { return DocumentHelper.createNamespace(EX_NSPREFIX, EX_NSURI); } public static QName createQName(final String name) { return DocumentHelper.createQName(name, createNameSpace()); } public static Attribute createAttribute(final Element elem, final String name, final String value) { return DocumentHelper.createAttribute(elem, createQName(name), value); } public static Element createElement(final String name, final String value) { Element elem = createElement(name); elem.setText(value); return elem; } public static Element createElement(final String name) { return DocumentHelper.createElement(createQName(name)); } public static String getElementValue(final Element element, final String name) throws InvalidNamedObjectException { return TransferGlobals.getElementValue(element, createQName(name)); } public static String parseExchangeOrderId(final Element element) throws InvalidNamedObjectException { return getElementValue(element, EXCHANGE_REF_TAG); } public static final ExchangeAgent parseAgentTag(Element elem) throws InvalidNamedObjectException { final String name = getElementValue(elem, AGENT_TAG); try { return (ExchangeAgent) Resolver.resolveIdentity(name); } catch (ClassCastException e) { throw new InvalidNamedObjectException(name, e); } catch (NameResolutionException e) { throw new InvalidNamedObjectException(name, e); } } public static final Service parseAssetTag(final Element elem, final String tag) throws InvalidNamedObjectException { final String name = getElementValue(elem, tag); try { return (Service) Resolver.resolveIdentity(name); } catch (ClassCastException e) { throw new InvalidNamedObjectException(name, e); } catch (NameResolutionException e) { throw new InvalidNamedObjectException(name, e); } } public static void registerReaders() { VerifyingReader.getInstance().registerReader(ExchangeOrderGlobals.CANCEL_TAGNAME, new CancelExchangeOrder.Reader()); VerifyingReader.getInstance().registerReader(ExchangeOrderGlobals.CANCEL_RCPT_TAGNAME, new CancelExchangeReceipt.Reader()); VerifyingReader.getInstance().registerReader(ExchangeOrderGlobals.EXCHANGE_TAGNAME, new ExchangeOrder.Reader()); VerifyingReader.getInstance().registerReader(ExchangeOrderGlobals.EXCHANGE_RCPT_TAGNAME, new ExchangeOrderReceipt.Reader()); VerifyingReader.getInstance().registerReader(ExchangeOrderGlobals.COMPLETE_TAGNAME, new ExchangeCompletionOrder.Reader()); VerifyingReader.getInstance().registerReader(ExchangeOrderGlobals.COMPLETE_RCPT_TAGNAME, new ExchangeCompletedReceipt.Reader()); } static { registerReaders(); } public static final String EXCHANGE_TAGNAME = "ExchangeOrder"; public static final String EXCHANGE_RCPT_TAGNAME = "ExchangeOrderReceipt"; public static final String COMPLETE_TAGNAME = "ExchangeCompletionOrder"; public static final String COMPLETE_RCPT_TAGNAME = "ExchangeCompletedReceipt"; public static final String CANCEL_TAGNAME = "CancelExchangeOrder"; public static final String CANCEL_RCPT_TAGNAME = "CancelExchangeReceipt"; public static final String EXPIRY_TAG = "ExpiryDate"; public static final String EXCHANGE_REF_TAG = "ExchangeOrderRef"; public static final String EXCHANGE_TIME_TAGNAME = "ExchangeTime"; public static final String AGENT_TAG = "ExchangeAgent"; public static final String BID_ITEM_TAG = "BidItem"; public static final String EX_NSPREFIX = "ex"; public static final String EX_NSURI = "http://neuclear.org/neu/exch"; public static final Namespace NS_EXCHANGE = createNameSpace(); } Index: ExchangeOrder.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/orders/ExchangeOrder.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ExchangeOrder.java 1 Apr 2004 23:18:33 -0000 1.7 --- ExchangeOrder.java 5 Apr 2004 16:31:43 -0000 1.8 *************** *** 2,7 **** import org.dom4j.Element; - import org.neuclear.asset.contracts.Asset; - import org.neuclear.asset.contracts.AssetGlobals; import org.neuclear.asset.orders.TransferGlobals; import org.neuclear.asset.orders.Value; --- 2,5 ---- *************** *** 21,25 **** public final class ExchangeOrder extends ExchangeTransactionContract { private ExchangeOrder(final SignedNamedCore core, ! final Asset bidAsset, final ExchangeAgent agent, final Value amount, BidItem items[], final String comment, final Date expires) { super(core, bidAsset, agent); --- 19,23 ---- public final class ExchangeOrder extends ExchangeTransactionContract { private ExchangeOrder(final SignedNamedCore core, ! final Service bidAsset, final ExchangeAgent agent, final Value amount, BidItem items[], final String comment, final Date expires) { super(core, bidAsset, agent); *************** *** 84,103 **** */ public final SignedNamedObject read(final SignedNamedCore core, final Element elem) throws InvalidNamedObjectException { ! if (!elem.getNamespace().equals(AssetGlobals.NS_ASSET)) ! throw new InvalidNamedObjectException(core.getName(), "Not in XML NameSpace: " + AssetGlobals.NS_ASSET.getURI()); ! if (elem.getName().equals(ExchangeGlobals.EXCHANGE_TAGNAME)) return new ExchangeOrder(core, TransferGlobals.parseAssetTag(elem), ! ExchangeGlobals.parseAgentTag(elem), TransferGlobals.parseValueTag(elem), parseBidItems(elem), TransferGlobals.parseCommentElement(elem), ! TransferGlobals.parseTimeStampElement(elem, ExchangeGlobals.createQName(ExchangeGlobals.EXPIRY_TAG))); throw new InvalidNamedObjectException(core.getName(), "Not Matched"); } private BidItem[] parseBidItems(Element elem) throws InvalidNamedObjectException { ! List list = elem.elements(ExchangeGlobals.createQName(ExchangeGlobals.BID_ITEM_TAG)); BidItem items[] = new BidItem[list.size()]; for (int i = 0; i < list.size(); i++) --- 82,101 ---- */ public final SignedNamedObject read(final SignedNamedCore core, final Element elem) throws InvalidNamedObjectException { ! if (!elem.getNamespace().equals(ExchangeOrderGlobals.NS_EXCHANGE)) ! throw new InvalidNamedObjectException(core.getName(), "Not in XML NameSpace: " + ExchangeOrderGlobals.NS_EXCHANGE.getURI()); ! if (elem.getName().equals(ExchangeOrderGlobals.EXCHANGE_TAGNAME)) return new ExchangeOrder(core, TransferGlobals.parseAssetTag(elem), ! ExchangeOrderGlobals.parseAgentTag(elem), TransferGlobals.parseValueTag(elem), parseBidItems(elem), TransferGlobals.parseCommentElement(elem), ! TransferGlobals.parseTimeStampElement(elem, ExchangeOrderGlobals.createQName(ExchangeOrderGlobals.EXPIRY_TAG))); throw new InvalidNamedObjectException(core.getName(), "Not Matched"); } private BidItem[] parseBidItems(Element elem) throws InvalidNamedObjectException { ! List list = elem.elements(ExchangeOrderGlobals.createQName(ExchangeOrderGlobals.BID_ITEM_TAG)); BidItem items[] = new BidItem[list.size()]; for (int i = 0; i < list.size(); i++) --- ExchangeGlobals.java DELETED --- |
