Return-Path: 
 <cvs-return-22939-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@www.apache.org
Received: (qmail 94955 invoked from network); 12 Apr 2005 19:57:45 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 12 Apr 2005 19:57:45 -0000
Received: (qmail 10391 invoked by uid 500); 12 Apr 2005 19:57:44 -0000
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 10346 invoked by uid 500); 12 Apr 2005 19:57:44 -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 10333 invoked by uid 99); 12 Apr 2005 19:57:44 -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:57:44 -0700
Received: (qmail 94946 invoked by uid 65534); 12 Apr 2005 19:57:42 -0000
Message-ID: <20050412195742.94945.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:57:42 -0000
Subject: svn commit: r161104 - cocoon/trunk/src/schema/wiring-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:57:42 2005
New Revision: 161104

URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D161104
Log:
use types instead of element references; set minOccurs on xs:sequence level=
 and not on xs:element level which works around a nasty Castor bug

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

Modified: cocoon/trunk/src/schema/wiring-schema-1.0.xsd
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/schema/wiring-schema-1.=
0=2Exsd?view=3Ddiff&r1=3D161103&r2=3D161104
=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/wiring-schema-1.0.xsd (original)
+++ cocoon/trunk/src/schema/wiring-schema-1.0.xsd Tue Apr 12 12:57:42 2005
@@ -21,56 +21,46 @@
 =20
   <xs:element name=3D"wiring">
     <xs:complexType>
-      <xs:sequence>
-      	<xs:element ref=3D"block" maxOccurs=3D"unbounded"/>
+      <xs:sequence minOccurs=3D"0">
+      	<xs:element name=3D"block" type=3D"block" maxOccurs=3D"unbounded"/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>
  =20
-  <xs:element name=3D"block">
-  	<xs:complexType>
-			<xs:all>
-				<xs:element ref=3D"mount" minOccurs=3D"0" maxOccurs=3D"1"/>
-				<xs:element ref=3D"connections" minOccurs=3D"0" maxOccurs=3D"1"/>
-				<xs:element ref=3D"properties" minOccurs=3D"0" maxOccurs=3D"1"/>
-			</xs:all>
-			<xs:attribute name=3D"id" type=3D"xs:anyURI" use=3D"required"/>
-			<xs:attribute name=3D"location" type=3D"xs:anyURI" use=3D"required"/>
-  	</xs:complexType> =20
-  </xs:element>
-  <xs:element name=3D"mount">
-  	<xs:complexType>
-  		<xs:attribute name=3D"path" type=3D"xs:string" use=3D"required"/>
-  	</xs:complexType>  =09
-  </xs:element>
-  <xs:element name=3D"connections">
-  	<xs:complexType>
-  		<xs:sequence>
-  			<xs:element ref=3D"connection" minOccurs=3D"0" maxOccurs=3D"unbounded=
"/>
-  		</xs:sequence>
-  	</xs:complexType>  =09
-  </xs:element> =20
+  <xs:complexType name=3D"block">
+		<xs:all>
+			<xs:element name=3D"mount" type=3D"mount" minOccurs=3D"0"/>
+			<xs:element name=3D"connections" type=3D"connections" minOccurs=3D"0"/>
+			<xs:element name=3D"properties" type=3D"properties" minOccurs=3D"0"/>
+		</xs:all>
+		<xs:attribute name=3D"id" type=3D"xs:anyURI" use=3D"required"/>
+		<xs:attribute name=3D"location" type=3D"xs:anyURI" use=3D"required"/>
+  </xs:complexType> =20
=20
-  <xs:element name=3D"connection">
-  	<xs:complexType>
-  		<xs:attribute name=3D"name" type=3D"xs:string" use=3D"required"/>
-  		<xs:attribute name=3D"block" type=3D"xs:anyURI" use=3D"required"/>
-  	</xs:complexType>   =09
-  </xs:element>
+  <xs:complexType name=3D"mount">
+  	<xs:attribute name=3D"path" type=3D"xs:string" use=3D"required"/>
+  </xs:complexType>  =09
=20
-  <xs:element name=3D"properties">
-  	<xs:complexType>
-  		<xs:sequence>
-  			<xs:element ref=3D"property" minOccurs=3D"1" maxOccurs=3D"unbounded"/=
>
-  		</xs:sequence>
-  	</xs:complexType>  =09
-  </xs:element> =20
-  <xs:element name=3D"property">
-  	<xs:complexType>
-  		<xs:attribute name=3D"name" type=3D"xs:string" use=3D"required"/>
-  		<xs:attribute name=3D"value" type=3D"xs:string" use=3D"required"/>
-  	</xs:complexType>   =09
-  </xs:element>
+  <xs:complexType name=3D"connections">
+  	<xs:sequence>
+  		<xs:element name=3D"connection" type=3D"connection" minOccurs=3D"0" ma=
xOccurs=3D"unbounded"/>
+  	</xs:sequence>
+  </xs:complexType>  =09
+
+  <xs:complexType name=3D"connection">
+  	<xs:attribute name=3D"name" type=3D"xs:string" use=3D"required"/>
+  	<xs:attribute name=3D"block" type=3D"xs:anyURI" use=3D"required"/>
+  </xs:complexType>   =09
+
+  <xs:complexType name=3D"properties">
+  	<xs:sequence>
+  		<xs:element name=3D"property" type=3D"property" minOccurs=3D"1" maxOcc=
urs=3D"unbounded"/>
+  	</xs:sequence>
+  </xs:complexType>  =09
=20
+  <xs:complexType name=3D"property">
+  	<xs:attribute name=3D"name" type=3D"xs:string" use=3D"required"/>
+  	<xs:attribute name=3D"value" type=3D"xs:string" use=3D"required"/>
+  </xs:complexType>   =09
=20
 </xs:schema>