Menu
▾
▴
[Neuclear-develop] neuclear-id/src/schemas neuid.xsd,1.2,1.3
|
From: <pe...@us...> - 2004-01-07 23:12:25
|
Update of /cvsroot/neuclear/neuclear-id/src/schemas In directory sc8-pr-cvs1:/tmp/cvs-serv16630/src/schemas Modified Files: neuid.xsd Log Message: XMLSig now has various added features: - KeyInfo supports X509v3 (untested) - KeyInfo supports KeyName - When creating a XMLSignature and signing it with a Signer, it adds the alias to the KeyName Added KeyResolver interface and KeyResolverFactory Class. At the moment no implementations. Index: neuid.xsd =================================================================== RCS file: /cvsroot/neuclear/neuclear-id/src/schemas/neuid.xsd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** neuid.xsd 7 Jan 2004 16:16:02 -0000 1.2 --- neuid.xsd 7 Jan 2004 23:12:20 -0000 1.3 *************** *** 3,6 **** --- 3,13 ---- <!--$Id$ $Log$ + Revision 1.3 2004/01/07 23:12:20 pelle + XMLSig now has various added features: + - KeyInfo supports X509v3 (untested) + - KeyInfo supports KeyName + - When creating a XMLSignature and signing it with a Signer, it adds the alias to the KeyName + Added KeyResolver interface and KeyResolverFactory Class. At the moment no implementations. + Revision 1.2 2004/01/07 16:16:02 pelle I have updated all the current schemas, cleaned out the defunct ones and "completed" *************** *** 12,21 **** --> ! <xs:schema targetNamespace="http://neuclear.org/neu/neuid.xsd" xmlns:nsdl="http://neuclear.org/neu/neuid.xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" ! xmlns="http://neuclear.org/neu/neuid.xsd" elementFormDefault="qualified" version="0.9" id="neuid"> ! <xs:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="xmldsig-core-schema.xsd"/> <xs:simpleType name="sha1"> --- 19,30 ---- --> ! <xs:schema targetNamespace="http://neuclear.org/neu/neuid.xsd" ! xmlns:id="http://neuclear.org/neu/neuid.xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" 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"/> <xs:simpleType name="sha1"> *************** *** 25,38 **** </xs:restriction> </xs:simpleType> <xs:simpleType name="neuri"> <xs:restriction base="xs:string"> ! <xs:pattern value="^neu:([\w]{1,6}:)?//(([\w][\w.-]*)@)?[\w]([\w.-]*[\w])?(/[\w][\w-]*)*(![\w][\w.-]*)?$"/> <xs:whiteSpace value="collapse"/> </xs:restriction> </xs:simpleType> <xs:simpleType name="NamedObjectReference"> <xs:union memberTypes="neuri sha1"/> </xs:simpleType> <xs:complexType name="NamedObjectType"> <xs:sequence> --- 34,54 ---- </xs:restriction> </xs:simpleType> + <xs:simpleType name="neuri"> <xs:restriction base="xs:string"> ! <xs:pattern value="neu:([\w]{1,6}:)?//(([\w][\w.-]*)@)?[\w]([\w.-]*[\w])?(/[\w][\w-]*)*(![\w][\w.-]*)?"/> <xs:whiteSpace value="collapse"/> </xs:restriction> </xs:simpleType> + <xs:simpleType name="NamedObjectReference"> <xs:union memberTypes="neuri sha1"/> </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> *************** *** 42,47 **** <xs:element ref="ds:Signature" maxOccurs="1" minOccurs="1"/> </xs:sequence> ! <xs:attribute name="name" type="neuri"/> ! <xs:attribute name="timestamp" type="xs:dateTime" /> </xs:complexType> --- 58,62 ---- <xs:element ref="ds:Signature" maxOccurs="1" minOccurs="1"/> </xs:sequence> ! <xs:attributeGroup ref="NamedObject.attributes"/> </xs:complexType> *************** *** 50,53 **** --- 65,69 ---- <xs:attribute name="type" type="xs:string"/> </xs:complexType> + <xs:element name="Target" type= "TargetType"/> <xs:complexType name="KeyHolder"> *************** *** 58,61 **** --- 74,100 ---- </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> *************** *** 64,91 **** <xs:element name="Allow" type="KeyHolder" maxOccurs="unbounded"/> </xs:sequence> ! <!-- ! Default WebServices for this namespace. These can be specified using either HTTP to a SOAP web port or ! given a neu://etc/etc... URI they can read the definition from a public definition. ! --> ! <!-- ! 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:extension> </xs:complexContent> --- 103,107 ---- <xs:element name="Allow" type="KeyHolder" maxOccurs="unbounded"/> </xs:sequence> ! <xs:attributeGroup ref="Identity.attributes"/> </xs:extension> </xs:complexContent> |
