|
From: <pe...@us...> - 2004-01-11 00:39:17
|
Update of /cvsroot/neuclear/neuclear-id/src/schemas
In directory sc8-pr-cvs1:/tmp/cvs-serv22513/src/schemas
Modified Files:
neuid.xsd nsauth.xsd sigreq.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: neuid.xsd
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/schemas/neuid.xsd,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** neuid.xsd 8 Jan 2004 17:15:33 -0000 1.4
--- neuid.xsd 11 Jan 2004 00:39:14 -0000 1.5
***************
*** 3,6 ****
--- 3,16 ----
<!--$Id$
$Log$
+ Revision 1.5 2004/01/11 00:39:14 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.4 2004/01/08 17:15:33 pelle
Further improving the model. Removing the need for transactions to be members of NamedObject
***************
*** 35,39 ****
<xs:simpleType name="sha1">
<xs:restriction base="xs:string">
! <xs:pattern value='^(sha1:)?.{20}$'/>
<xs:whiteSpace value="collapse"/>
</xs:restriction>
--- 45,49 ----
<xs:simpleType name="sha1">
<xs:restriction base="xs:string">
! <xs:pattern value='^(sha1:)?[a-zA-Z2-7]{20}$'/>
<xs:whiteSpace value="collapse"/>
</xs:restriction>
***************
*** 90,95 ****
<xs:sequence>
<xs:element ref="Repository" minOccurs="0" maxOccurs="1"/>
<xs:element ref="Allow" minOccurs="1" maxOccurs="1"/>
! <xs:group ref="SignedObjectGroup"/>
</xs:sequence>
</xs:complexType>
--- 100,106 ----
<xs:sequence>
<xs:element ref="Repository" minOccurs="0" maxOccurs="1"/>
+ <xs:element ref="TargetList" minOccurs="0" maxOccurs="1"/>
<xs:element ref="Allow" minOccurs="1" maxOccurs="1"/>
! <xs:group ref="id:SignedObjectGroup" minOccurs="0" maxOccurs="1"/>
</xs:sequence>
</xs:complexType>
Index: nsauth.xsd
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/schemas/nsauth.xsd,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** nsauth.xsd 7 Jan 2004 16:16:02 -0000 1.3
--- nsauth.xsd 11 Jan 2004 00:39:14 -0000 1.4
***************
*** 12,16 ****
<xs:schema targetNamespace="http://neuclear.org/neu/nsauth"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
! xmlns:neuid="http://neuclear.org/neu/neuid.xsd"
xmlns:nsauth="http://neuclear.org/neu/nsauth.xsd"
xmlns="http://neuclear.org/neu/nsauth.xsd"
--- 12,16 ----
<xs:schema targetNamespace="http://neuclear.org/neu/nsauth"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
! xmlns:id="http://neuclear.org/neu/neuid.xsd"
xmlns:nsauth="http://neuclear.org/neu/nsauth.xsd"
xmlns="http://neuclear.org/neu/nsauth.xsd"
***************
*** 20,29 ****
<xs:element name="AuthenticationTicket" nillable="true">
<xs:complexType>
! <xs:complexContent>
! <xs:extension base="neuid:NamedObjectType">
! <xs:attribute name="validTo" type="xs:dateTime" use="optional"/>
! <xs:attribute name="href" type="xs:anyURI" use="optional"/>
! </xs:extension>
! </xs:complexContent>
</xs:complexType>
</xs:element>
--- 20,28 ----
<xs:element name="AuthenticationTicket" nillable="true">
<xs:complexType>
! <xs:sequence>
! <xs:group ref="id:SignedObjectGroup" minOccurs="0" maxOccurs="1"/>
! </xs:sequence>
! <xs:attribute name="expiry" type="xs:dateTime" use="optional"/>
! <xs:attribute name="href" type="xs:anyURI" use="optional"/>
</xs:complexType>
</xs:element>
Index: sigreq.xsd
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/schemas/sigreq.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sigreq.xsd 7 Jan 2004 16:16:02 -0000 1.1
--- sigreq.xsd 11 Jan 2004 00:39:14 -0000 1.2
***************
*** 10,14 ****
<xs:schema targetNamespace="http://neuclear.org/neu/nssign"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
! xmlns:neuid="http://neuclear.org/neu/neuid.xsd"
xmlns:sigreq="http://neuclear.org/neu/sigreq.xsd"
xmlns="http://neuclear.org/neu/sigreq.xsd"
--- 10,14 ----
<xs:schema targetNamespace="http://neuclear.org/neu/nssign"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
! xmlns:id="http://neuclear.org/neu/neuid.xsd"
xmlns:sigreq="http://neuclear.org/neu/sigreq.xsd"
xmlns="http://neuclear.org/neu/sigreq.xsd"
***************
*** 19,33 ****
<xs:element name="SignatureRequest" nillable="false">
<xs:complexType>
! <xs:complexContent>
! <xs:extension base="neuid:NamedObjectType">
! <xs:sequence>
! <!-- Include one element to sign -->
! <xs:any maxOccurs="1" minOccurs="1"/>
! <!-- Optional verbal Description -->
! <xs:element name="description" type="xs:string" maxOccurs="1"/>
! </xs:sequence>
! <xs:attribute name="href" type="xs:string"/>
! </xs:extension>
! </xs:complexContent>
</xs:complexType>
</xs:element>
--- 19,31 ----
<xs:element name="SignatureRequest" nillable="false">
<xs:complexType>
! <xs:sequence>
! <!-- Include one element to sign -->
! <xs:any maxOccurs="1" minOccurs="1"/>
! <!-- Optional verbal Description -->
! <xs:element name="description" type="xs:string" maxOccurs="1"/>
! <xs:element ref="id:TargetList"/>
! <xs:group ref="id:SignedObjectGroup" minOccurs="0" maxOccurs="1"/>
! </xs:sequence>
! <xs:attribute name="href" type="xs:string"/>
</xs:complexType>
</xs:element>
|