[Neuclear-develop] neuclear-id/src/schemas neuid.xsd,1.3,1.4

[<pe...@us...>]

Update of /cvsroot/neuclear/neuclear-id/src/schemas
In directory sc8-pr-cvs1:/tmp/cvs-serv14442/src/schemas

Modified Files:
	neuid.xsd 
Log Message:
Further improving the model. Removing the need for transactions to be members of NamedObject

Index: neuid.xsd
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/schemas/neuid.xsd,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** neuid.xsd	7 Jan 2004 23:12:20 -0000	1.3
--- neuid.xsd	8 Jan 2004 17:15:33 -0000	1.4
***************
*** 3,6 ****
--- 3,9 ----
  <!--$Id$
  $Log$
+ Revision 1.4  2004/01/08 17:15:33  pelle
+ Further improving the model. Removing the need for transactions to be members of NamedObject
+ 
  Revision 1.3  2004/01/07 23:12:20  pelle
  XMLSig now has various added features:
***************
*** 24,28 ****
      xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
      xmlns="http://neuclear.org/neu/neuid.xsd"
!     elementFormDefault="qualified" version="0.9" id="id">
  
      <xs:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="xmldsig-core-schema.xsd"/>
--- 27,33 ----
      xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
      xmlns="http://neuclear.org/neu/neuid.xsd"
!     elementFormDefault="qualified"
!     attributeFormDefault="qualified"
!     version="0.9" id="id">
  
      <xs:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="xmldsig-core-schema.xsd"/>
***************
*** 46,118 ****
      </xs:simpleType>
  
!     <xs:attributeGroup name="NamedObject.attributes" >
!         <xs:attribute name="name" type="neuri"/>
!         <xs:attribute name="timestamp" type="xs:dateTime" />
!     </xs:attributeGroup>
  
! 	<xs:complexType name="NamedObjectType">
  		<xs:sequence>
!         <!-- I think we dont need this -->
! <!--			<xs:any namespace="##any"/>-->
!             <xs:element name="Targets" type="TargetList"/>
  			<xs:element ref="ds:Signature" maxOccurs="1" minOccurs="1"/>
  		</xs:sequence>
!         <xs:attributeGroup ref="NamedObject.attributes"/>
! 	</xs:complexType>
! 
! 	<xs:complexType name="TargetType">
!         <xs:attribute name="href" type="xs:anyURI"/>
!         <xs:attribute name="type" type="xs:string"/>
! 	</xs:complexType>
! 
!     <xs:element name="Target" type= "TargetType"/>
! 	<xs:complexType name="KeyHolder">
! 		<xs:sequence>
! 			<xs:element ref="ds:KeyInfo" maxOccurs="unbounded"/>
! 		</xs:sequence>
!         <xs:attribute name="ns" type="xs:string"/>
! 	</xs:complexType>
  
!     <xs:attributeGroup name="Identity.attributes">
!         <!--
!         The Repository for this NameSpace
!         -->
!         <xs:attribute name="repository" type="xs:anyURI"/>
!         <!--
!         The Receiver for this NameSpace
!         -->
!         <xs:attribute name="receiver" type="xs:anyURI"/>
!         <!--
!         The store for this NameSpace
!         -->
!         <xs:attribute name="store" type="xs:anyURI"/>
!         <!-- The interactive signer for this NameSpace.
!         If Empty the NameSpace doesn't allow interactive signing.
!         -->
!         <xs:attribute name="signer" type="xs:anyURI"/>
!         <!--
!         The Logging Service for this NameSpace
!         -->
!         <xs:attribute name="logger" type="xs:anyURI"/>
!     </xs:attributeGroup>
  
! 	<xs:complexType name="IdentityType">
! 		<xs:complexContent>
! 			<xs:extension base="NamedObjectType">
! 				<xs:sequence>
! 					<xs:element name="Allow" type="KeyHolder" maxOccurs="unbounded"/>
! 				</xs:sequence>
!                 <xs:attributeGroup ref="Identity.attributes"/>
! 			</xs:extension>
! 		</xs:complexContent>
! 	</xs:complexType>
  
  	<xs:element name="Identity" type="IdentityType"/>
  
!     <xs:complexType name="TargetList">
          <xs:sequence>
!             <xs:element ref="Target" maxOccurs="unbounded"/>
          </xs:sequence>
!     </xs:complexType>
  
  </xs:schema>
--- 51,97 ----
      </xs:simpleType>
  
!     <xs:element name="TimeStamp" type="xs:dateTime"/>
  
! 	<xs:group name="SignedObjectGroup">
  		<xs:sequence>
!             <xs:element ref="TimeStamp" minOccurs="0" maxOccurs="1"/>
  			<xs:element ref="ds:Signature" maxOccurs="1" minOccurs="1"/>
  		</xs:sequence>
! 	</xs:group>
  
!     <xs:element name="Allow">
!         <xs:complexType>
!             <xs:sequence>
!                 <xs:element ref="ds:KeyInfo" maxOccurs="1" minOccurs="1"/>
!             </xs:sequence>
!         </xs:complexType>
!     </xs:element>
  
!     <xs:element name="Repository" type="xs:anyURI" nillable="false"/>
  
  	<xs:element name="Identity" type="IdentityType"/>
  
!     <xs:element name="Target">
!          <xs:complexType>
!              <xs:attribute name="href" type="xs:anyURI"/>
!              <xs:attribute name="type" type="xs:string"/>
!         </xs:complexType>
!     </xs:element>
!  
!     <xs:element name="TargetList">
!         <xs:complexType>
!             <xs:sequence>
!                 <xs:element ref="Target" maxOccurs="unbounded"/>
!             </xs:sequence>
!         </xs:complexType>
!     </xs:element>
! 
! 	<xs:complexType name="IdentityType">
          <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>
  
  </xs:schema>