Return-Path: 
 <cvs-return-22938-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@www.apache.org
Received: (qmail 89292 invoked from network); 12 Apr 2005 19:36:30 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 12 Apr 2005 19:36:30 -0000
Received: (qmail 71127 invoked by uid 500); 12 Apr 2005 19:36:23 -0000
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 71064 invoked by uid 500); 12 Apr 2005 19:36:23 -0000
Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
list-help: <mailto:cvs-help@cocoon.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@cocoon.apache.org>
List-Post: <mailto:cvs@cocoon.apache.org>
Delivered-To: mailing list cvs@cocoon.apache.org
Received: (qmail 71041 invoked by uid 99); 12 Apr 2005 19:36:23 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Tue, 12 Apr 2005 12:36:22 -0700
Received: (qmail 89137 invoked by uid 65534); 12 Apr 2005 19:36:21 -0000
Message-ID: <20050412193621.89136.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Mailer: svnmailer-1.0.0-dev
Date: Tue, 12 Apr 2005 19:36:20 -0000
Subject: svn commit: r161101 - cocoon/trunk/src/schema/cob-schema-1.0.xsd
To: cvs@cocoon.apache.org
From: reinhard@apache.org
X-Virus-Checked: Checked
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: reinhard
Date: Tue Apr 12 12:36:20 2005
New Revision: 161101

URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D161101
Log:
correct restrictions and use types instead of element references

Modified:
    cocoon/trunk/src/schema/cob-schema-1.0.xsd

Modified: cocoon/trunk/src/schema/cob-schema-1.0.xsd
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/schema/cob-schema-1.0.x=
sd?view=3Ddiff&r1=3D161100&r2=3D161101
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- cocoon/trunk/src/schema/cob-schema-1.0.xsd (original)
+++ cocoon/trunk/src/schema/cob-schema-1.0.xsd Tue Apr 12 12:36:20 2005
@@ -22,35 +22,34 @@
   <xs:element name=3D"block">
     <xs:complexType>
       <xs:all>
-        <xs:element ref=3D"name" minOccurs=3D"1" maxOccurs=3D"1"/>
-        <xs:element ref=3D"description" minOccurs=3D"1" maxOccurs=3D"1"/>
-        <xs:element ref=3D"state" minOccurs=3D"1" maxOccurs=3D"1"/>       =
=20
-        <xs:element ref=3D"license" minOccurs=3D"1" maxOccurs=3D"1"/>
-        <xs:element ref=3D"author" minOccurs=3D"1" maxOccurs=3D"1"/>
-        <xs:element ref=3D"sitemap" minOccurs=3D"0" maxOccurs=3D"1"/>
-        <xs:element ref=3D"properties" minOccurs=3D"0" maxOccurs=3D"1"/>
-        <xs:element ref=3D"requirements" minOccurs=3D"0" maxOccurs=3D"1"/>
-        <xs:element ref=3D"implements" minOccurs=3D"0" maxOccurs=3D"1"/>
-        <xs:element ref=3D"extends" minOccurs=3D"0" maxOccurs=3D"1"/>
+        <xs:element name=3D"name" type=3D"name"/>
+        <xs:element name=3D"description" type=3D"href"/>
+        <xs:element name=3D"state" type=3D"state"/>       =20
+        <xs:element name=3D"license" type=3D"href"/>
+        <xs:element name=3D"author" type=3D"href"/>
+        <xs:element name=3D"sitemap" type=3D"src" minOccurs=3D"0"/>
+        <xs:element name=3D"properties" type=3D"properties" minOccurs=3D"0=
"/>
+        <xs:element name=3D"requirements" type=3D"requirements" minOccurs=
=3D"0"/>
+        <xs:element name=3D"implements" type=3D"implements" minOccurs=3D"0=
"/>
+        <xs:element name=3D"extends" type=3D"extends" minOccurs=3D"0"/>
       </xs:all>
       <xs:attribute name=3D"id" type=3D"xs:anyURI" use=3D"required"/>
     </xs:complexType>
   </xs:element>
    =20
   <!-- general meta data -->
-  <xs:element name=3D"name" type=3D"xs:string"/>
-  <xs:element name=3D"description" type=3D"href"/>
-  <xs:element name=3D"state">
-  	<xs:complexType>
-	  	<xs:attribute name=3D"href" type=3D"xs:anyURI" use=3D"required"/>
-	  	<xs:attribute name=3D"community" type=3D"community" use=3D"required"/>
-	  	<xs:attribute name=3D"interfaces" type=3D"stability" use=3D"required"/=
>
-	  	<xs:attribute name=3D"implementation" type=3D"stability" use=3D"requir=
ed"/>
-  	</xs:complexType>
-  </xs:element>
-  <xs:element name=3D"license" type=3D"href"/>
-  <xs:element name=3D"author" type=3D"href"/>
-  <xs:element name=3D"sitemap" type=3D"src"/>
+  <xs:complexType name=3D"name">
+    <xs:simpleContent>
+      <xs:extension base=3D"xs:string"/>
+    </xs:simpleContent>
+  </xs:complexType>=20
+
+  <xs:complexType name=3D"state">
+  	<xs:attribute name=3D"href" type=3D"xs:anyURI" use=3D"required"/>
+  	<xs:attribute name=3D"community" type=3D"community" use=3D"required"/>
+  	<xs:attribute name=3D"interfaces" type=3D"stability" use=3D"required"/>
+  	<xs:attribute name=3D"implementation" type=3D"stability" use=3D"require=
d"/>
+  </xs:complexType>
  =20
   <xs:simpleType name=3D"community">
 	  <xs:restriction base=3D"xs:string">
@@ -80,58 +79,47 @@
   </xs:complexType> =20
  =20
   <!-- properties -->
-  <xs:element name=3D"properties">
-  	<xs:complexType>
-			<xs:sequence>
-				<xs:element ref=3D"property" maxOccurs=3D"unbounded"/>
-			</xs:sequence>
-  	</xs:complexType>
-  </xs:element>
-  <xs:element name=3D"property">
-  	<xs:complexType>
-			<xs:all>
-				<xs:element name=3D"default" minOccurs=3D"0" maxOccurs=3D"1" type=3D"x=
s:string"/>
-				<xs:element name=3D"description" minOccurs=3D"1" maxOccurs=3D"1" type=
=3D"xs:string"/>
-			</xs:all>
-			<xs:attribute name=3D"name" use=3D"required"/>
-  	</xs:complexType>  =09
-  </xs:element>
- =20
+  <xs:complexType name=3D"properties">
+		<xs:sequence>
+			<xs:element name=3D"property" type=3D"property" maxOccurs=3D"unbounded"=
/>
+		</xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name=3D"property">
+		<xs:all>
+			<xs:element name=3D"default" minOccurs=3D"0" maxOccurs=3D"1" type=3D"xs=
:string"/>
+			<xs:element name=3D"description" minOccurs=3D"1" maxOccurs=3D"1" type=
=3D"xs:string"/>
+		</xs:all>
+		<xs:attribute name=3D"name" use=3D"required"/>
+  </xs:complexType>  =09
+
   <!-- requirements -->
-  <xs:element name=3D"requirements">
-  	<xs:complexType>
-			<xs:sequence>
-				<xs:element ref=3D"requires" maxOccurs=3D"unbounded"/>
-			</xs:sequence>
-  	</xs:complexType> =20
-  </xs:element>
-  <xs:element name=3D"requires">
-  	<xs:complexType>
-  		<xs:attribute name=3D"interface" type=3D"xs:anyURI" use=3D"required"/>
-  		<xs:attribute name=3D"default" type=3D"xs:anyURI" use=3D"optional"/>
-  		<xs:attribute name=3D"name" type=3D"xs:string" use=3D"required"/>
-  	</xs:complexType>  =09
-  </xs:element>
- =20
+  <xs:complexType name=3D"requirements">
+		<xs:sequence>
+			<xs:element name=3D"requires" type=3D"requires" maxOccurs=3D"unbounded"=
/>
+		</xs:sequence>
+  </xs:complexType> =20
+
+  <xs:complexType name=3D"requires">
+  	<xs:attribute name=3D"interface" type=3D"xs:anyURI" use=3D"required"/>
+  	<xs:attribute name=3D"default" type=3D"xs:anyURI" use=3D"optional"/>
+  	<xs:attribute name=3D"name" type=3D"xs:string" use=3D"required"/>
+  </xs:complexType>  =09
+
   <!-- implements -->
-  <xs:element name=3D"implements">
-  	<xs:complexType>
-			<xs:sequence>
-				<xs:element ref=3D"interface" maxOccurs=3D"unbounded"/>
-			</xs:sequence>
-  	</xs:complexType>  =09
-  </xs:element>
-  <xs:element name=3D"interface">
-  	<xs:complexType>
-  		<xs:attribute name=3D"id" type=3D"xs:anyURI" use=3D"required"/>
-  	</xs:complexType>  	  =09
-  </xs:element>
+  <xs:complexType name=3D"implements">
+		<xs:sequence>
+			<xs:element name=3D"interface" type=3D"interface" maxOccurs=3D"unbounde=
d"/>
+		</xs:sequence>
+  </xs:complexType>  =09
+
+  <xs:complexType name=3D"interface">
+  	<xs:attribute name=3D"id" type=3D"xs:anyURI" use=3D"required"/>
+  </xs:complexType>  	  =09
=20
   <!-- implements -->
-  <xs:element name=3D"extends">
-  	<xs:complexType>
-  		<xs:attribute name=3D"block" type=3D"xs:anyURI" use=3D"required"/>
-  	</xs:complexType>  	  =09
-  </xs:element>
+  <xs:complexType name=3D"extends">
+  	<xs:attribute name=3D"block" type=3D"xs:anyURI" use=3D"required"/>
+  </xs:complexType>  	  =09
=20
 </xs:schema>