[Neuclear-develop] neuclear-id/src/schemas neuid.xsd,1.5,1.6

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

Update of /cvsroot/neuclear/neuclear-id/src/schemas
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28262/src/schemas

Modified Files:
	neuid.xsd 
Log Message:
Updated Asset and Asset Builder with semi fully featured functionality.
It now has Issuer, Service etc.

Index: neuid.xsd
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/schemas/neuid.xsd,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** neuid.xsd	11 Jan 2004 00:39:14 -0000	1.5
--- neuid.xsd	2 Apr 2004 16:59:04 -0000	1.6
***************
*** 3,6 ****
--- 3,10 ----
  <!--$Id$
  $Log$
+ Revision 1.6  2004/04/02 16:59:04  pelle
+ Updated Asset and Asset Builder with semi fully featured functionality.
+ It now has Issuer, Service etc.
+ 
  Revision 1.5  2004/01/11 00:39:14  pelle
  Cleaned up the schemas even more they now all verifiy.
***************
*** 42,45 ****
--- 46,50 ----
  
      <xs:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="xmldsig-core-schema.xsd"/>
+     <xs:import namespace="http://www.w3.org/2001/XMLSchema" schemaLocation="XMLSchema.xsd"/>
  
      <xs:simpleType name="sha1">
***************
*** 63,77 ****
      <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>
--- 68,83 ----
      <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="Service">
          <xs:complexType>
              <xs:sequence>
                  <xs:element ref="ds:KeyInfo" maxOccurs="1" minOccurs="1"/>
+                 <xs:element name="Url" type="xs:anyURI"/>
              </xs:sequence>
          </xs:complexType>
***************
*** 80,92 ****
      <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>
--- 86,98 ----
      <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>
***************
*** 97,108 ****
      </xs:element>
  
! 	<xs:complexType name="IdentityType">
          <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>
  
  </xs:schema>
--- 103,113 ----
      </xs:element>
  
!     <xs:complexType name="IdentityType">
          <xs:sequence>
              <xs:element ref="Repository" minOccurs="0" maxOccurs="1"/>
              <xs:element ref="TargetList" minOccurs="0" maxOccurs="1"/>
              <xs:group ref="id:SignedObjectGroup" minOccurs="0" maxOccurs="1"/>
          </xs:sequence>
!     </xs:complexType>
  
  </xs:schema>