Menu
▾
▴
[Neuclear-develop] neuclear-pay/src/java/org/neuclear/exchange/orders CancelExchangeOrder.java,1.2,1.3 CancelExchangeReceipt.java,1.2,1.3 ExchangeCompletedReceipt.java,1.1,1.2 ExchangeCompletionOrder.java,1.2,1.3 ExchangeGlobals.java,1.1,1.2 ExchangeOrder.java,1.2,1.3 ExchangeOrderReceipt.java,1.2,1.3 ExchangeTransactionContract.java,1.1,1.2
|
From: <pe...@us...> - 2004-01-10 00:00:51
|
Update of /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/orders
In directory sc8-pr-cvs1:/tmp/cvs-serv22932/src/java/org/neuclear/exchange/orders
Modified Files:
CancelExchangeOrder.java CancelExchangeReceipt.java
ExchangeCompletedReceipt.java ExchangeCompletionOrder.java
ExchangeGlobals.java ExchangeOrder.java
ExchangeOrderReceipt.java ExchangeTransactionContract.java
Log Message:
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.
Index: CancelExchangeOrder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/orders/CancelExchangeOrder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CancelExchangeOrder.java 6 Jan 2004 23:26:48 -0000 1.2
--- CancelExchangeOrder.java 10 Jan 2004 00:00:46 -0000 1.3
***************
*** 1,14 ****
package org.neuclear.exchange.orders;
! import org.neuclear.commons.NeuClearException;
! import org.neuclear.id.Identity;
! import org.neuclear.id.SignedNamedObject;
! import org.neuclear.id.SignedNamedCore;
! import org.neuclear.asset.orders.AssetTransactionContract;
import org.neuclear.asset.contracts.Asset;
import org.neuclear.exchange.contracts.ExchangeAgent;
!
! import java.sql.Timestamp;
! import java.util.Date;
/**
--- 1,13 ----
package org.neuclear.exchange.orders;
! 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;
! import org.neuclear.id.SignedNamedCore;
! import org.neuclear.id.SignedNamedObject;
/**
***************
*** 33,35 ****
--- 32,55 ----
private final String exchangeid;
+
+ public static final class Reader implements NamedObjectReader {
+ /**
+ * Read object from Element and fill in its details
+ *
+ * @param elem
+ * @return
+ */
+ 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,
+ TransferGlobals.parseAssetTag(elem),
+ ExchangeGlobals.parseAgentTag(elem),
+ ExchangeGlobals.parseExchangeOrderId(elem));
+
+ 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.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CancelExchangeReceipt.java 6 Jan 2004 23:26:48 -0000 1.2
--- CancelExchangeReceipt.java 10 Jan 2004 00:00:46 -0000 1.3
***************
*** 1,14 ****
package org.neuclear.exchange.orders;
! import org.neuclear.commons.NeuClearException;
! import org.neuclear.id.Identity;
! import org.neuclear.id.SignedNamedObject;
! import org.neuclear.id.SignedNamedCore;
! import org.neuclear.asset.orders.AssetTransactionContract;
! import org.neuclear.asset.contracts.Asset;
! import org.neuclear.asset.orders.AssetTransactionContract;
! import org.neuclear.asset.orders.AssetTransactionContract;
! import org.neuclear.exchange.orders.CancelExchangeOrder;
! import org.neuclear.exchange.contracts.ExchangeAgent;
import java.sql.Timestamp;
--- 1,9 ----
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.*;
! import org.neuclear.id.verifier.VerifyingReader;
import java.sql.Timestamp;
***************
*** 22,54 ****
public final class CancelExchangeReceipt extends ExchangeTransactionContract{
! private CancelExchangeReceipt(final SignedNamedCore core, final Asset asset, ExchangeAgent agent,final Date canceltime,final String exchangeid, final String cancelid) {
! super(core, asset,agent);
this.canceltime=canceltime.getTime();
! this.exchangeid=exchangeid;
! this.cancelid=cancelid;
}
! public CancelExchangeOrder getCancellationOrder(){
! //TODO implement
! return null;
! }
! public CancelExchangeOrder getExchangeReceipt(){
! //TODO implement
! return null;
}
public Timestamp getCanceltime() {
return new Timestamp(canceltime);
}
! public String getExchangeid() {
! return exchangeid;
! }
! public String getCancelid() {
! return cancelid;
}
- private final long canceltime;
- private final String exchangeid;
- private final String cancelid;
}
--- 17,60 ----
public final class CancelExchangeReceipt extends ExchangeTransactionContract{
! private CancelExchangeReceipt(SignedNamedCore core,CancelExchangeOrder order,final Date canceltime) {
! super(core, order.getAsset(), order.getAgent());
this.canceltime=canceltime.getTime();
! this.order=order;
}
! public CancelExchangeOrder getOrder(){
! return order;
}
+
public Timestamp getCanceltime() {
return new Timestamp(canceltime);
}
! private final long canceltime;
! private final CancelExchangeOrder order;
! public static final class Reader implements NamedObjectReader {
! /**
! * Read object from Element and fill in its details
! *
! * @param elem
! * @return
! */
! 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());
!
! try {
! 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);
! }
! } catch (NameResolutionException e) {
! throw new InvalidNamedObjectException(core.getName(),e);
! }
! 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.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ExchangeCompletedReceipt.java 6 Jan 2004 23:26:48 -0000 1.1
--- ExchangeCompletedReceipt.java 10 Jan 2004 00:00:46 -0000 1.2
***************
*** 1,7 ****
package org.neuclear.exchange.orders;
import org.neuclear.id.SignedNamedCore;
! import org.neuclear.asset.contracts.Asset;
! import org.neuclear.exchange.contracts.ExchangeAgent;
/*
--- 1,14 ----
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;
+ import org.neuclear.id.NamedObjectReader;
import org.neuclear.id.SignedNamedCore;
! import org.neuclear.id.SignedNamedObject;
!
! import java.sql.Timestamp;
! import java.util.Date;
/*
***************
*** 25,28 ****
--- 32,42 ----
$Id$
$Log$
+ 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.
***************
*** 37,47 ****
*/
public final class ExchangeCompletedReceipt extends ExchangeTransactionContract{
! public ExchangeCompletedReceipt(SignedNamedCore core, Asset asset, ExchangeAgent agent, double settledAmount, long valuetime) {
! super(core, asset, agent);
! this.settledAmount = settledAmount;
! this.valuetime = valuetime;
}
- private final double settledAmount;
private final long valuetime;
}
--- 51,90 ----
*/
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;
! }
!
! public ExchangeCompletionOrder getOrder() {
! return order;
! }
!
! public final Timestamp getValueTime(){
! return new Timestamp(valuetime);
}
private final long valuetime;
+ private final ExchangeCompletionOrder order;
+
+ public static final class Reader implements NamedObjectReader {
+ /**
+ * Read object from Element and fill in its details
+ *
+ * @param elem
+ * @return
+ */
+ 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");
+ }
+ }
+
}
Index: ExchangeCompletionOrder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/orders/ExchangeCompletionOrder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ExchangeCompletionOrder.java 6 Jan 2004 23:26:48 -0000 1.2
--- ExchangeCompletionOrder.java 10 Jan 2004 00:00:46 -0000 1.3
***************
*** 1,11 ****
package org.neuclear.exchange.orders;
- import org.neuclear.commons.NeuClearException;
- import org.neuclear.id.Identity;
- import org.neuclear.id.SignedNamedCore;
- import org.neuclear.asset.orders.TransferContract;
- import org.neuclear.asset.orders.AssetTransactionContract;
import org.neuclear.asset.contracts.Asset;
import org.neuclear.exchange.contracts.ExchangeAgent;
import java.sql.Timestamp;
--- 1,7 ----
package org.neuclear.exchange.orders;
import org.neuclear.asset.contracts.Asset;
import org.neuclear.exchange.contracts.ExchangeAgent;
+ import org.neuclear.id.SignedNamedCore;
import java.sql.Timestamp;
Index: ExchangeGlobals.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/orders/ExchangeGlobals.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ExchangeGlobals.java 6 Jan 2004 23:26:48 -0000 1.1
--- ExchangeGlobals.java 10 Jan 2004 00:00:46 -0000 1.2
***************
*** 2,9 ****
import org.dom4j.*;
! import org.neuclear.id.verifier.VerifyingReader;
! import org.neuclear.asset.orders.AssetTransactionContract;
! import org.neuclear.asset.orders.AssetTransactionContract;
import org.neuclear.asset.orders.TransferGlobals;
/*
--- 2,11 ----
import org.dom4j.*;
! import org.neuclear.asset.contracts.Asset;
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.resolver.NSResolver;
/*
***************
*** 27,30 ****
--- 29,39 ----
$Id$
$Log$
+ 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.
***************
*** 120,130 ****
}
public static void registerReaders() {
! VerifyingReader.getInstance().registerReader(ExchangeGlobals.CANCEL_TAGNAME, new AssetTransactionContract.Reader());
! VerifyingReader.getInstance().registerReader(ExchangeGlobals.CANCEL_RCPT_TAGNAME, new AssetTransactionContract.Reader());
! VerifyingReader.getInstance().registerReader(ExchangeGlobals.EXCHANGE_TAGNAME, new AssetTransactionContract.Reader());
! VerifyingReader.getInstance().registerReader(ExchangeGlobals.EXCHANGE_RCPT_TAGNAME, new AssetTransactionContract.Reader());
! VerifyingReader.getInstance().registerReader(ExchangeGlobals.COMPLETE_TAGNAME, new AssetTransactionContract.Reader());
! VerifyingReader.getInstance().registerReader(ExchangeGlobals.COMPLETE_RCPT_TAGNAME, new AssetTransactionContract.Reader());
}
--- 129,178 ----
}
+ 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) NSResolver.resolveIdentity(name);
+ } catch (ClassCastException e) {
+ throw new InvalidNamedObjectException(name,e);
+ } catch (NameResolutionException e) {
+ throw new InvalidNamedObjectException(name,e);
+ }
+
+ }
+
+ public static final Asset parseBidAssetTag(final Element elem) throws InvalidNamedObjectException {
+ return parseAssetTag(elem,BID_ASSET_TAG);
+ }
+ public static final Asset parseSettlementAssetTag(final Element elem) throws InvalidNamedObjectException {
+ return parseAssetTag(elem,SETTLEMENT_ASSET_TAG);
+ }
+ public static final Asset parseAssetTag(final Element elem,final String tag) throws InvalidNamedObjectException {
+ final String name = getElementValue(elem,tag);
+ try {
+ return (Asset) NSResolver.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(ExchangeGlobals.CANCEL_TAGNAME, new AssetTransactionContract.Reader());
! // VerifyingReader.getInstance().registerReader(ExchangeGlobals.CANCEL_RCPT_TAGNAME, new AssetTransactionContract.Reader());
! // VerifyingReader.getInstance().registerReader(ExchangeGlobals.EXCHANGE_TAGNAME, new AssetTransactionContract.Reader());
! // VerifyingReader.getInstance().registerReader(ExchangeGlobals.EXCHANGE_RCPT_TAGNAME, new AssetTransactionContract.Reader());
! // VerifyingReader.getInstance().registerReader(ExchangeGlobals.COMPLETE_TAGNAME, new AssetTransactionContract.Reader());
! // VerifyingReader.getInstance().registerReader(ExchangeGlobals.COMPLETE_RCPT_TAGNAME, new AssetTransactionContract.Reader());
}
***************
*** 143,145 ****
--- 191,197 ----
public static final String EX_NSPREFIX = "ex";
public static final String EX_NSURI = "http://neuclear.org/neu/exch";
+ public static final String EXCHANGE_REF_TAG = "ExchangeOrderRef";
+ private static final String AGENT_TAG = "ExchangeAgent";
+ public static final String SETTLEMENT_ASSET_TAG = "SettlementAsset";
+ public static final String BID_ASSET_TAG = "BidAsset";
}
Index: ExchangeOrder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/orders/ExchangeOrder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ExchangeOrder.java 6 Jan 2004 23:26:48 -0000 1.2
--- ExchangeOrder.java 10 Jan 2004 00:00:46 -0000 1.3
***************
*** 1,14 ****
package org.neuclear.exchange.orders;
! import org.neuclear.commons.NeuClearException;
! import org.neuclear.id.Identity;
! import org.neuclear.id.SignedNamedCore;
! import org.neuclear.asset.orders.exchanges.Exchange;
! import org.neuclear.asset.orders.TransferContract;
! import org.neuclear.asset.orders.TransferContract;
! import org.neuclear.asset.orders.AssetTransactionContract;
import org.neuclear.asset.contracts.Asset;
import org.neuclear.exchange.contracts.ExchangeAgent;
! import org.neuclear.exchange.contracts.ExchangeAgent;
import java.sql.Timestamp;
--- 1,10 ----
package org.neuclear.exchange.orders;
! 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.*;
import java.sql.Timestamp;
***************
*** 61,64 ****
--- 57,86 ----
private final String comment;
private final long expires;
+ public static final class Reader implements NamedObjectReader {
+ /**
+ * Read object from Element and fill in its details
+ *
+ * @param elem
+ * @return
+ */
+ 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,
+ ExchangeGlobals.parseBidAssetTag(elem),
+ ExchangeGlobals.parseAgentTag(elem),
+ TransferGlobals.parseAmountTag(elem),
+ ExchangeGlobals.parseSettlementAssetTag(elem),
+ TransferGlobals.parseAmountTag(elem),
+ TransferGlobals.getCommentElement(elem),
+ null//TODO getExpiryTime
+ );
+ throw new InvalidNamedObjectException(core.getName(),"Not Matched");
+ }
+
+
+ }
}
Index: ExchangeOrderReceipt.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/orders/ExchangeOrderReceipt.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ExchangeOrderReceipt.java 6 Jan 2004 23:26:48 -0000 1.2
--- ExchangeOrderReceipt.java 10 Jan 2004 00:00:46 -0000 1.3
***************
*** 1,7 ****
package org.neuclear.exchange.orders;
import org.neuclear.id.SignedNamedCore;
! import org.neuclear.asset.contracts.Asset;
! import org.neuclear.exchange.contracts.ExchangeAgent;
import java.sql.Timestamp;
--- 1,11 ----
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;
+ import org.neuclear.id.NamedObjectReader;
import org.neuclear.id.SignedNamedCore;
! import org.neuclear.id.SignedNamedObject;
import java.sql.Timestamp;
***************
*** 15,36 ****
public final class ExchangeOrderReceipt extends ExchangeTransactionContract {
! private ExchangeOrderReceipt(final SignedNamedCore core, final Asset asset, final ExchangeAgent agent, final String orderid, final Date valuetime, Asset neededAsset, double neededAmount, double bidAmount, final String comment, final Date expires) {
! super(core, asset,agent);
! this.orderid = orderid;
this.valuetime = valuetime.getTime();
! this.neededAsset = neededAsset;
! this.neededAmount = neededAmount;
! this.bidAmount = bidAmount;
! this.comment = comment;
! this.expires = expires.getTime();
}
public ExchangeOrder getExchangeOrder(){
! //TODO Implement
! return null;
! }
!
!
! public String getOrderid() {
! return orderid;
}
--- 19,29 ----
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 getExchangeOrder(){
! return order;
}
***************
*** 39,69 ****
}
! public Asset getNeededAsset() {
! return neededAsset;
! }
!
! public double getNeededAmount() {
! return neededAmount;
! }
!
! public double getBidAmount() {
! return bidAmount;
! }
! public String getComment() {
! return comment;
! }
! public Timestamp getExpires() {
! return new Timestamp(expires);
}
-
- private final String orderid;
- private final long valuetime;
- private final Asset neededAsset;
- private final double neededAmount;
- private final double bidAmount;
- private final String comment;
- private final long expires;
}
--- 32,57 ----
}
! private final long valuetime;
! private final ExchangeOrder order;
! public static final class Reader implements NamedObjectReader {
! /**
! * Read object from Element and fill in its details
! *
! * @param elem
! * @return
! */
! 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");
! }
}
}
Index: ExchangeTransactionContract.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/orders/ExchangeTransactionContract.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ExchangeTransactionContract.java 6 Jan 2004 23:26:48 -0000 1.1
--- ExchangeTransactionContract.java 10 Jan 2004 00:00:46 -0000 1.2
***************
*** 1,8 ****
package org.neuclear.exchange.orders;
- import org.neuclear.asset.orders.AssetTransactionContract;
import org.neuclear.asset.contracts.Asset;
! import org.neuclear.id.SignedNamedCore;
import org.neuclear.exchange.contracts.ExchangeAgent;
/*
--- 1,8 ----
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;
/*
***************
*** 26,29 ****
--- 26,36 ----
$Id$
$Log$
+ 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.
|
