You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by an...@locus.apache.org on 2000/02/16 23:00:42 UTC
cvs commit: xml-xerces/java/data personal-schema.xml personal.dtd personal.xml personal.xsd
andyc 00/02/16 14:00:42
Modified: java/data personal-schema.xml personal.dtd personal.xml
personal.xsd
Log:
Sync'd the DTD and Schema grammars.
Revision Changes Path
1.3 +37 -19 xml-xerces/java/data/personal-schema.xml
Index: personal-schema.xml
===================================================================
RCS file: /home/cvs/xml-xerces/java/data/personal-schema.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- personal-schema.xml 1999/11/15 23:59:14 1.2
+++ personal-schema.xml 2000/02/16 22:00:41 1.3
@@ -1,22 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
-<personnel xmlns="personal.xsd">
- <person id="H.MARUYAMA" salary="10">
- <name><family>MARUYAMA</family> <given>Hiroshi</given></name>
- <email>8</email>
- <link subordinates=" N.URAMOTO K.TAMURA "/>
- </person>
- <person id="N.URAMOTO">
- <name><family>URAMOTO</family> <given>Naohiko</given></name>
- <email>uramoto@jp.ibm.com</email>
- <link manager=" H.MARUYAMA"/>
- </person>
- <person id="K.TAMURA">
- <name>
- <family>TAMURA</family> <given>Kent</given>
- </name>
- <!-- This URL is mail address.-->
- <url href="mailto:kent@trl.ibm.co.jp"/>
- <url href="mailto:tkent@jp.ibm.com"/>
- <link manager="H.MARUYAMA"/>
+<personnel xmlns='personal.xsd'>
+
+ <person id="Big.Boss" >
+ <name><family>Boss</family> <given>Big</given></name>
+ <email>chief@foo.com</email>
+ <link subordinates="one.worker two.worker three.worker four.worker five.worker"/>
</person>
+
+ <person id="one.worker">
+ <name><family>Worker</family> <given>One</given></name>
+ <email>one@foo.com</email>
+ <link manager="Big.Boss"/>
+ </person>
+
+ <person id="two.worker">
+ <name><family>Worker</family> <given>Two</given></name>
+ <email>two@foo.com</email>
+ <link manager="Big.Boss"/>
+ </person>
+
+ <person id="three.worker">
+ <name><family>Worker</family> <given>Three</given></name>
+ <email>three@foo.com</email>
+ <link manager="Big.Boss"/>
+ </person>
+
+ <person id="four.worker">
+ <name><family>Worker</family> <given>Four</given></name>
+ <email>four@foo.com</email>
+ <link manager="Big.Boss"/>
+ </person>
+
+ <person id="five.worker">
+ <name><family>Worker</family> <given>Five</given></name>
+ <email>five@foo.com</email>
+ <link manager="Big.Boss"/>
+ </person>
+
</personnel>
1.3 +16 -8 xml-xerces/java/data/personal.dtd
Index: personal.dtd
===================================================================
RCS file: /home/cvs/xml-xerces/java/data/personal.dtd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- personal.dtd 1999/11/15 23:59:20 1.2
+++ personal.dtd 2000/02/16 22:00:41 1.3
@@ -1,17 +1,25 @@
<?xml encoding="UTF-8"?>
-
-<!-- Revision: 60 1.2 data/personal.dtd, docs, xml4j2, xml4j2_0_13 -->
-
<!ELEMENT personnel (person)+>
+
<!ELEMENT person (name,email*,url*,link?)>
<!ATTLIST person id ID #REQUIRED>
+<!ATTLIST person note CDATA #IMPLIED>
+<!ATTLIST person contr (true|false) 'false'>
+<!ATTLIST person salary CDATA #IMPLIED>
+
+<!ELEMENT name ((family,given)|(given,family))>
+
<!ELEMENT family (#PCDATA)>
+
<!ELEMENT given (#PCDATA)>
-<!ELEMENT name (#PCDATA|family|given)*>
+
<!ELEMENT email (#PCDATA)>
+
<!ELEMENT url EMPTY>
-<!ATTLIST url href CDATA #REQUIRED>
+<!ATTLIST url href CDATA 'http://'>
+
<!ELEMENT link EMPTY>
-<!ATTLIST link
- manager IDREF #IMPLIED
- subordinates IDREFS #IMPLIED>
+<!ATTLIST link manager IDREF #IMPLIED>
+<!ATTLIST link subordinates IDREFS #IMPLIED>
+
+<!NOTATION gif PUBLIC '-//APP/Photoshop/4.0' 'photoshop.exe'>
1.3 +1 -4 xml-xerces/java/data/personal.xml
Index: personal.xml
===================================================================
RCS file: /home/cvs/xml-xerces/java/data/personal.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- personal.xml 1999/11/15 23:59:23 1.2
+++ personal.xml 2000/02/16 22:00:41 1.3
@@ -1,11 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE personnel SYSTEM "personal.dtd">
-
-<!-- Revision: 61 1.3 data/personal.xml, docs, xml4j2, xml4j2_0_0 -->
-
<personnel>
- <person id="Big.Boss" >
+ <person id="Big.Boss">
<name><family>Boss</family> <given>Big</given></name>
<email>chief@foo.com</email>
<link subordinates="one.worker two.worker three.worker four.worker five.worker"/>
1.4 +26 -35 xml-xerces/java/data/personal.xsd
Index: personal.xsd
===================================================================
RCS file: /home/cvs/xml-xerces/java/data/personal.xsd,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- personal.xsd 2000/01/29 00:26:58 1.3
+++ personal.xsd 2000/02/16 22:00:41 1.4
@@ -10,25 +10,40 @@
</type>
</element>
- <element name="family">
- <type content="mixed"/>
- </element>
+ <element name="person">
+ <type>
+ <element ref="name"/>
+ <element ref="email" minOccurs='0' maxOccurs='*'/>
+ <element ref="url" minOccurs='0' maxOccurs='*'/>
+ <element ref="link" minOccurs='0' maxOccurs='1'/>
- <element name="given">
- <type content="mixed"/>
+ <attribute name="id" type="ID" minOccurs='1'/>
+ <attribute name="note" type="string"/>
+ <attribute name="contr" type="NMTOKEN" default="false">
+ <datatype source="string">
+ <enumeration value="true"/>
+ <enumeration value="false"/>
+ </datatype>
+ </attribute>
+ <attribute name="salary" type="integer"/>
+ </type>
</element>
<element name="name">
- <type>
- <element ref="family"/>
- <element ref="given" minOccurs='0' maxOccurs='1'/>
+ <type content='elementOnly'>
+ <group order='all'>
+ <element ref="family"/>
+ <element ref="given"/>
+ </group>
</type>
</element>
- <element name="email" type="integer">
- <!-- <mixed/> -->
- </element>
+ <element name="family" type='string'/>
+
+ <element name="given" type='string'/>
+ <element name="email" type='string'/>
+
<element name="url">
<type content="empty">
<attribute name="href" type="string" default="http://"/>
@@ -42,30 +57,6 @@
</type>
</element>
- <element name="person">
- <type>
- <element ref="name"/>
- <element ref="email" minOccurs='0' maxOccurs='*'/>
- <element ref="url" minOccurs='0' maxOccurs='*'/>
- <element ref="link" minOccurs='0' maxOccurs='1'/>
-
- <attribute name="id" type="ID"/>
- <attribute name="note" type="string"/>
- <attribute name="contr" type="NMTOKEN" default="false">
- <datatype source="string">
- <enumeration value="true"/>
- <enumeration value="false"/>
- </datatype>
- </attribute>
- <attribute name="salary" type="integer"/>
- </type>
- </element>
-
<notation name='gif' public='-//APP/Photoshop/4.0' system='photoshop.exe'/>
-<!--
- <textEntity name='internal-entity'>entity-value</textEntity>
- <externalEntity name='external-entity' public='-//ENTITY' system='external-entity.ent'/>
- <unparsedEntity name='unparsed-entity' system='unparsed-entity.ent' notation='gif'/>
--->
</schema>