rubys 01/03/24 09:09:37
Modified: src/xml alltests.xsd blame.xsd cvs.xsd stats.xsd
workspace.xsd
Log:
Element wrappers no longer appear to be optional...
Revision Changes Path
1.3 +28 -22 jakarta-alexandria/src/xml/alltests.xsd
Index: alltests.xsd
===================================================================
RCS file: /home/cvs/jakarta-alexandria/src/xml/alltests.xsd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- alltests.xsd 2001/01/07 15:24:01 1.2
+++ alltests.xsd 2001/03/24 17:09:34 1.3
@@ -4,32 +4,38 @@
<element name="tests">
<complexType>
<sequence>
- <element name="testsuite" type="testsuite" minOccurs='0'
maxOccurs='unbounded'/>
+ <element ref="testsuite" type="testsuite" minOccurs='0'
maxOccurs='unbounded'/>
</sequence>
</complexType>
</element>
- <complexType name="testsuite">
- <sequence>
- <element name="testcase" type="testcase" minOccurs='0'
maxOccurs='unbounded'/>
- </sequence>
- <attribute name="errors" type="int" minOccurs="1" />
- <attribute name="failures" type="int" minOccurs="1" />
- <attribute name="tests" type="int" minOccurs="1" />
- <attribute name="time" type="string" minOccurs="1" />
- <attribute name="name" type="string" minOccurs="1" />
- </complexType>
+ <element name="testsuite">
+ <complexType>
+ <sequence>
+ <element ref="testcase" type="testcase" minOccurs='0'
maxOccurs='unbounded'/>
+ </sequence>
+ <attribute name="errors" type="int" minOccurs="1" />
+ <attribute name="failures" type="int" minOccurs="1" />
+ <attribute name="tests" type="int" minOccurs="1" />
+ <attribute name="time" type="string" minOccurs="1" />
+ <attribute name="name" type="string" minOccurs="1" />
+ </complexType>
+ </element>
- <complexType name="testcase">
- <sequence>
- <element name="failure" type="failure" minOccurs='0'
maxOccurs='unbounded'/>
- </sequence>
- <attribute name="name" type="string" minOccurs="1"/>
- <attribute name="time" type="string" minOccurs="1"/>
- </complexType>
+ <element name="testcase">
+ <complexType>
+ <sequence>
+ <element ref="failure" type="failure" minOccurs='0'
maxOccurs='unbounded'/>
+ </sequence>
+ <attribute name="name" type="string" minOccurs="1"/>
+ <attribute name="time" type="string" minOccurs="1"/>
+ </complexType>
+ </element>
- <complexType name="failure" content="any">
- <attribute name="message" type="string" minOccurs="1"/>
- <attribute name="type" type="string" maxOccurs="1" />
- </complexType>
+ <element name="failure">
+ <complexType content="any">
+ <attribute name="message" type="string" minOccurs="1"/>
+ <attribute name="type" type="string" maxOccurs="1" />
+ </complexType>
+ </element>
</schema>
1.4 +27 -21 jakarta-alexandria/src/xml/blame.xsd
Index: blame.xsd
===================================================================
RCS file: /home/cvs/jakarta-alexandria/src/xml/blame.xsd,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- blame.xsd 2001/02/08 20:24:19 1.3
+++ blame.xsd 2001/03/24 17:09:34 1.4
@@ -4,31 +4,37 @@
<element name="blame">
<complexType>
<sequence>
- <element name="system" type="system" minOccurs='0'
maxOccurs='unbounded'/>
+ <element ref="system" type="system" minOccurs='0'
maxOccurs='unbounded'/>
</sequence>
</complexType>
</element>
- <complexType name="build">
- <sequence>
- <element name="msg" type="msg" minOccurs='0' maxOccurs='unbounded'/>
- </sequence>
- <attribute name="date" type="string" minOccurs="1"/>
- <attribute name="success" type="boolean" minOccurs="1"/>
- </complexType>
+ <element name="build">
+ <complexType>
+ <sequence>
+ <element ref="msg" type="msg" minOccurs='0' maxOccurs='unbounded'/>
+ </sequence>
+ <attribute name="date" type="string" minOccurs="1"/>
+ <attribute name="success" type="boolean" minOccurs="1"/>
+ </complexType>
+ </element>
- <complexType name="msg" content="any" mixed="true">
- <attribute name="task" type="string" minOccurs="1"/>
- <attribute name="suspect" type="string" minOccurs="0" maxOccurs="1" />
- <attribute name="file" type="string" minOccurs="0" maxOccurs="1"/>
- <attribute name="line" type="integer" minOccurs="0" maxOccurs="1"/>
- </complexType>
+ <element name="msg">
+ <complexType content="any" mixed="true">
+ <attribute name="task" type="string" minOccurs="1"/>
+ <attribute name="suspect" type="string" minOccurs="0" maxOccurs="1" />
+ <attribute name="file" type="string" minOccurs="0" maxOccurs="1"/>
+ <attribute name="line" type="integer" minOccurs="0" maxOccurs="1"/>
+ </complexType>
+ </element>
- <complexType name="system">
- <sequence>
- <element name="build" type="build" minOccurs='1' maxOccurs='unbounded'/>
- </sequence>
- <attribute name="module" type="string"/>
- <attribute name="tag" type="string"/>
- </complexType>
+ <element name="system">
+ <complexType>
+ <sequence>
+ <element ref="build" type="build" minOccurs='1' maxOccurs='unbounded'/>
+ </sequence>
+ <attribute name="module" type="string"/>
+ <attribute name="tag" type="string"/>
+ </complexType>
+ </element>
</schema>
1.8 +108 -104 jakarta-alexandria/src/xml/cvs.xsd
Index: cvs.xsd
===================================================================
RCS file: /home/cvs/jakarta-alexandria/src/xml/cvs.xsd,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cvs.xsd 2001/01/07 15:24:01 1.7
+++ cvs.xsd 2001/03/24 17:09:34 1.8
@@ -4,114 +4,118 @@
<element name="cvs">
<complexType>
<sequence>
- <element name="repository" type="repository" minOccurs="1"
maxOccurs="unbounded"/>
+ <element ref="repository" type="repository" minOccurs="1"
maxOccurs="unbounded"/>
</sequence>
</complexType>
</element>
- <complexType name ="repository">
- <sequence>
- <!-- required elements -->
- <element name="name" type="string" minOccurs="1"
maxOccurs="1"/>
- <element name="root" type="string" minOccurs="1"
maxOccurs="1"/>
-
- <!-- FIX ME: castor doesn't support the URL datatype... change this..
-->
- <element name="home" type="string" minOccurs="1"
maxOccurs="1"/>
- <!-- Specify the modules that this repository contains -->
- <element name="module" type="module" minOccurs="1"
maxOccurs="unbounded"/>
-
-
- <!-- optional elements -->
- <element name="password" type="string" minOccurs="0" maxOccurs="1"/>
- <element name="description" type="string" minOccurs="1" maxOccurs="0"/>
- <!-- URL for the CVS web interface for this project -->
- <!-- FIX ME: castor doesn't support the URL datatype... change this..
-->
- <element name="cvsweb" type="string" minOccurs="0"
maxOccurs="1"/>
- </sequence>
-
- <!-- The type of repository this is. DEFAULT: CVS. If 'LOCAL' then
- this is just a local set of files -->
- <attribute name="type" type="string" minOccurs="0"
maxOccurs="1"/>
-
- <!-- if this is true the user has the option to browse the source this was
generated from.
- The default is true.
- -->
- <attribute name="opensource" type="boolean" default="true"
minOccurs="0" maxOccurs="1"/>
- </complexType>
-
- <complexType name="revision">
- <attribute name="tag" type="string" minOccurs="1" maxOccurs="1"/>
- <attribute name="latest" type="boolean" minOccurs="1" maxOccurs="1"/>
- </complexType>
-
-
- <complexType name="module">
- <sequence>
- <element name="name" type="string" minOccurs="1"
maxOccurs="1"/>
-
- <!--
- The URL for this module's homepage.
- -->
- <!-- FIX ME: castor doesn't support the URL datatype... change this..
-->
- <element name="home" type="string" minOccurs="1"
maxOccurs="1"/>
-
- <!--
- A description of what this module does.
- -->
- <element name="description" type="string" minOccurs="1"
maxOccurs="1"/>
-
-
- <!--
- The license for this module. Begin lawyer speak here...
- -->
- <element name="license" type="string" minOccurs="1"
maxOccurs="1"/>
-
- <!--
- The CVS name of this module
- -->
- <element name="cvs-module-name" type="string" minOccurs="1"
maxOccurs="1"/>
-
- <!--
- the begining of java program files. Should be in the from of "dir/dir"
- -->
- <element name="javasrc" type="string" minOccurs="0"
maxOccurs="unbounded"/>
-
- <!--
- Specify the different tagged version that you want to view within
- CVS. You need to specify at least one and this should be probably be
- HEAD
- -->
- <element name="revision" type="revision" minOccurs="1"
maxOccurs="unbounded"/>
-
- <!--
- Specify the url to a bug database for this module
- -->
- <!-- FIX ME: castor doesn't support the URL datatype... change this..
-->
- <element name="bug-database" type="string" minOccurs="0" maxOccurs="1"/>
-
- <!--
- A URL where this module can be downloaded. This should be a URL
- that can be browsed and not absolute to a specific version.
- -->
-
- <element name="download" type="string" minOccurs="0" maxOccurs="1"/>
-
- <!--
- Specify the available mailing lists for this module.
- -->
- <element name="mailing-list" type="mailing-list" minOccurs="0"
maxOccurs="unbounded"/>
- </sequence>
-
- </complexType>
-
-
- <complexType name="mailing-list">
- <sequence>
- <element name="mailto" type="string" minOccurs="1"
maxOccurs="1"/>
- <element name="name" type="string" minOccurs="1"
maxOccurs="1"/>
- <element name="description" type="string" minOccurs="0"
maxOccurs="1"/>
- </sequence>
- </complexType>
+ <element name ="repository">
+ <complexType >
+ <sequence>
+ <!-- required elements -->
+ <element name="name" type="string" minOccurs="1"
maxOccurs="1"/>
+ <element name="root" type="string" minOccurs="1"
maxOccurs="1"/>
+
+ <!-- FIX ME: castor doesn't support the URL datatype... change this..
-->
+ <element name="home" type="string" minOccurs="1"
maxOccurs="1"/>
+ <!-- Specify the modules that this repository contains -->
+ <element ref="module" type="module" minOccurs="1"
maxOccurs="unbounded"/>
+
+
+ <!-- optional elements -->
+ <element name="password" type="string" minOccurs="0" maxOccurs="1"/>
+ <element name="description" type="string" minOccurs="1" maxOccurs="0"/>
+ <!-- URL for the CVS web interface for this project -->
+ <!-- FIX ME: castor doesn't support the URL datatype... change this..
-->
+ <element name="cvsweb" type="string" minOccurs="0"
maxOccurs="1"/>
+ </sequence>
+
+ <!-- The type of repository this is. DEFAULT: CVS. If 'LOCAL' then
+ this is just a local set of files -->
+ <attribute name="type" type="string" minOccurs="0"
maxOccurs="1"/>
+
+ <!-- if this is true the user has the option to browse the source this was
generated from.
+ The default is true.
+ -->
+ <attribute name="opensource" type="boolean" default="true"
minOccurs="0" maxOccurs="1"/>
+ </complexType>
+ </element>
+
+ <element name ="revision">
+ <complexType>
+ <attribute name="tag" type="string" minOccurs="1" maxOccurs="1"/>
+ <attribute name="latest" type="boolean" minOccurs="1" maxOccurs="1"/>
+ </complexType>
+ </element>
+
+ <element name ="module">
+ <complexType>
+ <sequence>
+ <element name="name" type="string" minOccurs="1"
maxOccurs="1"/>
+
+ <!--
+ The URL for this module's homepage.
+ -->
+ <!-- FIX ME: castor doesn't support the URL datatype... change this..
-->
+ <element name="home" type="string" minOccurs="1"
maxOccurs="1"/>
+
+ <!--
+ A description of what this module does.
+ -->
+ <element name="description" type="string" minOccurs="1"
maxOccurs="1"/>
+
+
+ <!--
+ The license for this module. Begin lawyer speak here...
+ -->
+ <element name="license" type="string" minOccurs="1"
maxOccurs="1"/>
+
+ <!--
+ The CVS name of this module
+ -->
+ <element name="cvs-module-name" type="string" minOccurs="1"
maxOccurs="1"/>
+
+ <!--
+ the begining of java program files. Should be in the from of
"dir/dir"
+ -->
+ <element name="javasrc" type="string" minOccurs="0"
maxOccurs="unbounded"/>
+
+ <!--
+ Specify the different tagged version that you want to view within
+ CVS. You need to specify at least one and this should be probably be
+ HEAD
+ -->
+ <element ref="revision" type="revision" minOccurs="1"
maxOccurs="unbounded"/>
+
+ <!--
+ Specify the url to a bug database for this module
+ -->
+ <!-- FIX ME: castor doesn't support the URL datatype... change this..
-->
+ <element name="bug-database" type="string" minOccurs="0"
maxOccurs="1"/>
+
+ <!--
+ A URL where this module can be downloaded. This should be a URL
+ that can be browsed and not absolute to a specific version.
+ -->
+
+ <element name="download" type="string" minOccurs="0" maxOccurs="1"/>
+
+ <!--
+ Specify the available mailing lists for this module.
+ -->
+ <element name="mailing-list" type="mailing-list" minOccurs="0"
maxOccurs="unbounded"/>
+ </sequence>
+
+ </complexType>
+
+
+ <complexType name="mailing-list">
+ <sequence>
+ <element name="mailto" type="string" minOccurs="1"
maxOccurs="1"/>
+ <element name="name" type="string" minOccurs="1"
maxOccurs="1"/>
+ <element name="description" type="string" minOccurs="0"
maxOccurs="1"/>
+ </sequence>
+ </complexType>
1.3 +10 -8 jakarta-alexandria/src/xml/stats.xsd
Index: stats.xsd
===================================================================
RCS file: /home/cvs/jakarta-alexandria/src/xml/stats.xsd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- stats.xsd 2001/01/07 15:24:02 1.2
+++ stats.xsd 2001/03/24 17:09:35 1.3
@@ -4,16 +4,18 @@
<element name="stats">
<complexType>
<sequence>
- <element name="build" type="build" minOccurs='0'
maxOccurs='unbounded'/>
+ <element ref="build" type="build" minOccurs='0'
maxOccurs='unbounded'/>
</sequence>
</complexType>
</element>
- <complexType name="build" content="any">
- <attribute name="date" type="string" minOccurs="1"/>
- <attribute name="run" type="integer" minOccurs="0" maxOccurs="1" />
- <attribute name="errors" type="integer" minOccurs="0" maxOccurs="1"/>
- <attribute name="failures" type="integer" minOccurs="0" maxOccurs="1"/>
- <attribute name="time" type="string" minOccurs="0" maxOccurs="1"/>
- </complexType>
+ <element name="build">
+ <complexType content="any">
+ <attribute name="date" type="string" minOccurs="1"/>
+ <attribute name="run" type="integer" minOccurs="0" maxOccurs="1" />
+ <attribute name="errors" type="integer" minOccurs="0" maxOccurs="1"/>
+ <attribute name="failures" type="integer" minOccurs="0" maxOccurs="1"/>
+ <attribute name="time" type="string" minOccurs="0" maxOccurs="1"/>
+ </complexType>
+ </element>
</schema>
1.4 +99 -93 jakarta-alexandria/src/xml/workspace.xsd
Index: workspace.xsd
===================================================================
RCS file: /home/cvs/jakarta-alexandria/src/xml/workspace.xsd,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- workspace.xsd 2001/03/02 13:48:34 1.3
+++ workspace.xsd 2001/03/24 17:09:35 1.4
@@ -4,38 +4,40 @@
<element name="workspace">
<complexType>
<sequence>
- <element name="repository" type="repository" minOccurs="1"
maxOccurs="unbounded"/>
- <element name="project" type="project" minOccurs="1"
maxOccurs="unbounded"/>
+ <element ref="repository" type="repository" minOccurs="1"
maxOccurs="unbounded"/>
+ <element ref="project" type="project" minOccurs="1"
maxOccurs="unbounded"/>
</sequence>
</complexType>
</element>
- <complexType name ="repository">
- <sequence>
- <!-- required elements -->
- <element name="title" type="string" minOccurs="1"
maxOccurs="1"/>
- <element name="root" type="string" minOccurs="1"
maxOccurs="1"/>
-
- <!-- FIX ME: castor doesn't support the URL datatype... change this..
-->
- <element name="home-page" type="string" minOccurs="0"
maxOccurs="1"/>
-
-
- <!-- optional elements -->
- <element name="password" type="string" minOccurs="0" maxOccurs="1"/>
- <element name="description" type="string" minOccurs="1" maxOccurs="0"/>
- <!-- URL for the CVS web interface for this project -->
- <!-- FIX ME: castor doesn't support the URL datatype... change this..
-->
- <element name="cvsweb" type="string" minOccurs="0"
maxOccurs="1"/>
- </sequence>
-
- <!-- The type of repository this is. DEFAULT: CVS. If 'LOCAL' then
- this is just a local set of files -->
- <attribute name="type" type="string" minOccurs="0"
maxOccurs="1"/>
-
- <!-- if this is true the user has the option to browse the source this was
generated from.
- The default is true.
- -->
- </complexType>
+ <element name="repository">
+ <complexType>
+ <sequence>
+ <!-- required elements -->
+ <element name="title" type="string" minOccurs="1"
maxOccurs="1"/>
+ <element name="root" type="string" minOccurs="1"
maxOccurs="1"/>
+
+ <!-- FIX ME: castor doesn't support the URL datatype... change this..
-->
+ <element name="home-page" type="string" minOccurs="0"
maxOccurs="1"/>
+
+
+ <!-- optional elements -->
+ <element name="password" type="string" minOccurs="0" maxOccurs="1"/>
+ <element name="description" type="string" minOccurs="1" maxOccurs="0"/>
+ <!-- URL for the CVS web interface for this project -->
+ <!-- FIX ME: castor doesn't support the URL datatype... change this..
-->
+ <element name="cvsweb" type="string" minOccurs="0"
maxOccurs="1"/>
+ </sequence>
+
+ <!-- The type of repository this is. DEFAULT: CVS. If 'LOCAL' then
+ this is just a local set of files -->
+ <attribute name="type" type="string" minOccurs="0"
maxOccurs="1"/>
+
+ <!-- if this is true the user has the option to browse the source this was
generated from.
+ The default is true.
+ -->
+ </complexType>
+ </element>
<!--
<complexType name="revision">
@@ -45,75 +47,79 @@
-->
- <complexType name="project">
- <sequence>
- <element name="title" type="string" minOccurs="1"
maxOccurs="1"/>
-
- <!--
- The URL for this module's homepage.
- -->
- <!-- FIX ME: castor doesn't support the URL datatype... change this..
-->
- <element name="home-page" type="string" minOccurs="0"
maxOccurs="1"/>
-
- <!--
- A description of what this module does.
- -->
- <element name="description" type="string" minOccurs="1"
maxOccurs="1"/>
-
-
- <!--
- The license for this module. Begin lawyer speak here...
- -->
- <element name="license" type="string" minOccurs="1"
maxOccurs="1"/>
-
- <!--
- The CVS name of this module
- -->
- <element name="module" type="string" minOccurs="1" maxOccurs="1"/>
-
- <!--
- the begining of java program files. Should be in the from of "dir/dir"
- -->
- <element name="javasrc" type="string" minOccurs="0"
maxOccurs="unbounded"/>
-
- <!--
- Specify the different tagged version that you want to view within
- CVS. You need to specify at least one and this should be probably be
- HEAD
- -->
- <!--<element name="revision" type="revision" minOccurs="1"
maxOccurs="unbounded"/>-->
-
- <!--
- Specify the url to a bug database for this module
- -->
- <!-- FIX ME: castor doesn't support the URL datatype... change this..
-->
- <element name="bug-database" type="string" minOccurs="0" maxOccurs="1"/>
-
- <!--
- A URL where this module can be downloaded. This should be a URL
- that can be browsed and not absolute to a specific version.
- -->
+ <element name="project">
+ <complexType name="project">
+ <sequence>
+ <element name="title" type="string" minOccurs="1"
maxOccurs="1"/>
+
+ <!--
+ The URL for this module's homepage.
+ -->
+ <!-- FIX ME: castor doesn't support the URL datatype... change
this.. -->
+ <element name="home-page" type="string" minOccurs="0"
maxOccurs="1"/>
+
+ <!--
+ A description of what this module does.
+ -->
+ <element name="description" type="string" minOccurs="1"
maxOccurs="1"/>
+
- <element name="download" type="string" minOccurs="0" maxOccurs="1"/>
-
- <!--
- Specify the available mailing lists for this module.
- -->
- <element name="mailing-list" type="mailing-list" minOccurs="0"
maxOccurs="unbounded"/>
- </sequence>
- <attribute name="opensource" type="boolean" default="true"
minOccurs="0" maxOccurs="1"/>
- <attribute name="tag" type="string" minOccurs="1" maxOccurs="1"/>
+ <!--
+ The license for this module. Begin lawyer speak here...
+ -->
+ <element name="license" type="string" minOccurs="1"
maxOccurs="1"/>
+
+ <!--
+ The CVS name of this module
+ -->
+ <element name="module" type="string" minOccurs="1"
maxOccurs="1"/>
+
+ <!--
+ the begining of java program files. Should be in the from of
"dir/dir"
+ -->
+ <element name="javasrc" type="string" minOccurs="0"
maxOccurs="unbounded"/>
+
+ <!--
+ Specify the different tagged version that you want to view within
+ CVS. You need to specify at least one and this should be probably
be
+ HEAD
+ -->
+ <!--<element name="revision" type="revision" minOccurs="1"
maxOccurs="unbounded"/>-->
+
+ <!--
+ Specify the url to a bug database for this module
+ -->
+ <!-- FIX ME: castor doesn't support the URL datatype... change
this.. -->
+ <element name="bug-database" type="string" minOccurs="0"
maxOccurs="1"/>
+
+ <!--
+ A URL where this module can be downloaded. This should be a URL
+ that can be browsed and not absolute to a specific version.
+ -->
+
+ <element name="download" type="string" minOccurs="0" maxOccurs="1"/>
+
+ <!--
+ Specify the available mailing lists for this module.
+ -->
+ <element ref="mailing-list" type="mailing-list" minOccurs="0"
maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="opensource" type="boolean" default="true"
minOccurs="0" maxOccurs="1"/>
+ <attribute name="tag" type="string" minOccurs="1" maxOccurs="1"/>
- </complexType>
+ </complexType>
+ </element>
- <complexType name="mailing-list">
- <sequence>
- <element name="mailto" type="string" minOccurs="1"
maxOccurs="1"/>
- <element name="name" type="string" minOccurs="1"
maxOccurs="1"/>
- <element name="description" type="string" minOccurs="0"
maxOccurs="1"/>
- </sequence>
- </complexType>
+ <element name="mailing-list">
+ <complexType>
+ <sequence>
+ <element name="mailto" type="string" minOccurs="1"
maxOccurs="1"/>
+ <element name="name" type="string" minOccurs="1"
maxOccurs="1"/>
+ <element name="description" type="string" minOccurs="0"
maxOccurs="1"/>
+ </sequence>
+ </complexType>
+ </element>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
