|
From: <pe...@us...> - 2004-01-11 00:39:10
|
Update of /cvsroot/neuclear/neuclear-pay/src/schemas
In directory sc8-pr-cvs1:/tmp/cvs-serv22387/src/schemas
Modified Files:
exch.xsd xfer.xsd
Log Message:
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 ;-)
Index: exch.xsd
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/schemas/exch.xsd,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** exch.xsd 7 Jan 2004 17:15:57 -0000 1.3
--- exch.xsd 11 Jan 2004 00:39:06 -0000 1.4
***************
*** 3,6 ****
--- 3,16 ----
$Id$
$Log$
+ Revision 1.4 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.3 2004/01/07 17:15:57 pelle
Added support for non fungible transfers. Ie. Transfers of specific serial numbered items.
***************
*** 18,31 ****
xmlns="http://neuclear.org/neu/exch.xsd"
xmlns:xfer="http://neuclear.org/neu/xfer.xsd"
! xmlns:neuid="http://neuclear.org/neu/neuid.xsd"
elementFormDefault="qualified" version="0.3" id="xfer">
<xs:import namespace="http://neuclear.org/neu/neuid.xsd" schemaLocation="../../../neuclear-id/src/schemas/neuid.xsd" />
<xs:import namespace="http://neuclear.org/neu/xfer.xsd" schemaLocation="xfer.xsd"/>
! <xs:element name="Agent" type="neuid:NamedObjectReference" nillable="false"/>
! <xs:element name="SettlementAsset" type="neuid:NamedObjectReference" nillable="false"/>
! <xs:element name="BidAsset" type="neuid:NamedObjectReference" nillable="false"/>
! <xs:element name="ExchangeOrderRef" type="neuid:NamedObjectReference" nillable="false"/>
<xs:element name="ExchangeOrder" nillable="false">
--- 28,53 ----
xmlns="http://neuclear.org/neu/exch.xsd"
xmlns:xfer="http://neuclear.org/neu/xfer.xsd"
! xmlns:id="http://neuclear.org/neu/neuid.xsd"
elementFormDefault="qualified" version="0.3" id="xfer">
<xs:import namespace="http://neuclear.org/neu/neuid.xsd" schemaLocation="../../../neuclear-id/src/schemas/neuid.xsd" />
<xs:import namespace="http://neuclear.org/neu/xfer.xsd" schemaLocation="xfer.xsd"/>
! <xs:element name="Agent" type="id:NamedObjectReference" nillable="false"/>
! <xs:element name="ExpiryTime" type="xs:dateTime" nillable="false"/>
! <xs:element name="ExchangeTime" type="xs:dateTime" nillable="false"/>
! <xs:element name="BidItem" nillable="false">
! <xs:annotation>
! <xs:documentation xml:lang="en">
! Represents the item bid for.
! </xs:documentation>
! </xs:annotation>
! <xs:complexType>
! <xs:sequence>
! <xs:element ref="xfer:Asset" minOccurs="1" maxOccurs="1"/>
! <xs:element ref="xfer:Value" minOccurs="1" maxOccurs="1"/>
! </xs:sequence>
! </xs:complexType>
! </xs:element>
<xs:element name="ExchangeOrder" nillable="false">
***************
*** 38,80 ****
</xs:annotation>
<xs:complexType>
! <xs:complexContent>
! <xs:extension base="neuid:NamedObjectType">
! <xs:sequence>
! <xs:element ref="Agent" minOccurs="1" maxOccurs="1" />
! <xs:element ref="SettlementAsset" minOccurs="1" maxOccurs="1" />
! <xs:element ref="BidAsset" minOccurs="1" maxOccurs="1" />
! <xs:element ref="xfer:Value" minOccurs="1" maxOccurs="1"/>
! <xs:element ref="xfer:Comment" minOccurs="0" maxOccurs="1" />
! <xs:element name="expires" type="xs:dateTime" minOccurs="1" maxOccurs="1" nillable="false"/>
! </xs:sequence>
! </xs:extension>
! </xs:complexContent>
</xs:complexType>
</xs:element>
! <xs:complexType name="ExchangeOrderActionType">
! <xs:complexContent>
! <xs:extension base="neuid:NamedObjectType">
! <xs:sequence>
! <xs:element ref="ExchangeOrderRef" minOccurs="1" maxOccurs="1"/>
! </xs:sequence>
! </xs:extension>
! </xs:complexContent>
! </xs:complexType>
!
! <xs:element name="CancelExchangeOrder" type="ExchangeOrderActionType" nillable="false"/>
<xs:element name="ExchangeCompletionOrder" nillable="false">
<xs:complexType>
! <xs:complexContent>
! <xs:extension base="ExchangeOrderActionType">
! <xs:sequence>
! <xs:element ref="xfer:Value" minOccurs="1" maxOccurs="1"/>
! <xs:element name="ExchangeTime" type="xs:dateTime" minOccurs="1" maxOccurs="1" nillable="false"/>
! <xs:element ref="ExchangeOrderReceipt" minOccurs="1" maxOccurs="1"/>
! <xs:element ref="xfer:Comment" minOccurs="0" maxOccurs="1" />
! </xs:sequence>
! </xs:extension>
! </xs:complexContent>
</xs:complexType>
</xs:element>
--- 60,98 ----
</xs:annotation>
<xs:complexType>
! <xs:sequence>
! <xs:element ref="Agent" minOccurs="1" maxOccurs="1" />
! <xs:element ref="xfer:Asset" minOccurs="1" maxOccurs="1" />
! <xs:element ref="ExpiryTime" minOccurs="1" maxOccurs="1"/>
! <xs:element ref="xfer:Value" minOccurs="1" maxOccurs="1"/>
! <xs:element ref="BidItem" minOccurs="1" maxOccurs="unbounded"/>
! <xs:element ref="xfer:Comment" minOccurs="0" maxOccurs="1" />
! <xs:group ref="id:SignedObjectGroup" minOccurs="0" maxOccurs="1"/>
! </xs:sequence>
</xs:complexType>
</xs:element>
! <xs:element name="CancelExchangeOrder" nillable="false">
! <xs:annotation>
! <xs:documentation xml:lang="en">
! A signed order by either the bidder or the agent to cancel the given request.
! </xs:documentation>
! </xs:annotation>
! <xs:complexType>
! <xs:sequence>
! <xs:element ref="ExchangeOrderReceipt" minOccurs="1" maxOccurs="1"/>
! <xs:group ref="id:SignedObjectGroup" minOccurs="0" maxOccurs="1"/>
! </xs:sequence>
! </xs:complexType>
! </xs:element>
<xs:element name="ExchangeCompletionOrder" nillable="false">
<xs:complexType>
! <xs:sequence>
! <xs:element ref="xfer:Value" minOccurs="1" maxOccurs="1"/>
! <xs:element ref="ExchangeTime" minOccurs="1" maxOccurs="1"/>
! <xs:element ref="ExchangeOrderReceipt" minOccurs="1" maxOccurs="1"/>
! <xs:element ref="xfer:Comment" minOccurs="0" maxOccurs="1" />
! <xs:group ref="id:SignedObjectGroup" minOccurs="0" maxOccurs="1"/>
! </xs:sequence>
</xs:complexType>
</xs:element>
***************
*** 82,94 ****
<xs:element name="ExchangeOrderReceipt" nillable="false">
<xs:complexType>
! <xs:complexContent>
! <xs:extension base="neuid:NamedObjectType">
! <xs:sequence>
! <xs:element ref="xfer:Value" minOccurs="0" maxOccurs="1"/>
! <xs:element ref="xfer:ValueTime" minOccurs="1" maxOccurs="1" />
! <xs:element ref="ExchangeOrder" minOccurs="1" maxOccurs="1"/>
! </xs:sequence>
! </xs:extension>
! </xs:complexContent>
</xs:complexType>
</xs:element>
--- 100,109 ----
<xs:element name="ExchangeOrderReceipt" nillable="false">
<xs:complexType>
! <xs:sequence>
! <xs:element ref="xfer:Value" minOccurs="0" maxOccurs="1"/>
! <xs:element ref="xfer:ValueTime" minOccurs="1" maxOccurs="1" />
! <xs:element ref="ExchangeOrder" minOccurs="1" maxOccurs="1"/>
! <xs:group ref="id:SignedObjectGroup" minOccurs="0" maxOccurs="1"/>
! </xs:sequence>
</xs:complexType>
</xs:element>
***************
*** 96,107 ****
<xs:element name="CancelExchangeOrderReceipt" nillable="false" >
<xs:complexType>
! <xs:complexContent>
! <xs:extension base="neuid:NamedObjectType">
! <xs:sequence>
! <xs:element ref="xfer:ValueTime" minOccurs="1" maxOccurs="1" />
! <xs:element ref="CancelExchangeOrder" minOccurs="1" maxOccurs="1"/>
! </xs:sequence>
! </xs:extension>
! </xs:complexContent>
</xs:complexType>
</xs:element>
--- 111,119 ----
<xs:element name="CancelExchangeOrderReceipt" nillable="false" >
<xs:complexType>
! <xs:sequence>
! <xs:element ref="xfer:ValueTime" minOccurs="1" maxOccurs="1" />
! <xs:element ref="CancelExchangeOrder" minOccurs="1" maxOccurs="1"/>
! <xs:group ref="id:SignedObjectGroup" minOccurs="0" maxOccurs="1"/>
! </xs:sequence>
</xs:complexType>
</xs:element>
***************
*** 109,120 ****
<xs:element name="ExchangeCompletedReceipt" nillable="false">
<xs:complexType>
! <xs:complexContent>
! <xs:extension base="neuid:NamedObjectType">
! <xs:sequence>
! <xs:element ref="xfer:ValueTime" minOccurs="1" maxOccurs="1" />
! <xs:element ref="ExchangeCompletionOrder" minOccurs="1" maxOccurs="1"/>
! </xs:sequence>
! </xs:extension>
! </xs:complexContent>
</xs:complexType>
</xs:element>
--- 121,129 ----
<xs:element name="ExchangeCompletedReceipt" nillable="false">
<xs:complexType>
! <xs:sequence>
! <xs:element ref="xfer:ValueTime" minOccurs="1" maxOccurs="1" />
! <xs:element ref="ExchangeCompletionOrder" minOccurs="1" maxOccurs="1"/>
! <xs:group ref="id:SignedObjectGroup" minOccurs="0" maxOccurs="1"/>
! </xs:sequence>
</xs:complexType>
</xs:element>
Index: xfer.xsd
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/schemas/xfer.xsd,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** xfer.xsd 8 Jan 2004 17:15:28 -0000 1.5
--- xfer.xsd 11 Jan 2004 00:39:06 -0000 1.6
***************
*** 3,6 ****
--- 3,16 ----
$Id$
$Log$
+ Revision 1.6 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.5 2004/01/08 17:15:28 pelle
Further improving the model. Removing the need for transactions to be members of NamedObject
***************
*** 31,40 ****
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns="http://neuclear.org/neu/xfer.xsd"
! xmlns:neuid="http://neuclear.org/neu/neuid.xsd"
elementFormDefault="qualified" version="0.3" id="xfer">
<xs:import namespace="http://neuclear.org/neu/neuid.xsd" schemaLocation="../../../neuclear-id/src/schemas/neuid.xsd" />
! <xs:element name="Asset" type="neuid:NamedObjectReference" nillable="false"/>
! <xs:element name="Recipient" type="neuid:NamedObjectReference" nillable="false"/>
<xs:element name="ValueTime" type="xs:dateTime" nillable="true"/>
<xs:element name="Comment" type="xs:string" nillable="true"/>
--- 41,50 ----
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns="http://neuclear.org/neu/xfer.xsd"
! xmlns:id="http://neuclear.org/neu/neuid.xsd"
elementFormDefault="qualified" version="0.3" id="xfer">
<xs:import namespace="http://neuclear.org/neu/neuid.xsd" schemaLocation="../../../neuclear-id/src/schemas/neuid.xsd" />
! <xs:element name="Asset" type="id:NamedObjectReference" nillable="false"/>
! <xs:element name="Recipient" type="id:NamedObjectReference" nillable="false"/>
<xs:element name="ValueTime" type="xs:dateTime" nillable="true"/>
<xs:element name="Comment" type="xs:string" nillable="true"/>
***************
*** 48,52 ****
<xs:element name="SerialNumbers" substitutionGroup="Value">
<xs:simpleType>
! <xs:list itemType="neuid:NamedObjectReference"/>
</xs:simpleType>
</xs:element>
--- 58,62 ----
<xs:element name="SerialNumbers" substitutionGroup="Value">
<xs:simpleType>
! <xs:list itemType="id:NamedObjectReference"/>
</xs:simpleType>
</xs:element>
***************
*** 54,67 ****
<xs:element name="TransferOrder" nillable="false">
<xs:complexType>
! <xs:complexContent>
! <xs:extension base="neuid:NamedObjectType">
! <xs:sequence>
! <xs:element ref="Recipient" minOccurs="1" maxOccurs="1"/>
! <xs:element ref="Asset" minOccurs="1" maxOccurs="1"/>
! <xs:element ref="Value" minOccurs="1" maxOccurs="1"/>
! <xs:element ref="Comment" minOccurs="0" maxOccurs="1"/>
! </xs:sequence>
! </xs:extension>
! </xs:complexContent>
</xs:complexType>
</xs:element>
--- 64,74 ----
<xs:element name="TransferOrder" nillable="false">
<xs:complexType>
! <xs:sequence>
! <xs:element ref="Recipient" minOccurs="1" maxOccurs="1"/>
! <xs:element ref="Asset" minOccurs="1" maxOccurs="1"/>
! <xs:element ref="Value" minOccurs="1" maxOccurs="1"/>
! <xs:element ref="Comment" minOccurs="0" maxOccurs="1"/>
! <xs:group ref="id:SignedObjectGroup" minOccurs="0" maxOccurs="1"/>
! </xs:sequence>
</xs:complexType>
</xs:element>
***************
*** 69,81 ****
<xs:element name="TransferReceipt" nillable="false">
<xs:complexType >
! <xs:complexContent>
! <xs:extension base="neuid:NamedObjectType">
! <xs:sequence>
! <xs:element ref="ValueTime" minOccurs="1" maxOccurs="1"/>
! <xs:element ref="Value" minOccurs="0" maxOccurs="1"/>
! <xs:element ref="TransferOrder" minOccurs="1" maxOccurs="1"/>
! </xs:sequence>
! </xs:extension>
! </xs:complexContent>
</xs:complexType>
</xs:element>
--- 76,85 ----
<xs:element name="TransferReceipt" nillable="false">
<xs:complexType >
! <xs:sequence>
! <xs:element ref="ValueTime" minOccurs="1" maxOccurs="1"/>
! <xs:element ref="Value" minOccurs="0" maxOccurs="1"/>
! <xs:element ref="TransferOrder" minOccurs="1" maxOccurs="1"/>
! <xs:group ref="id:SignedObjectGroup" minOccurs="0" maxOccurs="1"/>
! </xs:sequence>
</xs:complexType>
</xs:element>
|