|
From: Pelle B. <pe...@us...> - 2004-04-02 17:11:05
|
Update of /cvsroot/neuclear/neuclear-pay/src/schemas In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28155/src/schemas Modified Files: asset.xsd exch.xsd Log Message: Updated Asset and Asset Builder with semi fully featured functionality. It now has Issuer, Service etc. Index: asset.xsd =================================================================== RCS file: /cvsroot/neuclear/neuclear-pay/src/schemas/asset.xsd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** asset.xsd 18 Feb 2004 00:13:31 -0000 1.2 --- asset.xsd 2 Apr 2004 16:58:54 -0000 1.3 *************** *** 7,52 **** xmlns:ds="http://www.w3.org/2000/09/xmldsig#" ! elementFormDefault="qualified" version="0.3" id="asset"> ! <xs:import namespace="http://neuclear.org/neu/neuid.xsd" schemaLocation="../../../neuclear-id/src/schemas/neuid.xsd" /> <xs:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="../../../neuclear-id/src/schemas/xmldsig-core-schema.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"/> ! <!-- Generic Value Identifier --> ! <xs:element name="Value" abstract="true" nillable="false"/> ! <!-- Specific numeric amount --> ! <xs:element name="Amount" substitutionGroup="Value" type="xs:double"/> ! <!-- All the serials numbers included in this Value. The numeric amount is always equals to the amount of items in ! the list --> ! <xs:element name="SerialNumbers" substitutionGroup="Value"> ! <xs:simpleType> ! <xs:list itemType="id:NamedObjectReference"/> ! </xs:simpleType> ! </xs:element> ! <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> - <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> </xs:schema> --- 7,39 ---- xmlns:ds="http://www.w3.org/2000/09/xmldsig#" ! elementFormDefault="qualified" version="0.3" id="as"> ! <xs:import namespace="http://neuclear.org/neu/neuid.xsd" schemaLocation="../../../neuclear-id/src/schemas/neuid.xsd"/> <xs:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="../../../neuclear-id/src/schemas/xmldsig-core-schema.xsd"/> + <xs:import namespace="http://www.w3.org/2001/XMLSchema" schemaLocation="../../../neuclear-id/src/schemas/XMLSchema.xsd"/> ! <xs:element name="Asset" type="AssetType" nillable="false"/> ! <xs:element name="Issuer"> <xs:complexType> <xs:sequence> ! <xs:element ref="ds:KeyInfo" maxOccurs="1" minOccurs="1"/> </xs:sequence> </xs:complexType> </xs:element> + <xs:complexType name="AssetType"> + <xs:sequence> + <xs:element ref="id:Repository" minOccurs="0" maxOccurs="1"/> + <xs:element ref="id:Service" minOccurs="1" maxOccurs="1"/> + <xs:element ref="Issuer" minOccurs="1" maxOccurs="1"/> + <xs:element name="DecimalPoints" type="xs:integer" minOccurs="0" maxOccurs="1"/> + <xs:element name="MinimumTransaction" type="xs:double" minOccurs="0" maxOccurs="1"/> + + <xs:element ref="id:TargetList" minOccurs="0" maxOccurs="1"/> + + + <xs:group ref="id:SignedObjectGroup" minOccurs="0" maxOccurs="1"/> + </xs:sequence> + </xs:complexType> </xs:schema> Index: exch.xsd =================================================================== RCS file: /cvsroot/neuclear/neuclear-pay/src/schemas/exch.xsd,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** exch.xsd 12 Jan 2004 22:39:15 -0000 1.5 --- exch.xsd 2 Apr 2004 16:58:54 -0000 1.6 *************** *** 3,6 **** --- 3,10 ---- $Id$ $Log$ + Revision 1.6 2004/04/02 16:58:54 pelle + Updated Asset and Asset Builder with semi fully featured functionality. + It now has Issuer, Service etc. + Revision 1.5 2004/01/12 22:39:15 pelle Completed all the builders and contracts. *************** *** 34,39 **** 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"/> --- 38,43 ---- xmlns:xfer="http://neuclear.org/neu/xfer.xsd" xmlns:id="http://neuclear.org/neu/neuid.xsd" ! elementFormDefault="qualified" version="0.3" id="ex"> ! <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"/> *************** *** 66,75 **** <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> --- 70,79 ---- <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> *************** *** 97,101 **** <xs:element ref="xfer:Value" 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> --- 101,105 ---- <xs:element ref="xfer:Value" 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> *************** *** 106,120 **** <xs:complexType> <xs:sequence> ! <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> ! <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"/> --- 110,124 ---- <xs:complexType> <xs:sequence> ! <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> ! <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"/> *************** *** 126,130 **** <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"/> --- 130,134 ---- <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"/> |