xmlbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ce...@apache.org
Subject svn commit: r111285 - in xmlbeans: branches/xmlbeans_v1_branch branches/xmlbeans_v1_branch/v1 branches/xmlbeans_v1_branch/v1/src/common/org/apache/xmlbeans/impl/common branches/xmlbeans_v1_branch/v1/src/license branches/xmlbeans_v1_branch/v1/src/typeimpl/org/apache/xmlbeans/impl/regex branches/xmlbeans_v1_branch/v1/src/typeimpl/org/apache/xmlbeans/impl/util branches/xmlbeans_v1_branch/v1/src/xmlpublic/org/apache/xmlbeans branches/xmlbeans_v1_branch/v1/src/xmlschema/schema branches/xmlbeans_v1_branch/v1/src/xmlstore/org/apache/xmlbeans/impl/store branches/xmlbeans_v1_branch/v1/src/xsdschema/schema branches/xmlbeans_v1_branch/v1/test/cases/schema/XmlSignature branches/xmlbeans_v1_branch/v1/test/cases/schema/wli branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected trunk trunk/bin trunk/docs trunk/external trunk/jam trunk/src trunk/src/common/org/apache/xmlbeans/impl/common trunk/src/license trunk/src/newstore2/org/w3c/dom trunk/src/typeimpl/org/apache/xmlbeans/impl/regex trunk/src/typeimpl/org/apache/xmlbeans/impl/schema trunk/src/typeimpl/org/apache/xmlbeans/impl/util trunk/src/xmlpublic/org/apache/xmlbeans trunk/test trunk/test/cases/xbean/ValidatingStream trunk/test/cases/xbean/compile/scomp/j2ee trunk/test/cases/xbean/compile/scomp/pricequote trunk/test/cases/xbean/compile/scomp/simple trunk/test/cases/xbean/dom/W3C/level2/core/files trunk/test/cases/xbean/extensions/interfaceFeature/averageCase trunk/test/cases/xbean/extensions/interfaceFeature/methodNameCollision trunk/test/cases/xbean/extensions/interfaceFeature/multInterfaces trunk/test/cases/xbean/extensions/interfaceFeature/readOnlyBean trunk/test/cases/xbean/extensions/prePostFeature/ValueRestriction trunk/test/cases/xbean/extensions/prePostFeature/readOnlyBean trunk/test/cases/xbean/misc trunk/test/cases/xbean/schema/typesonly trunk/test/cases/xbean/simple/dumb trunk/test/cases/xbean/simple/dumb/sub trunk/test/cases/xbean/simple/dupSchemaElements trunk/test/cases/xbean/xmlcursor trunk/test/cases/xbean/xmlcursor/xpath trunk/test/cases/xbean/xmlcursor/xpath/jaxen trunk/test/cases/xbean/xmlcursor/xstypes trunk/test/cases/xbean/xmlobject trunk/test/cases/xbean/xmlobject/japanese trunk/test/cases/xbean/xmlobject/store trunk/test/cases/xbean/xmltokensource trunk/test/lib trunk/test/tools/src/tools/JUnit trunk/test/tools/src/tools/ant trunk/test/tools/src/tools/io trunk/test/tools/src/tools/util trunk/test/tools/src/tools/xml trunk/v1 trunk/xkit
Date Wed, 08 Dec 2004 16:54:30 GMT
Author: cezar
Date: Wed Dec  8 08:54:26 2004
New Revision: 111285

URL: http://svn.apache.org/viewcvs?view=rev&rev=111285
Log:
Trunk reorganization 2.
Added:
   xmlbeans/branches/xmlbeans_v1_branch/
   xmlbeans/branches/xmlbeans_v1_branch/v1/
      - copied from r111277, xmlbeans/trunk/v1/
   xmlbeans/trunk/.cvsignore
      - copied unchanged from r111277, xmlbeans/trunk/v2/.cvsignore
   xmlbeans/trunk/README.txt
      - copied unchanged from r111277, xmlbeans/trunk/v2/README.txt
   xmlbeans/trunk/bin/
      - copied from r111277, xmlbeans/trunk/v2/bin/
   xmlbeans/trunk/build.xml
      - copied unchanged from r111277, xmlbeans/trunk/v2/build.xml
   xmlbeans/trunk/docs/
      - copied from r111277, xmlbeans/trunk/v2/docs/
   xmlbeans/trunk/external/
      - copied from r111277, xmlbeans/trunk/v2/external/
   xmlbeans/trunk/jam/
      - copied from r111277, xmlbeans/trunk/v2/jam/
   xmlbeans/trunk/src/
      - copied from r111277, xmlbeans/trunk/v2/src/
   xmlbeans/trunk/test/
      - copied from r111277, xmlbeans/trunk/v2/test/
   xmlbeans/trunk/testbuild.xml
      - copied unchanged from r111277, xmlbeans/trunk/v2/testbuild.xml
   xmlbeans/trunk/xbeanenv.cmd
      - copied unchanged from r111277, xmlbeans/trunk/v2/xbeanenv.cmd
   xmlbeans/trunk/xbeanenv.sh
      - copied unchanged from r111277, xmlbeans/trunk/v2/xbeanenv.sh
   xmlbeans/trunk/xkit/
      - copied from r111277, xmlbeans/trunk/v2/xkit/
Removed:
   xmlbeans/trunk/v1/
Modified:
   xmlbeans/branches/xmlbeans_v1_branch/v1/src/common/org/apache/xmlbeans/impl/common/XMLChar.java
   xmlbeans/branches/xmlbeans_v1_branch/v1/src/license/LICENSE.txt
   xmlbeans/branches/xmlbeans_v1_branch/v1/src/typeimpl/org/apache/xmlbeans/impl/regex/RegularExpression.java
   xmlbeans/branches/xmlbeans_v1_branch/v1/src/typeimpl/org/apache/xmlbeans/impl/util/Base64.java
   xmlbeans/branches/xmlbeans_v1_branch/v1/src/typeimpl/org/apache/xmlbeans/impl/util/HexBin.java
   xmlbeans/branches/xmlbeans_v1_branch/v1/src/xmlpublic/org/apache/xmlbeans/DelegateXmlObject.java
   xmlbeans/branches/xmlbeans_v1_branch/v1/src/xmlschema/schema/w3c-xml-license.html
   xmlbeans/branches/xmlbeans_v1_branch/v1/src/xmlstore/org/apache/xmlbeans/impl/store/CursorData.java
   xmlbeans/branches/xmlbeans_v1_branch/v1/src/xsdschema/schema/w3c-schema-license.html
   xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/schema/XmlSignature/xmldsig-core-schema.xsd
   xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/schema/wli/003_process_po_007.xsd
   xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/schema/wli/004_acknowledge_po_008.xsd
   xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/schema/wli/oagis_fields.xsd
   xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/schema/wli/oagis_segments.xsd
   xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_0_0.xml
   xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_10_1.xml
   xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_10_3.xml
   xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_11_0.xml
   xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_12_0.xml
   xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_13_0.xml
   xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_13_1.xml
   xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_14_0.xml
   xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_14_1.xml
   xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_14_2.xml
   xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_15_2.xml
   xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_18_1.xml
   xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_18_6.xml
   xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_19_0.xml
   xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_1_2.xml
   xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_1_4.xml
   xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_1_9.xml
   xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_20_0.xml
   xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_21_0.xml
   xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_21_2.xml
   xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_22_1.xml
   xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_23_0.xml
   xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_3_0.xml
   xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_4_0.xml
   xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_4_1.xml
   xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_4_2.xml
   xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_6_2.xml
   xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_6_4.xml
   xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_8_0.xml
   xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_8_1.xml
   xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_9_0.xml
   xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_9_1.xml
   xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_9_2.xml
   xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_9_4.xml
   xmlbeans/trunk/src/common/org/apache/xmlbeans/impl/common/XMLChar.java
   xmlbeans/trunk/src/common/org/apache/xmlbeans/impl/common/XmlLocale.java
   xmlbeans/trunk/src/license/LICENSE.txt
   xmlbeans/trunk/src/newstore2/org/w3c/dom/DOMConfiguration.java
   xmlbeans/trunk/src/newstore2/org/w3c/dom/DOMStringList.java
   xmlbeans/trunk/src/newstore2/org/w3c/dom/TypeInfo.java
   xmlbeans/trunk/src/newstore2/org/w3c/dom/UserDataHandler.java
   xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/regex/RegularExpression.java
   xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaDependencies.java
   xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/util/Base64.java
   xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/util/HexBin.java
   xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/DelegateXmlObject.java
   xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/SchemaCodePrinter.java
   xmlbeans/trunk/test/cases/xbean/ValidatingStream/CarLocationMessage-inv.xml
   xmlbeans/trunk/test/cases/xbean/ValidatingStream/CarLocationMessage.xml
   xmlbeans/trunk/test/cases/xbean/ValidatingStream/Employees.xml
   xmlbeans/trunk/test/cases/xbean/ValidatingStream/global-attr.xml
   xmlbeans/trunk/test/cases/xbean/ValidatingStream/location-inv.xml
   xmlbeans/trunk/test/cases/xbean/ValidatingStream/location.xml
   xmlbeans/trunk/test/cases/xbean/ValidatingStream/location.xsd
   xmlbeans/trunk/test/cases/xbean/ValidatingStream/mixed-content-inv.xml
   xmlbeans/trunk/test/cases/xbean/ValidatingStream/mixed-content.xml
   xmlbeans/trunk/test/cases/xbean/ValidatingStream/mixed-content.xsd
   xmlbeans/trunk/test/cases/xbean/ValidatingStream/nomixed-content-inv.xml
   xmlbeans/trunk/test/cases/xbean/ValidatingStream/numerals.xsd
   xmlbeans/trunk/test/cases/xbean/ValidatingStream/person-frag.xml
   xmlbeans/trunk/test/cases/xbean/ValidatingStream/person-frag2.xml
   xmlbeans/trunk/test/cases/xbean/ValidatingStream/person-inv.xml
   xmlbeans/trunk/test/cases/xbean/ValidatingStream/person-justname-inv.xml
   xmlbeans/trunk/test/cases/xbean/ValidatingStream/person-justname.xml
   xmlbeans/trunk/test/cases/xbean/ValidatingStream/person-sibling-inv.xml
   xmlbeans/trunk/test/cases/xbean/ValidatingStream/person-sibling.xml
   xmlbeans/trunk/test/cases/xbean/ValidatingStream/person-xsi-inv.xml
   xmlbeans/trunk/test/cases/xbean/ValidatingStream/person.xml
   xmlbeans/trunk/test/cases/xbean/ValidatingStream/person.xsd
   xmlbeans/trunk/test/cases/xbean/ValidatingStream/po.xml
   xmlbeans/trunk/test/cases/xbean/ValidatingStream/simpleTypes.xsd
   xmlbeans/trunk/test/cases/xbean/compile/scomp/j2ee/XML.xsd
   xmlbeans/trunk/test/cases/xbean/compile/scomp/j2ee/application-client_1_4.xsd
   xmlbeans/trunk/test/cases/xbean/compile/scomp/j2ee/application_1_4.xsd
   xmlbeans/trunk/test/cases/xbean/compile/scomp/j2ee/connector_1_5.xsd
   xmlbeans/trunk/test/cases/xbean/compile/scomp/j2ee/ejb-jar_2_1.xsd
   xmlbeans/trunk/test/cases/xbean/compile/scomp/j2ee/j2ee_1_4.xsd
   xmlbeans/trunk/test/cases/xbean/compile/scomp/j2ee/jsp_2_0.xsd
   xmlbeans/trunk/test/cases/xbean/compile/scomp/j2ee/web-app_2_4.xsd
   xmlbeans/trunk/test/cases/xbean/compile/scomp/pricequote/PriceQuote.xsd
   xmlbeans/trunk/test/cases/xbean/compile/scomp/simple/person.xml
   xmlbeans/trunk/test/cases/xbean/compile/scomp/simple/person.xsd
   xmlbeans/trunk/test/cases/xbean/compile/scomp/simple/simplec.xsd
   xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/hc_staff.xml
   xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/nodtdstaff.xml
   xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/staff.dtd
   xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/staff.xml
   xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/staff2.dtd
   xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/staff2.xml
   xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/staffNS.dtd
   xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/staffNS.xml
   xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/xhtml1-frameset.dtd
   xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/xhtml1-strict.dtd
   xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/xhtml1-transitional.dtd
   xmlbeans/trunk/test/cases/xbean/extensions/interfaceFeature/averageCase/po.xsd
   xmlbeans/trunk/test/cases/xbean/extensions/interfaceFeature/averageCase/po.xsdconfig
   xmlbeans/trunk/test/cases/xbean/extensions/interfaceFeature/methodNameCollision/company.xsd
   xmlbeans/trunk/test/cases/xbean/extensions/interfaceFeature/methodNameCollision/company.xsdconfig
   xmlbeans/trunk/test/cases/xbean/extensions/interfaceFeature/multInterfaces/po.xsd
   xmlbeans/trunk/test/cases/xbean/extensions/interfaceFeature/multInterfaces/po.xsdconfig
   xmlbeans/trunk/test/cases/xbean/extensions/interfaceFeature/readOnlyBean/po.xsd
   xmlbeans/trunk/test/cases/xbean/extensions/interfaceFeature/readOnlyBean/po.xsdconfig
   xmlbeans/trunk/test/cases/xbean/extensions/prePostFeature/ValueRestriction/company.xsd
   xmlbeans/trunk/test/cases/xbean/extensions/prePostFeature/ValueRestriction/company.xsdconfig
   xmlbeans/trunk/test/cases/xbean/extensions/prePostFeature/readOnlyBean/po.xsd
   xmlbeans/trunk/test/cases/xbean/extensions/prePostFeature/readOnlyBean/po.xsdconfig
   xmlbeans/trunk/test/cases/xbean/misc/dyntest.xml
   xmlbeans/trunk/test/cases/xbean/misc/dyntest.xsd
   xmlbeans/trunk/test/cases/xbean/misc/dyntest2.xml
   xmlbeans/trunk/test/cases/xbean/misc/dyntest2.xsd
   xmlbeans/trunk/test/cases/xbean/misc/signature-example-dsa.xml
   xmlbeans/trunk/test/cases/xbean/misc/signature-example-rsa.xml
   xmlbeans/trunk/test/cases/xbean/misc/signature-example.xml
   xmlbeans/trunk/test/cases/xbean/misc/xkms-1.0.wsdl
   xmlbeans/trunk/test/cases/xbean/misc/xmldsig-core-schema.xsd
   xmlbeans/trunk/test/cases/xbean/schema/typesonly/typesonly.xsd
   xmlbeans/trunk/test/cases/xbean/simple/dumb/dumb.xml
   xmlbeans/trunk/test/cases/xbean/simple/dumb/dumb.xsd
   xmlbeans/trunk/test/cases/xbean/simple/dumb/sub/bar.xsd
   xmlbeans/trunk/test/cases/xbean/simple/dupSchemaElements/DupElementsInSameSchema.xsd
   xmlbeans/trunk/test/cases/xbean/simple/dupSchemaElements/custOrdUdf.xsd
   xmlbeans/trunk/test/cases/xbean/simple/dupSchemaElements/viewtarget.xsd
   xmlbeans/trunk/test/cases/xbean/xmlcursor/CarLocationMessage.xml
   xmlbeans/trunk/test/cases/xbean/xmlcursor/Employees.xml
   xmlbeans/trunk/test/cases/xbean/xmlcursor/TranXML_License.txt
   xmlbeans/trunk/test/cases/xbean/xmlcursor/W3C_Software_Licence.txt
   xmlbeans/trunk/test/cases/xbean/xmlcursor/doc.xml
   xmlbeans/trunk/test/cases/xbean/xmlcursor/location.xsd
   xmlbeans/trunk/test/cases/xbean/xmlcursor/person.xsd
   xmlbeans/trunk/test/cases/xbean/xmlcursor/po.xsd
   xmlbeans/trunk/test/cases/xbean/xmlcursor/xpath/LICENSE.txt
   xmlbeans/trunk/test/cases/xbean/xmlcursor/xpath/cdcatalog.xml
   xmlbeans/trunk/test/cases/xbean/xmlcursor/xpath/jaxen/axis.xml
   xmlbeans/trunk/test/cases/xbean/xmlcursor/xpath/jaxen/basic.xml
   xmlbeans/trunk/test/cases/xbean/xmlcursor/xpath/jaxen/basicupdate.xml
   xmlbeans/trunk/test/cases/xbean/xmlcursor/xpath/jaxen/contents.xml
   xmlbeans/trunk/test/cases/xbean/xmlcursor/xpath/jaxen/defaultNamespace.xml
   xmlbeans/trunk/test/cases/xbean/xmlcursor/xpath/jaxen/evaluate.xml
   xmlbeans/trunk/test/cases/xbean/xmlcursor/xpath/jaxen/fibo.xml
   xmlbeans/trunk/test/cases/xbean/xmlcursor/xpath/jaxen/id.xml
   xmlbeans/trunk/test/cases/xbean/xmlcursor/xpath/jaxen/lang.xml
   xmlbeans/trunk/test/cases/xbean/xmlcursor/xpath/jaxen/message.xml
   xmlbeans/trunk/test/cases/xbean/xmlcursor/xpath/jaxen/moreover.xml
   xmlbeans/trunk/test/cases/xbean/xmlcursor/xpath/jaxen/much_ado.xml
   xmlbeans/trunk/test/cases/xbean/xmlcursor/xpath/jaxen/namespaces.xml
   xmlbeans/trunk/test/cases/xbean/xmlcursor/xpath/jaxen/nitf.xml
   xmlbeans/trunk/test/cases/xbean/xmlcursor/xpath/jaxen/numbers.xml
   xmlbeans/trunk/test/cases/xbean/xmlcursor/xpath/jaxen/pi.xml
   xmlbeans/trunk/test/cases/xbean/xmlcursor/xpath/jaxen/pi2.xml
   xmlbeans/trunk/test/cases/xbean/xmlcursor/xpath/jaxen/simple.xml
   xmlbeans/trunk/test/cases/xbean/xmlcursor/xpath/jaxen/testNamespaces.xml
   xmlbeans/trunk/test/cases/xbean/xmlcursor/xpath/jaxen/text.xml
   xmlbeans/trunk/test/cases/xbean/xmlcursor/xpath/jaxen/underscore.xml
   xmlbeans/trunk/test/cases/xbean/xmlcursor/xpath/jaxen/web.xml
   xmlbeans/trunk/test/cases/xbean/xmlcursor/xpath/zvon1.xml
   xmlbeans/trunk/test/cases/xbean/xmlcursor/xpath/zvon10.xml
   xmlbeans/trunk/test/cases/xbean/xmlcursor/xpath/zvon11.xml
   xmlbeans/trunk/test/cases/xbean/xmlcursor/xpath/zvon12.xml
   xmlbeans/trunk/test/cases/xbean/xmlcursor/xpath/zvon13.xml
   xmlbeans/trunk/test/cases/xbean/xmlcursor/xpath/zvon14.xml
   xmlbeans/trunk/test/cases/xbean/xmlcursor/xpath/zvon15.xml
   xmlbeans/trunk/test/cases/xbean/xmlcursor/xpath/zvon16.xml
   xmlbeans/trunk/test/cases/xbean/xmlcursor/xpath/zvon17.xml
   xmlbeans/trunk/test/cases/xbean/xmlcursor/xpath/zvon18.xml
   xmlbeans/trunk/test/cases/xbean/xmlcursor/xpath/zvon19.xml
   xmlbeans/trunk/test/cases/xbean/xmlcursor/xpath/zvon2.xml
   xmlbeans/trunk/test/cases/xbean/xmlcursor/xpath/zvon20.xml
   xmlbeans/trunk/test/cases/xbean/xmlcursor/xpath/zvon21.xml
   xmlbeans/trunk/test/cases/xbean/xmlcursor/xpath/zvon22.xml
   xmlbeans/trunk/test/cases/xbean/xmlcursor/xpath/zvon3.xml
   xmlbeans/trunk/test/cases/xbean/xmlcursor/xpath/zvon4.xml
   xmlbeans/trunk/test/cases/xbean/xmlcursor/xpath/zvon5.xml
   xmlbeans/trunk/test/cases/xbean/xmlcursor/xpath/zvon6.xml
   xmlbeans/trunk/test/cases/xbean/xmlcursor/xpath/zvon7.xml
   xmlbeans/trunk/test/cases/xbean/xmlcursor/xpath/zvon8.xml
   xmlbeans/trunk/test/cases/xbean/xmlcursor/xpath/zvon9.xml
   xmlbeans/trunk/test/cases/xbean/xmlcursor/xstypes/default.xsd
   xmlbeans/trunk/test/cases/xbean/xmlcursor/xstypes/person.xsd
   xmlbeans/trunk/test/cases/xbean/xmlcursor/xstypes/setters.xsd
   xmlbeans/trunk/test/cases/xbean/xmlcursor/xstypes/simplec.xsd
   xmlbeans/trunk/test/cases/xbean/xmlcursor/xstypes/xstypes.xml
   xmlbeans/trunk/test/cases/xbean/xmlobject/SelectAttribute.xsd
   xmlbeans/trunk/test/cases/xbean/xmlobject/SelectChildren-AnyTypeDoc.xml
   xmlbeans/trunk/test/cases/xbean/xmlobject/SelectChildren-NormalDoc.xml
   xmlbeans/trunk/test/cases/xbean/xmlobject/SelectChildren.xsd
   xmlbeans/trunk/test/cases/xbean/xmlobject/SimpleXmlObject.java.txt
   xmlbeans/trunk/test/cases/xbean/xmlobject/Test.xsd
   xmlbeans/trunk/test/cases/xbean/xmlobject/Test36510.xsd
   xmlbeans/trunk/test/cases/xbean/xmlobject/Test40907.xsd
   xmlbeans/trunk/test/cases/xbean/xmlobject/defaults.xsd
   xmlbeans/trunk/test/cases/xbean/xmlobject/easypo.xsd
   xmlbeans/trunk/test/cases/xbean/xmlobject/easypo.xsdconfig
   xmlbeans/trunk/test/cases/xbean/xmlobject/easypo1.xml
   xmlbeans/trunk/test/cases/xbean/xmlobject/enumtest.xml
   xmlbeans/trunk/test/cases/xbean/xmlobject/enumtest.xsd
   xmlbeans/trunk/test/cases/xbean/xmlobject/inttest.xsd
   xmlbeans/trunk/test/cases/xbean/xmlobject/japanese/LICENSE.txt
   xmlbeans/trunk/test/cases/xbean/xmlobject/japanese/weekly-little-endian.xml
   xmlbeans/trunk/test/cases/xbean/xmlobject/japanese/weekly-utf-16.dtd
   xmlbeans/trunk/test/cases/xbean/xmlobject/japanese/weekly-utf-16.xml
   xmlbeans/trunk/test/cases/xbean/xmlobject/listandunion.xsd
   xmlbeans/trunk/test/cases/xbean/xmlobject/nameworld.xml
   xmlbeans/trunk/test/cases/xbean/xmlobject/nameworld.xsd
   xmlbeans/trunk/test/cases/xbean/xmlobject/numerals.xsd
   xmlbeans/trunk/test/cases/xbean/xmlobject/person.xml
   xmlbeans/trunk/test/cases/xbean/xmlobject/person.xsd
   xmlbeans/trunk/test/cases/xbean/xmlobject/redefine1.xsd
   xmlbeans/trunk/test/cases/xbean/xmlobject/redefine2.xsd
   xmlbeans/trunk/test/cases/xbean/xmlobject/selectChldAttTest.xsd
   xmlbeans/trunk/test/cases/xbean/xmlobject/soap-envelope.xsd
   xmlbeans/trunk/test/cases/xbean/xmlobject/soap12-encoding.xsd
   xmlbeans/trunk/test/cases/xbean/xmlobject/store/ConsolidateTest.xml
   xmlbeans/trunk/test/cases/xbean/xmlobject/store/XML.xsd
   xmlbeans/trunk/test/cases/xbean/xmlobject/store/XMLSchema.xsd
   xmlbeans/trunk/test/cases/xbean/xmlobject/store/easypo1.xml
   xmlbeans/trunk/test/cases/xbean/xmlobject/store/people.xml
   xmlbeans/trunk/test/cases/xbean/xmlobject/store/small.xml
   xmlbeans/trunk/test/cases/xbean/xmlobject/substgroup.xsd
   xmlbeans/trunk/test/cases/xbean/xmltokensource/PrettyPrintNamespaceTest.xsd
   xmlbeans/trunk/test/lib/LICENSE.txt
   xmlbeans/trunk/test/tools/src/tools/JUnit/JUnitXResultFormatter.java
   xmlbeans/trunk/test/tools/src/tools/JUnit/SimpleResultFormatter.java
   xmlbeans/trunk/test/tools/src/tools/JUnit/TestReportMergeUtility.java
   xmlbeans/trunk/test/tools/src/tools/JUnit/XmlResultFormatter.java
   xmlbeans/trunk/test/tools/src/tools/JUnit/XmlResultFormatterImpl.java
   xmlbeans/trunk/test/tools/src/tools/ant/BuildFileTest.java
   xmlbeans/trunk/test/tools/src/tools/io/TeeOutputStream.java
   xmlbeans/trunk/test/tools/src/tools/util/ClassCompare.java
   xmlbeans/trunk/test/tools/src/tools/util/ComparisonError.java
   xmlbeans/trunk/test/tools/src/tools/util/Diff.java
   xmlbeans/trunk/test/tools/src/tools/util/JarUtil.java
   xmlbeans/trunk/test/tools/src/tools/util/Log.java
   xmlbeans/trunk/test/tools/src/tools/util/ResourceClass.java
   xmlbeans/trunk/test/tools/src/tools/util/ResourceUtil.java
   xmlbeans/trunk/test/tools/src/tools/util/SchemaFilenameFilter.java
   xmlbeans/trunk/test/tools/src/tools/util/SchemaValidator.java
   xmlbeans/trunk/test/tools/src/tools/util/TestRunUtil.java
   xmlbeans/trunk/test/tools/src/tools/util/Util.java
   xmlbeans/trunk/test/tools/src/tools/util/XMLFilenameFilter.java
   xmlbeans/trunk/test/tools/src/tools/xml/Utils.java
   xmlbeans/trunk/test/tools/src/tools/xml/XmlComparator.java

Modified: xmlbeans/branches/xmlbeans_v1_branch/v1/src/common/org/apache/xmlbeans/impl/common/XMLChar.java
Url: http://svn.apache.org/viewcvs/xmlbeans/branches/xmlbeans_v1_branch/v1/src/common/org/apache/xmlbeans/impl/common/XMLChar.java?view=diff&rev=111285&p1=xmlbeans/trunk/v1/src/common/org/apache/xmlbeans/impl/common/XMLChar.java&r1=111277&p2=xmlbeans/branches/xmlbeans_v1_branch/v1/src/common/org/apache/xmlbeans/impl/common/XMLChar.java&r2=111285
==============================================================================
--- xmlbeans/trunk/v1/src/common/org/apache/xmlbeans/impl/common/XMLChar.java	(original)
+++ xmlbeans/branches/xmlbeans_v1_branch/v1/src/common/org/apache/xmlbeans/impl/common/XMLChar.java	Wed Dec  8 08:54:26 2004
@@ -36,7 +36,7 @@
  * @author Arnaud  Le Hors, IBM
  * @author Rahul Srivastava, Sun Microsystems Inc.
  *
- * @version $Id: XMLChar.java,v 1.3 2004/02/12 20:05:54 ericvas Exp $
+ * @version $Id$
  */
 public class XMLChar {
 

Modified: xmlbeans/branches/xmlbeans_v1_branch/v1/src/license/LICENSE.txt
Url: http://svn.apache.org/viewcvs/xmlbeans/branches/xmlbeans_v1_branch/v1/src/license/LICENSE.txt?view=diff&rev=111285&p1=xmlbeans/trunk/v1/src/license/LICENSE.txt&r1=111277&p2=xmlbeans/branches/xmlbeans_v1_branch/v1/src/license/LICENSE.txt&r2=111285
==============================================================================
--- xmlbeans/trunk/v1/src/license/LICENSE.txt	(original)
+++ xmlbeans/branches/xmlbeans_v1_branch/v1/src/license/LICENSE.txt	Wed Dec  8 08:54:26 2004
@@ -1,203 +1,203 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
    limitations under the License.
 
 

Modified: xmlbeans/branches/xmlbeans_v1_branch/v1/src/typeimpl/org/apache/xmlbeans/impl/regex/RegularExpression.java
Url: http://svn.apache.org/viewcvs/xmlbeans/branches/xmlbeans_v1_branch/v1/src/typeimpl/org/apache/xmlbeans/impl/regex/RegularExpression.java?view=diff&rev=111285&p1=xmlbeans/trunk/v1/src/typeimpl/org/apache/xmlbeans/impl/regex/RegularExpression.java&r1=111277&p2=xmlbeans/branches/xmlbeans_v1_branch/v1/src/typeimpl/org/apache/xmlbeans/impl/regex/RegularExpression.java&r2=111285
==============================================================================
--- xmlbeans/trunk/v1/src/typeimpl/org/apache/xmlbeans/impl/regex/RegularExpression.java	(original)
+++ xmlbeans/branches/xmlbeans_v1_branch/v1/src/typeimpl/org/apache/xmlbeans/impl/regex/RegularExpression.java	Wed Dec  8 08:54:26 2004
@@ -475,7 +475,7 @@
  * <hr width="50%">
  *
  * @author TAMURA Kent &lt;kent@trl.ibm.co.jp&gt;
- * @version $Id: RegularExpression.java,v 1.4 2004/02/12 20:05:55 ericvas Exp $
+ * @version $Id$
  */
 public class RegularExpression implements java.io.Serializable {
     static final boolean DEBUG = false;

Modified: xmlbeans/branches/xmlbeans_v1_branch/v1/src/typeimpl/org/apache/xmlbeans/impl/util/Base64.java
Url: http://svn.apache.org/viewcvs/xmlbeans/branches/xmlbeans_v1_branch/v1/src/typeimpl/org/apache/xmlbeans/impl/util/Base64.java?view=diff&rev=111285&p1=xmlbeans/trunk/v1/src/typeimpl/org/apache/xmlbeans/impl/util/Base64.java&r1=111277&p2=xmlbeans/branches/xmlbeans_v1_branch/v1/src/typeimpl/org/apache/xmlbeans/impl/util/Base64.java&r2=111285
==============================================================================
--- xmlbeans/trunk/v1/src/typeimpl/org/apache/xmlbeans/impl/util/Base64.java	(original)
+++ xmlbeans/branches/xmlbeans_v1_branch/v1/src/typeimpl/org/apache/xmlbeans/impl/util/Base64.java	Wed Dec  8 08:54:26 2004
@@ -30,7 +30,7 @@
  *
  * @author Jeffrey Rodriguez
  * @author Sandy Gao
- * @version $Id: Base64.java,v 1.3 2004/02/12 20:05:56 ericvas Exp $
+ * @version $Id$
  */
 public final class  Base64 {
 

Modified: xmlbeans/branches/xmlbeans_v1_branch/v1/src/typeimpl/org/apache/xmlbeans/impl/util/HexBin.java
Url: http://svn.apache.org/viewcvs/xmlbeans/branches/xmlbeans_v1_branch/v1/src/typeimpl/org/apache/xmlbeans/impl/util/HexBin.java?view=diff&rev=111285&p1=xmlbeans/trunk/v1/src/typeimpl/org/apache/xmlbeans/impl/util/HexBin.java&r1=111277&p2=xmlbeans/branches/xmlbeans_v1_branch/v1/src/typeimpl/org/apache/xmlbeans/impl/util/HexBin.java&r2=111285
==============================================================================
--- xmlbeans/trunk/v1/src/typeimpl/org/apache/xmlbeans/impl/util/HexBin.java	(original)
+++ xmlbeans/branches/xmlbeans_v1_branch/v1/src/typeimpl/org/apache/xmlbeans/impl/util/HexBin.java	Wed Dec  8 08:54:26 2004
@@ -21,7 +21,7 @@
  *
  * This class encodes/decodes hexadecimal data
  * @author Jeffrey Rodriguez
- * @version $Id: HexBin.java,v 1.3 2004/02/12 20:05:56 ericvas Exp $
+ * @version $Id$
  */
 public final class  HexBin {
     static private final int  BASELENGTH   = 255;

Modified: xmlbeans/branches/xmlbeans_v1_branch/v1/src/xmlpublic/org/apache/xmlbeans/DelegateXmlObject.java
Url: http://svn.apache.org/viewcvs/xmlbeans/branches/xmlbeans_v1_branch/v1/src/xmlpublic/org/apache/xmlbeans/DelegateXmlObject.java?view=diff&rev=111285&p1=xmlbeans/trunk/v1/src/xmlpublic/org/apache/xmlbeans/DelegateXmlObject.java&r1=111277&p2=xmlbeans/branches/xmlbeans_v1_branch/v1/src/xmlpublic/org/apache/xmlbeans/DelegateXmlObject.java&r2=111285
==============================================================================
--- xmlbeans/trunk/v1/src/xmlpublic/org/apache/xmlbeans/DelegateXmlObject.java	(original)
+++ xmlbeans/branches/xmlbeans_v1_branch/v1/src/xmlpublic/org/apache/xmlbeans/DelegateXmlObject.java	Wed Dec  8 08:54:26 2004
@@ -1,13 +1,13 @@
-package org.apache.xmlbeans;
-
-/**
- * See {@link FilterXmlObject}
- */
-public interface DelegateXmlObject
-{
-    /**
-     * This method is called to obtain the underlying XmlObject.
-     * Implement this method to supply or compute the wrapped object.
-     */
-    XmlObject underlyingXmlObject();
-}
+package org.apache.xmlbeans;
+
+/**
+ * See {@link FilterXmlObject}
+ */
+public interface DelegateXmlObject
+{
+    /**
+     * This method is called to obtain the underlying XmlObject.
+     * Implement this method to supply or compute the wrapped object.
+     */
+    XmlObject underlyingXmlObject();
+}

Modified: xmlbeans/branches/xmlbeans_v1_branch/v1/src/xmlschema/schema/w3c-xml-license.html
Url: http://svn.apache.org/viewcvs/xmlbeans/branches/xmlbeans_v1_branch/v1/src/xmlschema/schema/w3c-xml-license.html?view=diff&rev=111285&p1=xmlbeans/trunk/v1/src/xmlschema/schema/w3c-xml-license.html&r1=111277&p2=xmlbeans/branches/xmlbeans_v1_branch/v1/src/xmlschema/schema/w3c-xml-license.html&r2=111285
==============================================================================
--- xmlbeans/trunk/v1/src/xmlschema/schema/w3c-xml-license.html	(original)
+++ xmlbeans/branches/xmlbeans_v1_branch/v1/src/xmlschema/schema/w3c-xml-license.html	Wed Dec  8 08:54:26 2004
@@ -107,6 +107,6 @@
   href="mailto:site-policy@w3.org">site-policy@w3.org&gt;</a>
 </address>
 
-<p>Last revised by Reagle $Date: 2004/04/10 00:17:10 $</p>
+<p>Last revised by Reagle $Date$</p>
 </body>
 </html>

Modified: xmlbeans/branches/xmlbeans_v1_branch/v1/src/xmlstore/org/apache/xmlbeans/impl/store/CursorData.java
Url: http://svn.apache.org/viewcvs/xmlbeans/branches/xmlbeans_v1_branch/v1/src/xmlstore/org/apache/xmlbeans/impl/store/CursorData.java?view=diff&rev=111285&p1=xmlbeans/trunk/v1/src/xmlstore/org/apache/xmlbeans/impl/store/CursorData.java&r1=111277&p2=xmlbeans/branches/xmlbeans_v1_branch/v1/src/xmlstore/org/apache/xmlbeans/impl/store/CursorData.java&r2=111285
==============================================================================
--- xmlbeans/trunk/v1/src/xmlstore/org/apache/xmlbeans/impl/store/CursorData.java	(original)
+++ xmlbeans/branches/xmlbeans_v1_branch/v1/src/xmlstore/org/apache/xmlbeans/impl/store/CursorData.java	Wed Dec  8 08:54:26 2004
@@ -1,97 +1,97 @@
-/*   Copyright 2004 The Apache Software Foundation
- *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package org.apache.xmlbeans.impl.store;
-
-import org.apache.xmlbeans.impl.store.Splay.CursorGoober;
-
-import java.util.ArrayList;
-
-public final class CursorData
-{
-    public static CursorData getOne ( Root r )
-    {
-        ArrayList dataCache = (ArrayList) tl_CachedCursorData.get();
-
-        CursorData cd;
-
-        if (dataCache.size() == 0)
-            cd = new CursorData( r );
-        else
-        {
-            cd = (CursorData) dataCache.remove( dataCache.size() - 1 );
-            cd._goober.set( r );
-        }
-        
-        return cd;
-    }
-
-    private CursorData ( Root r )
-    {
-        _goober = new CursorGoober( r );
-    }
-
-    private static ThreadLocal tl_CachedCursorData =
-        new ThreadLocal() { protected Object initialValue() { return new ArrayList(); } };
-    
-    protected void release ( boolean cache )
-    {
-        if (_goober.getSplay() != null)
-        {
-            clearSelections();
-
-            if (_stack != null)
-                _stack.dispose();
-
-            _goober.release();
-            
-            if (cache)
-            {
-                ArrayList dataCache = (ArrayList) tl_CachedCursorData.get();
-
-                if (dataCache.size() < 128)
-                    dataCache.add( this );
-            }
-        }
-    }
-    
-    protected void finalize ( )
-    {
-        Splay s = _goober.getSplay();
-        
-        if (s != null)
-        {
-            synchronized ( _goober.getRoot() )
-            {
-                release(false);
-            }
-        }
-    }
-
-    protected  void clearSelections (  )
-    {
-        if (_selections != null)
-            _selections.dispose();
-
-        _currentSelection = -2;
-    }
-    
-    public final CursorGoober _goober;
-
-    protected Cursor.Selections  _stack;
-
-    protected Cursor.Selections  _selections;
-    protected int                _currentSelection;
-}
+/*   Copyright 2004 The Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.apache.xmlbeans.impl.store;
+
+import org.apache.xmlbeans.impl.store.Splay.CursorGoober;
+
+import java.util.ArrayList;
+
+public final class CursorData
+{
+    public static CursorData getOne ( Root r )
+    {
+        ArrayList dataCache = (ArrayList) tl_CachedCursorData.get();
+
+        CursorData cd;
+
+        if (dataCache.size() == 0)
+            cd = new CursorData( r );
+        else
+        {
+            cd = (CursorData) dataCache.remove( dataCache.size() - 1 );
+            cd._goober.set( r );
+        }
+        
+        return cd;
+    }
+
+    private CursorData ( Root r )
+    {
+        _goober = new CursorGoober( r );
+    }
+
+    private static ThreadLocal tl_CachedCursorData =
+        new ThreadLocal() { protected Object initialValue() { return new ArrayList(); } };
+    
+    protected void release ( boolean cache )
+    {
+        if (_goober.getSplay() != null)
+        {
+            clearSelections();
+
+            if (_stack != null)
+                _stack.dispose();
+
+            _goober.release();
+            
+            if (cache)
+            {
+                ArrayList dataCache = (ArrayList) tl_CachedCursorData.get();
+
+                if (dataCache.size() < 128)
+                    dataCache.add( this );
+            }
+        }
+    }
+    
+    protected void finalize ( )
+    {
+        Splay s = _goober.getSplay();
+        
+        if (s != null)
+        {
+            synchronized ( _goober.getRoot() )
+            {
+                release(false);
+            }
+        }
+    }
+
+    protected  void clearSelections (  )
+    {
+        if (_selections != null)
+            _selections.dispose();
+
+        _currentSelection = -2;
+    }
+    
+    public final CursorGoober _goober;
+
+    protected Cursor.Selections  _stack;
+
+    protected Cursor.Selections  _selections;
+    protected int                _currentSelection;
+}

Modified: xmlbeans/branches/xmlbeans_v1_branch/v1/src/xsdschema/schema/w3c-schema-license.html
Url: http://svn.apache.org/viewcvs/xmlbeans/branches/xmlbeans_v1_branch/v1/src/xsdschema/schema/w3c-schema-license.html?view=diff&rev=111285&p1=xmlbeans/trunk/v1/src/xsdschema/schema/w3c-schema-license.html&r1=111277&p2=xmlbeans/branches/xmlbeans_v1_branch/v1/src/xsdschema/schema/w3c-schema-license.html&r2=111285
==============================================================================
--- xmlbeans/trunk/v1/src/xsdschema/schema/w3c-schema-license.html	(original)
+++ xmlbeans/branches/xmlbeans_v1_branch/v1/src/xsdschema/schema/w3c-schema-license.html	Wed Dec  8 08:54:26 2004
@@ -107,6 +107,6 @@
   href="mailto:site-policy@w3.org">site-policy@w3.org&gt;</a>
 </address>
 
-<p>Last revised by Reagle $Date: 2004/04/10 00:17:10 $</p>
+<p>Last revised by Reagle $Date$</p>
 </body>
 </html>

Modified: xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/schema/XmlSignature/xmldsig-core-schema.xsd
Url: http://svn.apache.org/viewcvs/xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/schema/XmlSignature/xmldsig-core-schema.xsd?view=diff&rev=111285&p1=xmlbeans/trunk/v1/test/cases/schema/XmlSignature/xmldsig-core-schema.xsd&r1=111277&p2=xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/schema/XmlSignature/xmldsig-core-schema.xsd&r2=111285
==============================================================================
--- xmlbeans/trunk/v1/test/cases/schema/XmlSignature/xmldsig-core-schema.xsd	(original)
+++ xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/schema/XmlSignature/xmldsig-core-schema.xsd	Wed Dec  8 08:54:26 2004
@@ -11,7 +11,7 @@
 
 <!-- Schema for XML Signatures
     http://www.w3.org/2000/09/xmldsig#
-    $Revision: 1.3 $ on $Date: 2004/04/06 19:55:12 $ by $Author: cezar $
+    $Revision$ on $Date$ by $Author$
 
     Copyright 2001 The Internet Society and W3C (Massachusetts Institute
     of Technology, Institut National de Recherche en Informatique et en

Modified: xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/schema/wli/003_process_po_007.xsd
Url: http://svn.apache.org/viewcvs/xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/schema/wli/003_process_po_007.xsd?view=diff&rev=111285&p1=xmlbeans/trunk/v1/test/cases/schema/wli/003_process_po_007.xsd&r1=111277&p2=xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/schema/wli/003_process_po_007.xsd&r2=111285
==============================================================================
--- xmlbeans/trunk/v1/test/cases/schema/wli/003_process_po_007.xsd	(original)
+++ xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/schema/wli/003_process_po_007.xsd	Wed Dec  8 08:54:26 2004
@@ -19,8 +19,8 @@
       For support, more information, or to report implementation bugs,
       please contact the Open Applications Group at xml@openapplications.org
 
-    $Revision: 1.2 $
-    $Date: 2004/02/26 00:59:56 $
+    $Revision$
+    $Date$
     Open Applications Group XSD
     Copyright 1998-2001, All Rights Reserved
 

Modified: xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/schema/wli/004_acknowledge_po_008.xsd
Url: http://svn.apache.org/viewcvs/xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/schema/wli/004_acknowledge_po_008.xsd?view=diff&rev=111285&p1=xmlbeans/trunk/v1/test/cases/schema/wli/004_acknowledge_po_008.xsd&r1=111277&p2=xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/schema/wli/004_acknowledge_po_008.xsd&r2=111285
==============================================================================
--- xmlbeans/trunk/v1/test/cases/schema/wli/004_acknowledge_po_008.xsd	(original)
+++ xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/schema/wli/004_acknowledge_po_008.xsd	Wed Dec  8 08:54:26 2004
@@ -19,8 +19,8 @@
 	For support, more information, or to report implementation bugs,
 	please contact the Open Applications Group at xml@openapplications.org
 
-	$Revision: 1.2 $
-	$Date: 2004/02/26 00:59:56 $
+	$Revision$
+	$Date$
 	Open Applications Group XSD
 	Copyright 1998-2001, All Rights Reserved
 

Modified: xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/schema/wli/oagis_fields.xsd
Url: http://svn.apache.org/viewcvs/xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/schema/wli/oagis_fields.xsd?view=diff&rev=111285&p1=xmlbeans/trunk/v1/test/cases/schema/wli/oagis_fields.xsd&r1=111277&p2=xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/schema/wli/oagis_fields.xsd&r2=111285
==============================================================================
--- xmlbeans/trunk/v1/test/cases/schema/wli/oagis_fields.xsd	(original)
+++ xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/schema/wli/oagis_fields.xsd	Wed Dec  8 08:54:26 2004
@@ -23,8 +23,8 @@
 		For support, more information, or to report implementation bugs,
 		please contact the Open Applications Group at xml@openapplications.org
 
-		$Revision: 1.2 $
-		$Date: 2004/02/26 00:59:56 $
+		$Revision$
+		$Date$
 		Open Applications Group XML
 		Copyright 1998-2001, All Rights Reserved
 

Modified: xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/schema/wli/oagis_segments.xsd
Url: http://svn.apache.org/viewcvs/xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/schema/wli/oagis_segments.xsd?view=diff&rev=111285&p1=xmlbeans/trunk/v1/test/cases/schema/wli/oagis_segments.xsd&r1=111277&p2=xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/schema/wli/oagis_segments.xsd&r2=111285
==============================================================================
--- xmlbeans/trunk/v1/test/cases/schema/wli/oagis_segments.xsd	(original)
+++ xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/schema/wli/oagis_segments.xsd	Wed Dec  8 08:54:26 2004
@@ -23,8 +23,8 @@
 		For support, more information, or to report implementation bugs,
 		please contact the Open Applications Group at xml@openapplications.org
 
-		$Revision: 1.2 $
-		$Date: 2004/02/26 00:59:56 $
+		$Revision$
+		$Date$
 		Open Applications Group XML
 		Copyright 1998-2001, All Rights Reserved
 

Modified: xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_0_0.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_0_0.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_0_0.xml&r1=111277&p2=xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_0_0.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_0_0.xml	(original)
+++ xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_0_0.xml	Wed Dec  8 08:54:26 2004
@@ -1,14 +1,14 @@
-<!-- Copyright 2004 The Apache Software Foundation
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License. -->
+<!-- Copyright 2004 The Apache Software Foundation
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License. -->
 <xml-fragment test="test" xmlns:ext="http://somebody.elses.extension"/>

Modified: xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_10_1.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_10_1.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_10_1.xml&r1=111277&p2=xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_10_1.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_10_1.xml	(original)
+++ xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_10_1.xml	Wed Dec  8 08:54:26 2004
@@ -1,14 +1,14 @@
-<!-- Copyright 2004 The Apache Software Foundation
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License. -->
+<!-- Copyright 2004 The Apache Software Foundation
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License. -->
 <a test="test" xmlns:ext="http://somebody.elses.extension"/>

Modified: xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_10_3.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_10_3.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_10_3.xml&r1=111277&p2=xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_10_3.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_10_3.xml	(original)
+++ xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_10_3.xml	Wed Dec  8 08:54:26 2004
@@ -1,14 +1,14 @@
-<!-- Copyright 2004 The Apache Software Foundation
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License. -->
+<!-- Copyright 2004 The Apache Software Foundation
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License. -->
 <a xmlns:java="http://xml.apache.org/xslt/java" xmlns:ext="http://somebody.elses.extension"/>

Modified: xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_11_0.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_11_0.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_11_0.xml&r1=111277&p2=xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_11_0.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_11_0.xml	(original)
+++ xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_11_0.xml	Wed Dec  8 08:54:26 2004
@@ -1,14 +1,14 @@
-<!-- Copyright 2004 The Apache Software Foundation
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License. -->
+<!-- Copyright 2004 The Apache Software Foundation
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License. -->
 <xml-fragment xmlns:ext="http://somebody.elses.extension"/>

Modified: xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_12_0.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_12_0.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_12_0.xml&r1=111277&p2=xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_12_0.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_12_0.xml	(original)
+++ xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_12_0.xml	Wed Dec  8 08:54:26 2004
@@ -1,14 +1,14 @@
-<!-- Copyright 2004 The Apache Software Foundation
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License. -->
+<!-- Copyright 2004 The Apache Software Foundation
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License. -->
 <xml-fragment><!-- --></xml-fragment>

Modified: xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_13_0.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_13_0.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_13_0.xml&r1=111277&p2=xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_13_0.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_13_0.xml	(original)
+++ xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_13_0.xml	Wed Dec  8 08:54:26 2004
@@ -1,14 +1,14 @@
-<!-- Copyright 2004 The Apache Software Foundation
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License. -->
+<!-- Copyright 2004 The Apache Software Foundation
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License. -->
 <a test="test" xmlns:ext="http://somebody.elses.extension"/>

Modified: xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_13_1.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_13_1.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_13_1.xml&r1=111277&p2=xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_13_1.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_13_1.xml	(original)
+++ xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_13_1.xml	Wed Dec  8 08:54:26 2004
@@ -1,14 +1,14 @@
-<!-- Copyright 2004 The Apache Software Foundation
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License. -->
+<!-- Copyright 2004 The Apache Software Foundation
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License. -->
 <a xmlns:java="http://xml.apache.org/xslt/java" xmlns:ext="http://somebody.elses.extension"/>

Modified: xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_14_0.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_14_0.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_14_0.xml&r1=111277&p2=xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_14_0.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_14_0.xml	(original)
+++ xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_14_0.xml	Wed Dec  8 08:54:26 2004
@@ -1,14 +1,14 @@
-<!-- Copyright 2004 The Apache Software Foundation
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License. -->
+<!-- Copyright 2004 The Apache Software Foundation
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License. -->
 <xml-fragment test="test" xmlns:ext="http://somebody.elses.extension"/>

Modified: xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_14_1.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_14_1.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_14_1.xml&r1=111277&p2=xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_14_1.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_14_1.xml	(original)
+++ xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_14_1.xml	Wed Dec  8 08:54:26 2004
@@ -1,14 +1,14 @@
-<!-- Copyright 2004 The Apache Software Foundation
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License. -->
+<!-- Copyright 2004 The Apache Software Foundation
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License. -->
 <xml-fragment attr1="a1" xmlns:java="http://xml.apache.org/xslt/java" xmlns:ext="http://somebody.elses.extension"/>

Modified: xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_14_2.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_14_2.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_14_2.xml&r1=111277&p2=xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_14_2.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_14_2.xml	(original)
+++ xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_14_2.xml	Wed Dec  8 08:54:26 2004
@@ -1,14 +1,14 @@
-<!-- Copyright 2004 The Apache Software Foundation
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License. -->
+<!-- Copyright 2004 The Apache Software Foundation
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License. -->
 <xml-fragment attr2="a2" xmlns:java="http://xml.apache.org/xslt/java" xmlns:ext="http://somebody.elses.extension"/>

Modified: xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_15_2.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_15_2.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_15_2.xml&r1=111277&p2=xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_15_2.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_15_2.xml	(original)
+++ xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_15_2.xml	Wed Dec  8 08:54:26 2004
@@ -1,14 +1,14 @@
-<!-- Copyright 2004 The Apache Software Foundation
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License. -->
+<!-- Copyright 2004 The Apache Software Foundation
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License. -->
 <a xmlns:java="http://xml.apache.org/xslt/java" xmlns:ext="http://somebody.elses.extension"/>

Modified: xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_18_1.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_18_1.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_18_1.xml&r1=111277&p2=xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_18_1.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_18_1.xml	(original)
+++ xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_18_1.xml	Wed Dec  8 08:54:26 2004
@@ -1,14 +1,14 @@
-<!-- Copyright 2004 The Apache Software Foundation
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License. -->
+<!-- Copyright 2004 The Apache Software Foundation
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License. -->
 <a test="test" xmlns:ext="http://somebody.elses.extension"/>

Modified: xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_18_6.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_18_6.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_18_6.xml&r1=111277&p2=xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_18_6.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_18_6.xml	(original)
+++ xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_18_6.xml	Wed Dec  8 08:54:26 2004
@@ -1,14 +1,14 @@
-<!-- Copyright 2004 The Apache Software Foundation
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License. -->
+<!-- Copyright 2004 The Apache Software Foundation
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License. -->
 <a xmlns:java="http://xml.apache.org/xslt/java" xmlns:ext="http://somebody.elses.extension"/>

Modified: xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_19_0.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_19_0.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_19_0.xml&r1=111277&p2=xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_19_0.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_19_0.xml	(original)
+++ xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_19_0.xml	Wed Dec  8 08:54:26 2004
@@ -1,14 +1,14 @@
-<!-- Copyright 2004 The Apache Software Foundation
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License. -->
+<!-- Copyright 2004 The Apache Software Foundation
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License. -->
 <xml-fragment test="test" xmlns:ext="http://somebody.elses.extension"/>

Modified: xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_1_2.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_1_2.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_1_2.xml&r1=111277&p2=xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_1_2.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_1_2.xml	(original)
+++ xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_1_2.xml	Wed Dec  8 08:54:26 2004
@@ -1,14 +1,14 @@
-<!-- Copyright 2004 The Apache Software Foundation
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License. -->
+<!-- Copyright 2004 The Apache Software Foundation
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License. -->
 <xml-fragment><!-- --></xml-fragment>

Modified: xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_1_4.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_1_4.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_1_4.xml&r1=111277&p2=xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_1_4.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_1_4.xml	(original)
+++ xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_1_4.xml	Wed Dec  8 08:54:26 2004
@@ -1,14 +1,14 @@
-<!-- Copyright 2004 The Apache Software Foundation
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License. -->
+<!-- Copyright 2004 The Apache Software Foundation
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License. -->
 <a test="test" xmlns:ext="http://somebody.elses.extension"/>

Modified: xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_1_9.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_1_9.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_1_9.xml&r1=111277&p2=xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_1_9.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_1_9.xml	(original)
+++ xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_1_9.xml	Wed Dec  8 08:54:26 2004
@@ -1,14 +1,14 @@
-<!-- Copyright 2004 The Apache Software Foundation
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License. -->
+<!-- Copyright 2004 The Apache Software Foundation
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License. -->
 <a xmlns:java="http://xml.apache.org/xslt/java" xmlns:ext="http://somebody.elses.extension"/>

Modified: xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_20_0.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_20_0.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_20_0.xml&r1=111277&p2=xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_20_0.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_20_0.xml	(original)
+++ xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_20_0.xml	Wed Dec  8 08:54:26 2004
@@ -1,14 +1,14 @@
-<!-- Copyright 2004 The Apache Software Foundation
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License. -->
+<!-- Copyright 2004 The Apache Software Foundation
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License. -->
 <a xmlns:java="http://xml.apache.org/xslt/java" xmlns:ext="http://somebody.elses.extension"/>

Modified: xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_21_0.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_21_0.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_21_0.xml&r1=111277&p2=xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_21_0.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_21_0.xml	(original)
+++ xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_21_0.xml	Wed Dec  8 08:54:26 2004
@@ -1,14 +1,14 @@
-<!-- Copyright 2004 The Apache Software Foundation
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License. -->
+<!-- Copyright 2004 The Apache Software Foundation
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License. -->
 <a xmlns:java="http://xml.apache.org/xslt/java" xmlns:ext="http://somebody.elses.extension"/>

Modified: xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_21_2.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_21_2.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_21_2.xml&r1=111277&p2=xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_21_2.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_21_2.xml	(original)
+++ xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_21_2.xml	Wed Dec  8 08:54:26 2004
@@ -1,14 +1,14 @@
-<!-- Copyright 2004 The Apache Software Foundation
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License. -->
+<!-- Copyright 2004 The Apache Software Foundation
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License. -->
 <a test="test" xmlns:ext="http://somebody.elses.extension"/>

Modified: xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_22_1.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_22_1.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_22_1.xml&r1=111277&p2=xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_22_1.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_22_1.xml	(original)
+++ xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_22_1.xml	Wed Dec  8 08:54:26 2004
@@ -1,14 +1,14 @@
-<!-- Copyright 2004 The Apache Software Foundation
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License. -->
+<!-- Copyright 2004 The Apache Software Foundation
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License. -->
 <a xmlns:java="http://xml.apache.org/xslt/java" xmlns:ext="http://somebody.elses.extension"/>

Modified: xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_23_0.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_23_0.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_23_0.xml&r1=111277&p2=xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_23_0.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_23_0.xml	(original)
+++ xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_23_0.xml	Wed Dec  8 08:54:26 2004
@@ -1,14 +1,14 @@
-<!-- Copyright 2004 The Apache Software Foundation
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License. -->
+<!-- Copyright 2004 The Apache Software Foundation
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License. -->
 <a test="test" xmlns:ext="http://somebody.elses.extension"/>

Modified: xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_3_0.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_3_0.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_3_0.xml&r1=111277&p2=xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_3_0.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_3_0.xml	(original)
+++ xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_3_0.xml	Wed Dec  8 08:54:26 2004
@@ -1,14 +1,14 @@
-<!-- Copyright 2004 The Apache Software Foundation
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License. -->
+<!-- Copyright 2004 The Apache Software Foundation
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License. -->
 <a test="test" xmlns:ext="http://somebody.elses.extension"/>

Modified: xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_4_0.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_4_0.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_4_0.xml&r1=111277&p2=xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_4_0.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_4_0.xml	(original)
+++ xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_4_0.xml	Wed Dec  8 08:54:26 2004
@@ -1,14 +1,14 @@
-<!-- Copyright 2004 The Apache Software Foundation
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License. -->
+<!-- Copyright 2004 The Apache Software Foundation
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License. -->
 <xml-fragment test="test" xmlns:ext="http://somebody.elses.extension"/>

Modified: xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_4_1.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_4_1.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_4_1.xml&r1=111277&p2=xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_4_1.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_4_1.xml	(original)
+++ xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_4_1.xml	Wed Dec  8 08:54:26 2004
@@ -1,14 +1,14 @@
-<!-- Copyright 2004 The Apache Software Foundation
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License. -->
+<!-- Copyright 2004 The Apache Software Foundation
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License. -->
 <xml-fragment attr1="a1" xmlns:java="http://xml.apache.org/xslt/java" xmlns:ext="http://somebody.elses.extension"/>

Modified: xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_4_2.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_4_2.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_4_2.xml&r1=111277&p2=xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_4_2.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_4_2.xml	(original)
+++ xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_4_2.xml	Wed Dec  8 08:54:26 2004
@@ -1,14 +1,14 @@
-<!-- Copyright 2004 The Apache Software Foundation
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License. -->
+<!-- Copyright 2004 The Apache Software Foundation
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License. -->
 <xml-fragment attr2="a2" xmlns:java="http://xml.apache.org/xslt/java" xmlns:ext="http://somebody.elses.extension"/>

Modified: xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_6_2.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_6_2.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_6_2.xml&r1=111277&p2=xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_6_2.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_6_2.xml	(original)
+++ xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_6_2.xml	Wed Dec  8 08:54:26 2004
@@ -1,14 +1,14 @@
-<!-- Copyright 2004 The Apache Software Foundation
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License. -->
+<!-- Copyright 2004 The Apache Software Foundation
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License. -->
 <a test="test" xmlns:ext="http://somebody.elses.extension"/>

Modified: xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_6_4.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_6_4.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_6_4.xml&r1=111277&p2=xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_6_4.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_6_4.xml	(original)
+++ xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_6_4.xml	Wed Dec  8 08:54:26 2004
@@ -1,14 +1,14 @@
-<!-- Copyright 2004 The Apache Software Foundation
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License. -->
+<!-- Copyright 2004 The Apache Software Foundation
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License. -->
 <a xmlns:java="http://xml.apache.org/xslt/java" xmlns:ext="http://somebody.elses.extension"/>

Modified: xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_8_0.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_8_0.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_8_0.xml&r1=111277&p2=xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_8_0.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_8_0.xml	(original)
+++ xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_8_0.xml	Wed Dec  8 08:54:26 2004
@@ -1,14 +1,14 @@
-<!-- Copyright 2004 The Apache Software Foundation
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License. -->
+<!-- Copyright 2004 The Apache Software Foundation
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License. -->
 <xml-fragment test="test" xmlns:ext="http://somebody.elses.extension"/>

Modified: xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_8_1.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_8_1.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_8_1.xml&r1=111277&p2=xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_8_1.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_8_1.xml	(original)
+++ xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_8_1.xml	Wed Dec  8 08:54:26 2004
@@ -1,14 +1,14 @@
-<!-- Copyright 2004 The Apache Software Foundation
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License. -->
+<!-- Copyright 2004 The Apache Software Foundation
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License. -->
 <xml-fragment attr1="a1" xmlns:java="http://xml.apache.org/xslt/java" xmlns:ext="http://somebody.elses.extension"/>

Modified: xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_9_0.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_9_0.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_9_0.xml&r1=111277&p2=xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_9_0.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_9_0.xml	(original)
+++ xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_9_0.xml	Wed Dec  8 08:54:26 2004
@@ -1,14 +1,14 @@
-<!-- Copyright 2004 The Apache Software Foundation
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License. -->
+<!-- Copyright 2004 The Apache Software Foundation
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License. -->
 <xml-fragment test="test" xmlns:ext="http://somebody.elses.extension"/>

Modified: xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_9_1.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_9_1.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_9_1.xml&r1=111277&p2=xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_9_1.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_9_1.xml	(original)
+++ xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_9_1.xml	Wed Dec  8 08:54:26 2004
@@ -1,14 +1,14 @@
-<!-- Copyright 2004 The Apache Software Foundation
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License. -->
+<!-- Copyright 2004 The Apache Software Foundation
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License. -->
 <xml-fragment attr1="a1" xmlns:java="http://xml.apache.org/xslt/java" xmlns:ext="http://somebody.elses.extension"/>

Modified: xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_9_2.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_9_2.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_9_2.xml&r1=111277&p2=xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_9_2.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_9_2.xml	(original)
+++ xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_9_2.xml	Wed Dec  8 08:54:26 2004
@@ -1,14 +1,14 @@
-<!-- Copyright 2004 The Apache Software Foundation
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License. -->
+<!-- Copyright 2004 The Apache Software Foundation
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License. -->
 <xml-fragment attr2="a2" xmlns:java="http://xml.apache.org/xslt/java" xmlns:ext="http://somebody.elses.extension"/>

Modified: xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_9_4.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_9_4.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_9_4.xml&r1=111277&p2=xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_9_4.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v1/test/cases/xpath/expected/JaxenXPathTest_9_4.xml	(original)
+++ xmlbeans/branches/xmlbeans_v1_branch/v1/test/cases/xpath/expected/JaxenXPathTest_9_4.xml	Wed Dec  8 08:54:26 2004
@@ -1,14 +1,14 @@
-<!-- Copyright 2004 The Apache Software Foundation
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License. -->
+<!-- Copyright 2004 The Apache Software Foundation
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License. -->
 <xml-fragment><!-- --></xml-fragment>

Copied: xmlbeans/trunk/.cvsignore (from r111277, xmlbeans/trunk/v2/.cvsignore)
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/.cvsignore?view=diff&rev=111285&p1=xmlbeans/trunk/v2/.cvsignore&r1=111277&p2=xmlbeans/trunk/.cvsignore&r2=111285
==============================================================================

Copied: xmlbeans/trunk/README.txt (from r111277, xmlbeans/trunk/v2/README.txt)
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/README.txt?view=diff&rev=111285&p1=xmlbeans/trunk/v2/README.txt&r1=111277&p2=xmlbeans/trunk/README.txt&r2=111285
==============================================================================

Copied: xmlbeans/trunk/build.xml (from r111277, xmlbeans/trunk/v2/build.xml)
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/build.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v2/build.xml&r1=111277&p2=xmlbeans/trunk/build.xml&r2=111285
==============================================================================

Modified: xmlbeans/trunk/src/common/org/apache/xmlbeans/impl/common/XMLChar.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/common/org/apache/xmlbeans/impl/common/XMLChar.java?view=diff&rev=111285&p1=xmlbeans/trunk/v2/src/common/org/apache/xmlbeans/impl/common/XMLChar.java&r1=111277&p2=xmlbeans/trunk/src/common/org/apache/xmlbeans/impl/common/XMLChar.java&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/src/common/org/apache/xmlbeans/impl/common/XMLChar.java	(original)
+++ xmlbeans/trunk/src/common/org/apache/xmlbeans/impl/common/XMLChar.java	Wed Dec  8 08:54:26 2004
@@ -36,7 +36,7 @@
  * @author Arnaud  Le Hors, IBM
  * @author Rahul Srivastava, Sun Microsystems Inc.
  *
- * @version $Id: XMLChar.java,v 1.3 2004/02/12 20:06:08 ericvas Exp $
+ * @version $Id$
  */
 public class XMLChar {
 

Modified: xmlbeans/trunk/src/common/org/apache/xmlbeans/impl/common/XmlLocale.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/common/org/apache/xmlbeans/impl/common/XmlLocale.java?view=diff&rev=111285&p1=xmlbeans/trunk/v2/src/common/org/apache/xmlbeans/impl/common/XmlLocale.java&r1=111277&p2=xmlbeans/trunk/src/common/org/apache/xmlbeans/impl/common/XmlLocale.java&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/src/common/org/apache/xmlbeans/impl/common/XmlLocale.java	(original)
+++ xmlbeans/trunk/src/common/org/apache/xmlbeans/impl/common/XmlLocale.java	Wed Dec  8 08:54:26 2004
@@ -1,27 +1,27 @@
-/*   Copyright 2004 The Apache Software Foundation
- *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-// TODO - consider moving this to public ....
-
-package org.apache.xmlbeans.impl.common;
-
-public interface XmlLocale
-{
-    boolean sync   ( );
-    boolean noSync ( );
-    
-    void enter ( );
-    void exit  ( );
+/*   Copyright 2004 The Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+// TODO - consider moving this to public ....
+
+package org.apache.xmlbeans.impl.common;
+
+public interface XmlLocale
+{
+    boolean sync   ( );
+    boolean noSync ( );
+    
+    void enter ( );
+    void exit  ( );
 }

Modified: xmlbeans/trunk/src/license/LICENSE.txt
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/license/LICENSE.txt?view=diff&rev=111285&p1=xmlbeans/trunk/v2/src/license/LICENSE.txt&r1=111277&p2=xmlbeans/trunk/src/license/LICENSE.txt&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/src/license/LICENSE.txt	(original)
+++ xmlbeans/trunk/src/license/LICENSE.txt	Wed Dec  8 08:54:26 2004
@@ -1,202 +1,202 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+

Modified: xmlbeans/trunk/src/newstore2/org/w3c/dom/DOMConfiguration.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/newstore2/org/w3c/dom/DOMConfiguration.java?view=diff&rev=111285&p1=xmlbeans/trunk/v2/src/newstore2/org/w3c/dom/DOMConfiguration.java&r1=111277&p2=xmlbeans/trunk/src/newstore2/org/w3c/dom/DOMConfiguration.java&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/src/newstore2/org/w3c/dom/DOMConfiguration.java	(original)
+++ xmlbeans/trunk/src/newstore2/org/w3c/dom/DOMConfiguration.java	Wed Dec  8 08:54:26 2004
@@ -1,27 +1,27 @@
-/*   Copyright 2004 The Apache Software Foundation
- *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package org.w3c.dom;
-
-public interface DOMConfiguration
-{
-    public boolean canSetParameter ( String name, Object value );
-    
-    public Object getParameter ( String name );
-    
-    public DOMStringList getParameterNames (  );
-    
-    public void setParameter ( String name, Object value );
+/*   Copyright 2004 The Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.w3c.dom;
+
+public interface DOMConfiguration
+{
+    public boolean canSetParameter ( String name, Object value );
+    
+    public Object getParameter ( String name );
+    
+    public DOMStringList getParameterNames (  );
+    
+    public void setParameter ( String name, Object value );
 }

Modified: xmlbeans/trunk/src/newstore2/org/w3c/dom/DOMStringList.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/newstore2/org/w3c/dom/DOMStringList.java?view=diff&rev=111285&p1=xmlbeans/trunk/v2/src/newstore2/org/w3c/dom/DOMStringList.java&r1=111277&p2=xmlbeans/trunk/src/newstore2/org/w3c/dom/DOMStringList.java&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/src/newstore2/org/w3c/dom/DOMStringList.java	(original)
+++ xmlbeans/trunk/src/newstore2/org/w3c/dom/DOMStringList.java	Wed Dec  8 08:54:26 2004
@@ -1,25 +1,25 @@
-/*   Copyright 2004 The Apache Software Foundation
- *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package org.w3c.dom;
-
-public interface DOMStringList
-{
-    public boolean contains ( String str );
-    
-    public int getLength (  );
-    
-    public String item ( int index );
+/*   Copyright 2004 The Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.w3c.dom;
+
+public interface DOMStringList
+{
+    public boolean contains ( String str );
+    
+    public int getLength (  );
+    
+    public String item ( int index );
 }

Modified: xmlbeans/trunk/src/newstore2/org/w3c/dom/TypeInfo.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/newstore2/org/w3c/dom/TypeInfo.java?view=diff&rev=111285&p1=xmlbeans/trunk/v2/src/newstore2/org/w3c/dom/TypeInfo.java&r1=111277&p2=xmlbeans/trunk/src/newstore2/org/w3c/dom/TypeInfo.java&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/src/newstore2/org/w3c/dom/TypeInfo.java	(original)
+++ xmlbeans/trunk/src/newstore2/org/w3c/dom/TypeInfo.java	Wed Dec  8 08:54:26 2004
@@ -1,31 +1,31 @@
-/*   Copyright 2004 The Apache Software Foundation
- *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package org.w3c.dom;
-
-public interface TypeInfo
-{
-    public static final int DERIVATION_EXTENSION   = 2;
-    public static final int DERIVATION_LIST        = 8;
-    public static final int DERIVATION_RESTRICTION = 1;
-    public static final int DERIVATION_UNION       = 4;
-            
-    public String getTypeName ( );
-    
-    public String getTypeNamespace ( );
-    
-    public boolean isDerivedFrom (
-        String typeNamespaceArg, String typeNameArg, int derivationMethod );
+/*   Copyright 2004 The Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.w3c.dom;
+
+public interface TypeInfo
+{
+    public static final int DERIVATION_EXTENSION   = 2;
+    public static final int DERIVATION_LIST        = 8;
+    public static final int DERIVATION_RESTRICTION = 1;
+    public static final int DERIVATION_UNION       = 4;
+            
+    public String getTypeName ( );
+    
+    public String getTypeNamespace ( );
+    
+    public boolean isDerivedFrom (
+        String typeNamespaceArg, String typeNameArg, int derivationMethod );
 }

Modified: xmlbeans/trunk/src/newstore2/org/w3c/dom/UserDataHandler.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/newstore2/org/w3c/dom/UserDataHandler.java?view=diff&rev=111285&p1=xmlbeans/trunk/v2/src/newstore2/org/w3c/dom/UserDataHandler.java&r1=111277&p2=xmlbeans/trunk/src/newstore2/org/w3c/dom/UserDataHandler.java&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/src/newstore2/org/w3c/dom/UserDataHandler.java	(original)
+++ xmlbeans/trunk/src/newstore2/org/w3c/dom/UserDataHandler.java	Wed Dec  8 08:54:26 2004
@@ -1,27 +1,27 @@
-/*   Copyright 2004 The Apache Software Foundation
- *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package org.w3c.dom;
-
-public interface UserDataHandler
-{
-    public static final short NODE_ADOPTED  = 5;
-    public static final short NODE_CLONED   = 1;
-    public static final short NODE_DELETED  = 3;
-    public static final short NODE_IMPORTED = 2;
-    public static final short NODE_RENAMED  = 4;
-
-    public void handle ( short operation, String key, Object data, Node src, Node dst );
+/*   Copyright 2004 The Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.w3c.dom;
+
+public interface UserDataHandler
+{
+    public static final short NODE_ADOPTED  = 5;
+    public static final short NODE_CLONED   = 1;
+    public static final short NODE_DELETED  = 3;
+    public static final short NODE_IMPORTED = 2;
+    public static final short NODE_RENAMED  = 4;
+
+    public void handle ( short operation, String key, Object data, Node src, Node dst );
 }

Modified: xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/regex/RegularExpression.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/regex/RegularExpression.java?view=diff&rev=111285&p1=xmlbeans/trunk/v2/src/typeimpl/org/apache/xmlbeans/impl/regex/RegularExpression.java&r1=111277&p2=xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/regex/RegularExpression.java&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/src/typeimpl/org/apache/xmlbeans/impl/regex/RegularExpression.java	(original)
+++ xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/regex/RegularExpression.java	Wed Dec  8 08:54:26 2004
@@ -475,7 +475,7 @@
  * <hr width="50%">
  *
  * @author TAMURA Kent &lt;kent@trl.ibm.co.jp&gt;
- * @version $Id: RegularExpression.java,v 1.3 2004/09/25 05:51:17 radup Exp $
+ * @version $Id$
  */
 public class RegularExpression implements java.io.Serializable {
     static final boolean DEBUG = false;

Modified: xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaDependencies.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaDependencies.java?view=diff&rev=111285&p1=xmlbeans/trunk/v2/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaDependencies.java&r1=111277&p2=xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaDependencies.java&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaDependencies.java	(original)
+++ xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaDependencies.java	Wed Dec  8 08:54:26 2004
@@ -1,156 +1,156 @@
-/*   Copyright 2004 The Apache Software Foundation
- *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package org.apache.xmlbeans.impl.schema;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-public class SchemaDependencies
-{
-    // This class is NOT synchronized
-
-    void registerDependency(String source, String target)
-    {
-        Set depSet = (Set) _dependencies.get(target);
-        if (depSet == null)
-        {
-            depSet = new HashSet();
-            _dependencies.put(target, depSet);
-        }
-        depSet.add(source);
-    }
-
-    
-
-    /**
-     * Records anti-dependencies. Keys are namespaces and values are
-     * the lists of namespaces that depend on each key
-     */
-    private Map/*<String,Set<String>>*/ _dependencies;
-
-    Set computeTransitiveClosure(List modifiedNamespaces)
-    {
-        List nsList = new ArrayList(modifiedNamespaces);
-        Set result = new HashSet(modifiedNamespaces);
-        for (int i = 0; i < nsList.size(); i++)
-        {
-            Set deps = (Set) _dependencies.get(nsList.get(i));
-            if (deps == null)
-                continue;
-            for (Iterator it = deps.iterator(); it.hasNext(); )
-            {
-                String ns = (String) it.next();
-                if (!result.contains(ns))
-                {
-                    nsList.add(ns);
-                    result.add(ns);
-                }
-            }
-        }
-        return result;
-    }
-
-    SchemaDependencies()
-    {
-        _dependencies = new HashMap();
-        _contributions = new HashMap();
-    }
-
-    SchemaDependencies(SchemaDependencies base, Set updatedNs)
-    {
-        _dependencies = new HashMap();
-        _contributions = new HashMap();
-        for (Iterator it = base._dependencies.keySet().iterator(); it.hasNext(); )
-        {
-            String target = (String) it.next();
-            if (updatedNs.contains(target))
-                continue;
-            Set depSet = new HashSet();
-            _dependencies.put(target, depSet);
-            Set baseDepSet = (Set) base._dependencies.get(target);
-            for (Iterator it2 = baseDepSet.iterator(); it2.hasNext(); )
-            {
-                String source = (String) it2.next();
-                if (updatedNs.contains(source))
-                    continue;
-                depSet.add(source);
-            }
-            List fileList = new ArrayList();
-            _contributions.put(target, fileList);
-            List baseFileList = (List) base._contributions.get(target);
-            for (Iterator it2 = baseFileList.iterator(); it2.hasNext(); )
-                fileList.add(it2.next());
-        }
-    }
-
-    /**
-     * Records the list of files associated to each namespace.
-     * This is needed so that we can return a list of files that
-     * need to be compiled once we get a set of altered namespaces
-     */
-    private Map/*<String,List<String>>*/ _contributions;
-
-    void registerContribution(String ns, String fileURL)
-    {
-        List fileList = (List) _contributions.get(ns);
-        if (fileList == null)
-        {
-            fileList = new ArrayList();
-            _contributions.put(ns, fileList);
-        }
-        fileList.add(fileURL);
-    }
-
-    boolean isFileRepresented(String fileURL)
-    {
-        for (Iterator it = _contributions.values().iterator(); it.hasNext(); )
-        {
-            List fileList = (List) it.next();
-            if (fileList.contains(fileURL))
-                return true;
-        }
-        return false;
-    }
-
-    List getFilesTouched(Set updatedNs)
-    {
-        List result = new ArrayList();
-        for (Iterator it = updatedNs.iterator(); it.hasNext(); )
-        {
-            result.addAll((List) _contributions.get(it.next()));
-        }
-        return result;
-    }
-
-    List getNamespacesTouched(Set modifiedFiles)
-    {
-        List result = new ArrayList();
-        for (Iterator it = _contributions.keySet().iterator(); it.hasNext(); )
-        {
-            String ns = (String) it.next();
-            List files = (List) _contributions.get(ns);
-            for (int i = 0; i < files.size(); i++)
-                if (modifiedFiles.contains(files.get(i)))
-                    result.add(ns);
-        }
-        return result;
-    }
-}
+/*   Copyright 2004 The Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.apache.xmlbeans.impl.schema;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public class SchemaDependencies
+{
+    // This class is NOT synchronized
+
+    void registerDependency(String source, String target)
+    {
+        Set depSet = (Set) _dependencies.get(target);
+        if (depSet == null)
+        {
+            depSet = new HashSet();
+            _dependencies.put(target, depSet);
+        }
+        depSet.add(source);
+    }
+
+    
+
+    /**
+     * Records anti-dependencies. Keys are namespaces and values are
+     * the lists of namespaces that depend on each key
+     */
+    private Map/*<String,Set<String>>*/ _dependencies;
+
+    Set computeTransitiveClosure(List modifiedNamespaces)
+    {
+        List nsList = new ArrayList(modifiedNamespaces);
+        Set result = new HashSet(modifiedNamespaces);
+        for (int i = 0; i < nsList.size(); i++)
+        {
+            Set deps = (Set) _dependencies.get(nsList.get(i));
+            if (deps == null)
+                continue;
+            for (Iterator it = deps.iterator(); it.hasNext(); )
+            {
+                String ns = (String) it.next();
+                if (!result.contains(ns))
+                {
+                    nsList.add(ns);
+                    result.add(ns);
+                }
+            }
+        }
+        return result;
+    }
+
+    SchemaDependencies()
+    {
+        _dependencies = new HashMap();
+        _contributions = new HashMap();
+    }
+
+    SchemaDependencies(SchemaDependencies base, Set updatedNs)
+    {
+        _dependencies = new HashMap();
+        _contributions = new HashMap();
+        for (Iterator it = base._dependencies.keySet().iterator(); it.hasNext(); )
+        {
+            String target = (String) it.next();
+            if (updatedNs.contains(target))
+                continue;
+            Set depSet = new HashSet();
+            _dependencies.put(target, depSet);
+            Set baseDepSet = (Set) base._dependencies.get(target);
+            for (Iterator it2 = baseDepSet.iterator(); it2.hasNext(); )
+            {
+                String source = (String) it2.next();
+                if (updatedNs.contains(source))
+                    continue;
+                depSet.add(source);
+            }
+            List fileList = new ArrayList();
+            _contributions.put(target, fileList);
+            List baseFileList = (List) base._contributions.get(target);
+            for (Iterator it2 = baseFileList.iterator(); it2.hasNext(); )
+                fileList.add(it2.next());
+        }
+    }
+
+    /**
+     * Records the list of files associated to each namespace.
+     * This is needed so that we can return a list of files that
+     * need to be compiled once we get a set of altered namespaces
+     */
+    private Map/*<String,List<String>>*/ _contributions;
+
+    void registerContribution(String ns, String fileURL)
+    {
+        List fileList = (List) _contributions.get(ns);
+        if (fileList == null)
+        {
+            fileList = new ArrayList();
+            _contributions.put(ns, fileList);
+        }
+        fileList.add(fileURL);
+    }
+
+    boolean isFileRepresented(String fileURL)
+    {
+        for (Iterator it = _contributions.values().iterator(); it.hasNext(); )
+        {
+            List fileList = (List) it.next();
+            if (fileList.contains(fileURL))
+                return true;
+        }
+        return false;
+    }
+
+    List getFilesTouched(Set updatedNs)
+    {
+        List result = new ArrayList();
+        for (Iterator it = updatedNs.iterator(); it.hasNext(); )
+        {
+            result.addAll((List) _contributions.get(it.next()));
+        }
+        return result;
+    }
+
+    List getNamespacesTouched(Set modifiedFiles)
+    {
+        List result = new ArrayList();
+        for (Iterator it = _contributions.keySet().iterator(); it.hasNext(); )
+        {
+            String ns = (String) it.next();
+            List files = (List) _contributions.get(ns);
+            for (int i = 0; i < files.size(); i++)
+                if (modifiedFiles.contains(files.get(i)))
+                    result.add(ns);
+        }
+        return result;
+    }
+}

Modified: xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/util/Base64.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/util/Base64.java?view=diff&rev=111285&p1=xmlbeans/trunk/v2/src/typeimpl/org/apache/xmlbeans/impl/util/Base64.java&r1=111277&p2=xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/util/Base64.java&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/src/typeimpl/org/apache/xmlbeans/impl/util/Base64.java	(original)
+++ xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/util/Base64.java	Wed Dec  8 08:54:26 2004
@@ -30,7 +30,7 @@
  *
  * @author Jeffrey Rodriguez
  * @author Sandy Gao
- * @version $Id: Base64.java,v 1.3 2004/09/14 02:01:28 ericvas Exp $
+ * @version $Id$
  */
 public final class  Base64 {
 

Modified: xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/util/HexBin.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/util/HexBin.java?view=diff&rev=111285&p1=xmlbeans/trunk/v2/src/typeimpl/org/apache/xmlbeans/impl/util/HexBin.java&r1=111277&p2=xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/util/HexBin.java&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/src/typeimpl/org/apache/xmlbeans/impl/util/HexBin.java	(original)
+++ xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/util/HexBin.java	Wed Dec  8 08:54:26 2004
@@ -21,7 +21,7 @@
  *
  * This class encodes/decodes hexadecimal data
  * @author Jeffrey Rodriguez
- * @version $Id: HexBin.java,v 1.2 2004/02/12 20:06:22 ericvas Exp $
+ * @version $Id$
  */
 public final class  HexBin {
     static private final int  BASELENGTH   = 255;

Modified: xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/DelegateXmlObject.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/DelegateXmlObject.java?view=diff&rev=111285&p1=xmlbeans/trunk/v2/src/xmlpublic/org/apache/xmlbeans/DelegateXmlObject.java&r1=111277&p2=xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/DelegateXmlObject.java&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/src/xmlpublic/org/apache/xmlbeans/DelegateXmlObject.java	(original)
+++ xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/DelegateXmlObject.java	Wed Dec  8 08:54:26 2004
@@ -1,13 +1,13 @@
-package org.apache.xmlbeans;
-
-/**
- * See {@link FilterXmlObject}
- */
-public interface DelegateXmlObject
-{
-    /**
-     * This method is called to obtain the underlying XmlObject.
-     * Implement this method to supply or compute the wrapped object.
-     */
-    XmlObject underlyingXmlObject();
-}
+package org.apache.xmlbeans;
+
+/**
+ * See {@link FilterXmlObject}
+ */
+public interface DelegateXmlObject
+{
+    /**
+     * This method is called to obtain the underlying XmlObject.
+     * Implement this method to supply or compute the wrapped object.
+     */
+    XmlObject underlyingXmlObject();
+}

Modified: xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/SchemaCodePrinter.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/SchemaCodePrinter.java?view=diff&rev=111285&p1=xmlbeans/trunk/v2/src/xmlpublic/org/apache/xmlbeans/SchemaCodePrinter.java&r1=111277&p2=xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/SchemaCodePrinter.java&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/src/xmlpublic/org/apache/xmlbeans/SchemaCodePrinter.java	(original)
+++ xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/SchemaCodePrinter.java	Wed Dec  8 08:54:26 2004
@@ -1,40 +1,40 @@
-/*   Copyright 2004 The Apache Software Foundation
- *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package org.apache.xmlbeans;
-
-import java.io.Writer;
-import java.io.IOException;
-
-/**
- * This class is used to provide alternate implementations of the
- * schema Java code generation.
- */
-
-public interface SchemaCodePrinter
-{
-    public void printTypeImpl(Writer writer, SchemaType sType)
-        throws IOException;
-    
-    public void printType(Writer writer, SchemaType sType)
-        throws IOException;
-    
-    /**
-     * @deprecated Obsoleted by functionality in {@link SchemaTypeSystem.save()}
-     */
-    public void printLoader(Writer writer, SchemaTypeSystem system)
-        throws IOException;
-}
-
+/*   Copyright 2004 The Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.apache.xmlbeans;
+
+import java.io.Writer;
+import java.io.IOException;
+
+/**
+ * This class is used to provide alternate implementations of the
+ * schema Java code generation.
+ */
+
+public interface SchemaCodePrinter
+{
+    public void printTypeImpl(Writer writer, SchemaType sType)
+        throws IOException;
+    
+    public void printType(Writer writer, SchemaType sType)
+        throws IOException;
+    
+    /**
+     * @deprecated Obsoleted by functionality in {@link SchemaTypeSystem.save()}
+     */
+    public void printLoader(Writer writer, SchemaTypeSystem system)
+        throws IOException;
+}
+

Modified: xmlbeans/trunk/test/cases/xbean/ValidatingStream/CarLocationMessage-inv.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/ValidatingStream/CarLocationMessage-inv.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/ValidatingStream/CarLocationMessage-inv.xml&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/ValidatingStream/CarLocationMessage-inv.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/ValidatingStream/CarLocationMessage-inv.xml	(original)
+++ xmlbeans/trunk/test/cases/xbean/ValidatingStream/CarLocationMessage-inv.xml	Wed Dec  8 08:54:26 2004
@@ -1,38 +1,38 @@
-<CarLocationMessage xmlns="http://www.tranxml.org/TranXML/Version4.0" xmlns:xsi="http://www.w3.org/2000/10/XMLSchema-instance" xsi:schemaLocation="http://www.tranxml.org/TranXML/Version4.0 ..\schemas\CarLocationMessage.xsd" Transaction="CLM" Version="CLM">
-	<FleetID>FLEETNAME</FleetID>
-	<StandardCarrierAlphaCode>CSXT</StandardCarrierAlphaCode>
-	<EventStatus>
-		<EquipmentStructure>
-			<Initial>GATX</Initial>
-			<EquipmentNumber>123456</EquipmentNumber>
-			<LoadEmptyCode>L</LoadEmptyCode>
-		</EquipmentStructure>
-		<Date>2001-03-23</Date>
-		<Time>12:34</Time>
-		<EventStatusCode>
-			<RailStatusCode>P</RailStatusCode>
-		</EventStatusCode>
-		<ReasonCode>Q12345</ReasonCode>
-		<GeographicLocation>
-			<CityName>DALLAS</CityName>
-			<StateOrProvinceCode>TX</StateOrProvinceCode>
-		</GeographicLocation>
-		<StandardCarrierAlphaCode>CSXT</StandardCarrierAlphaCode>
-		<Destination>
-			<GeographicLocation>
-				<CityName>DALLAS</CityName>
-				<StateOrProvinceCode>TX</StateOrProvinceCode>
-			</GeographicLocation>
-		</Destination>
-		<ETA>
-			<GeographicLocation>
-				<CityName>DALLAS</CityName>
-				<StateOrProvinceCode>TX</StateOrProvinceCode>
-			</GeographicLocation>
-			<Date>2001-03-23</Date>
-			<Time>12:34</Time>
-			<ETA_Code>P</ETA_Code>
-		</ETA>
-		<AEI_IndicatorCode>Y</AEI_IndicatorCode>
-	</EventStatus>
-</CarLocationMessage>
+<CarLocationMessage xmlns="http://www.tranxml.org/TranXML/Version4.0" xmlns:xsi="http://www.w3.org/2000/10/XMLSchema-instance" xsi:schemaLocation="http://www.tranxml.org/TranXML/Version4.0 ..\schemas\CarLocationMessage.xsd" Transaction="CLM" Version="CLM">
+	<FleetID>FLEETNAME</FleetID>
+	<StandardCarrierAlphaCode>CSXT</StandardCarrierAlphaCode>
+	<EventStatus>
+		<EquipmentStructure>
+			<Initial>GATX</Initial>
+			<EquipmentNumber>123456</EquipmentNumber>
+			<LoadEmptyCode>L</LoadEmptyCode>
+		</EquipmentStructure>
+		<Date>2001-03-23</Date>
+		<Time>12:34</Time>
+		<EventStatusCode>
+			<RailStatusCode>P</RailStatusCode>
+		</EventStatusCode>
+		<ReasonCode>Q12345</ReasonCode>
+		<GeographicLocation>
+			<CityName>DALLAS</CityName>
+			<StateOrProvinceCode>TX</StateOrProvinceCode>
+		</GeographicLocation>
+		<StandardCarrierAlphaCode>CSXT</StandardCarrierAlphaCode>
+		<Destination>
+			<GeographicLocation>
+				<CityName>DALLAS</CityName>
+				<StateOrProvinceCode>TX</StateOrProvinceCode>
+			</GeographicLocation>
+		</Destination>
+		<ETA>
+			<GeographicLocation>
+				<CityName>DALLAS</CityName>
+				<StateOrProvinceCode>TX</StateOrProvinceCode>
+			</GeographicLocation>
+			<Date>2001-03-23</Date>
+			<Time>12:34</Time>
+			<ETA_Code>P</ETA_Code>
+		</ETA>
+		<AEI_IndicatorCode>Y</AEI_IndicatorCode>
+	</EventStatus>
+</CarLocationMessage>

Modified: xmlbeans/trunk/test/cases/xbean/ValidatingStream/CarLocationMessage.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/ValidatingStream/CarLocationMessage.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/ValidatingStream/CarLocationMessage.xml&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/ValidatingStream/CarLocationMessage.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/ValidatingStream/CarLocationMessage.xml	(original)
+++ xmlbeans/trunk/test/cases/xbean/ValidatingStream/CarLocationMessage.xml	Wed Dec  8 08:54:26 2004
@@ -1,38 +1,38 @@
-<CarLocationMessage xmlns="http://www.tranxml.org/TranXML/Version4.0" xmlns:xsi="http://www.w3.org/2000/10/XMLSchema-instance" xsi:schemaLocation="http://www.tranxml.org/TranXML/Version4.0 ..\schemas\CarLocationMessage.xsd" Transaction="CLM" Version="CLM">
-	<FleetID>FLEETNAME</FleetID>
-	<StandardCarrierAlphaCode>CSXT</StandardCarrierAlphaCode>
-	<EventStatus>
-		<EquipmentStructure>
-			<Initial>GATX</Initial>
-			<EquipmentNumber>123456</EquipmentNumber>
-			<LoadEmptyCode>L</LoadEmptyCode>
-		</EquipmentStructure>
-		<Date>2001-03-23</Date>
-		<Time>12:34</Time>
-		<EventStatusCode>
-			<RailStatusCode>P</RailStatusCode>
-		</EventStatusCode>
-		<ReasonCode>Q12345</ReasonCode>
-		<GeographicLocation>
-			<CityName>DALLAS</CityName>
-			<StateOrProvinceCode>TX</StateOrProvinceCode>
-		</GeographicLocation>
-		<StandardCarrierAlphaCode>CSXT</StandardCarrierAlphaCode>
-		<Destination>
-			<GeographicLocation>
-				<CityName>DALLAS</CityName>
-				<StateOrProvinceCode>TX</StateOrProvinceCode>
-			</GeographicLocation>
-		</Destination>
-		<ETA>
-			<GeographicLocation>
-				<CityName>DALLAS</CityName>
-				<StateOrProvinceCode>TX</StateOrProvinceCode>
-			</GeographicLocation>
-			<Date>2001-03-23</Date>
-			<Time>12:34</Time>
-			<ETA_Code>P</ETA_Code>
-		</ETA>
-		<AEI_IndicatorCode>Y</AEI_IndicatorCode>
-	</EventStatus>
-</CarLocationMessage>
+<CarLocationMessage xmlns="http://www.tranxml.org/TranXML/Version4.0" xmlns:xsi="http://www.w3.org/2000/10/XMLSchema-instance" xsi:schemaLocation="http://www.tranxml.org/TranXML/Version4.0 ..\schemas\CarLocationMessage.xsd" Transaction="CLM" Version="CLM">
+	<FleetID>FLEETNAME</FleetID>
+	<StandardCarrierAlphaCode>CSXT</StandardCarrierAlphaCode>
+	<EventStatus>
+		<EquipmentStructure>
+			<Initial>GATX</Initial>
+			<EquipmentNumber>123456</EquipmentNumber>
+			<LoadEmptyCode>L</LoadEmptyCode>
+		</EquipmentStructure>
+		<Date>2001-03-23</Date>
+		<Time>12:34</Time>
+		<EventStatusCode>
+			<RailStatusCode>P</RailStatusCode>
+		</EventStatusCode>
+		<ReasonCode>Q12345</ReasonCode>
+		<GeographicLocation>
+			<CityName>DALLAS</CityName>
+			<StateOrProvinceCode>TX</StateOrProvinceCode>
+		</GeographicLocation>
+		<StandardCarrierAlphaCode>CSXT</StandardCarrierAlphaCode>
+		<Destination>
+			<GeographicLocation>
+				<CityName>DALLAS</CityName>
+				<StateOrProvinceCode>TX</StateOrProvinceCode>
+			</GeographicLocation>
+		</Destination>
+		<ETA>
+			<GeographicLocation>
+				<CityName>DALLAS</CityName>
+				<StateOrProvinceCode>TX</StateOrProvinceCode>
+			</GeographicLocation>
+			<Date>2001-03-23</Date>
+			<Time>12:34</Time>
+			<ETA_Code>P</ETA_Code>
+		</ETA>
+		<AEI_IndicatorCode>Y</AEI_IndicatorCode>
+	</EventStatus>
+</CarLocationMessage>

Modified: xmlbeans/trunk/test/cases/xbean/ValidatingStream/Employees.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/ValidatingStream/Employees.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/ValidatingStream/Employees.xml&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/ValidatingStream/Employees.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/ValidatingStream/Employees.xml	(original)
+++ xmlbeans/trunk/test/cases/xbean/ValidatingStream/Employees.xml	Wed Dec  8 08:54:26 2004
@@ -1,56 +1,56 @@
-<xq:employees xmlns:xq="http://openuri.org/bea/samples/workshop/xmlBeans/xquery">
-  <xq:employee>
-    <xq:name>Fred Jones</xq:name>
-    <xq:address location="home">
-      <xq:street>900 Aurora Ave.</xq:street>
-      <xq:city>Seattle</xq:city>
-      <xq:state>WA</xq:state>
-      <xq:zip>98115</xq:zip>
-    </xq:address>
-    <xq:address location="work">
-      <xq:street>2011 152nd Avenue NE</xq:street>
-      <xq:city>Redmond</xq:city>
-      <xq:state>WA</xq:state>
-      <xq:zip>98052</xq:zip>
-    </xq:address>
-    <xq:phone location="work">(425)555-5665</xq:phone>
-    <xq:phone location="home">(206)555-5555</xq:phone>
-    <xq:phone location="mobile">(206)555-4321</xq:phone>
-  </xq:employee>
-  <xq:employee>
-    <xq:name>Sally Smith</xq:name>
-    <xq:address location="home">
-      <xq:street>1430 Oak Place</xq:street>
-      <xq:city>Salem</xq:city>
-      <xq:state>OR</xq:state>
-      <xq:zip>97125</xq:zip>
-    </xq:address>
-    <xq:address location="work">
-      <xq:street>765 Main St.</xq:street>
-      <xq:city>Kaiser</xq:city>
-      <xq:state>OR</xq:state>
-      <xq:zip>97103</xq:zip>
-    </xq:address>
-    <xq:phone location="work">(503)555-3856</xq:phone>
-    <xq:phone location="home">(503)555-6951</xq:phone>
-    <xq:phone location="mobile">(503)555-5152</xq:phone>
-  </xq:employee>
-  <xq:employee>
-    <xq:name>Gladys Kravitz</xq:name>
-    <xq:address location="home">
-      <xq:street>1313 Mockingbird Lane</xq:street>
-      <xq:city>Seattle</xq:city>
-      <xq:state>WA</xq:state>
-      <xq:zip>98115</xq:zip>
-    </xq:address>
-    <xq:address location="work">
-      <xq:street>2011 152nd Avenue NE</xq:street>
-      <xq:city>Redmond</xq:city>
-      <xq:state>WA</xq:state>
-      <xq:zip>98052</xq:zip>
-    </xq:address>
-    <xq:phone location="work">(425)555-6897</xq:phone>
-    <xq:phone location="home">(206)555-6594</xq:phone>
-    <xq:phone location="mobile">(206)555-7894</xq:phone>
-  </xq:employee>
-</xq:employees>
+<xq:employees xmlns:xq="http://openuri.org/bea/samples/workshop/xmlBeans/xquery">
+  <xq:employee>
+    <xq:name>Fred Jones</xq:name>
+    <xq:address location="home">
+      <xq:street>900 Aurora Ave.</xq:street>
+      <xq:city>Seattle</xq:city>
+      <xq:state>WA</xq:state>
+      <xq:zip>98115</xq:zip>
+    </xq:address>
+    <xq:address location="work">
+      <xq:street>2011 152nd Avenue NE</xq:street>
+      <xq:city>Redmond</xq:city>
+      <xq:state>WA</xq:state>
+      <xq:zip>98052</xq:zip>
+    </xq:address>
+    <xq:phone location="work">(425)555-5665</xq:phone>
+    <xq:phone location="home">(206)555-5555</xq:phone>
+    <xq:phone location="mobile">(206)555-4321</xq:phone>
+  </xq:employee>
+  <xq:employee>
+    <xq:name>Sally Smith</xq:name>
+    <xq:address location="home">
+      <xq:street>1430 Oak Place</xq:street>
+      <xq:city>Salem</xq:city>
+      <xq:state>OR</xq:state>
+      <xq:zip>97125</xq:zip>
+    </xq:address>
+    <xq:address location="work">
+      <xq:street>765 Main St.</xq:street>
+      <xq:city>Kaiser</xq:city>
+      <xq:state>OR</xq:state>
+      <xq:zip>97103</xq:zip>
+    </xq:address>
+    <xq:phone location="work">(503)555-3856</xq:phone>
+    <xq:phone location="home">(503)555-6951</xq:phone>
+    <xq:phone location="mobile">(503)555-5152</xq:phone>
+  </xq:employee>
+  <xq:employee>
+    <xq:name>Gladys Kravitz</xq:name>
+    <xq:address location="home">
+      <xq:street>1313 Mockingbird Lane</xq:street>
+      <xq:city>Seattle</xq:city>
+      <xq:state>WA</xq:state>
+      <xq:zip>98115</xq:zip>
+    </xq:address>
+    <xq:address location="work">
+      <xq:street>2011 152nd Avenue NE</xq:street>
+      <xq:city>Redmond</xq:city>
+      <xq:state>WA</xq:state>
+      <xq:zip>98052</xq:zip>
+    </xq:address>
+    <xq:phone location="work">(425)555-6897</xq:phone>
+    <xq:phone location="home">(206)555-6594</xq:phone>
+    <xq:phone location="mobile">(206)555-7894</xq:phone>
+  </xq:employee>
+</xq:employees>

Modified: xmlbeans/trunk/test/cases/xbean/ValidatingStream/global-attr.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/ValidatingStream/global-attr.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/ValidatingStream/global-attr.xml&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/ValidatingStream/global-attr.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/ValidatingStream/global-attr.xml	(original)
+++ xmlbeans/trunk/test/cases/xbean/ValidatingStream/global-attr.xml	Wed Dec  8 08:54:26 2004
@@ -1,3 +1,3 @@
-<xml-fragment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xmlns:test="http://openuri.org/testNumerals"
+<xml-fragment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xmlns:test="http://openuri.org/testNumerals"
               test:price="5"/>

Modified: xmlbeans/trunk/test/cases/xbean/ValidatingStream/location-inv.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/ValidatingStream/location-inv.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/ValidatingStream/location-inv.xml&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/ValidatingStream/location-inv.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/ValidatingStream/location-inv.xml	(original)
+++ xmlbeans/trunk/test/cases/xbean/ValidatingStream/location-inv.xml	Wed Dec  8 08:54:26 2004
@@ -1,11 +1,11 @@
-<?xml version="1.0"?>
-<lo:Location xmlns:lo="http://openuri.org/test/Location"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<CityName>Bellevue</CityName>
-	<StateCode>WA</StateCode>
-	<PostalCode>98033</PostalCode>
-	<CountryCode>USA</CountryCode>
-	<LocationIdentifier>NA</LocationIdentifier>
-	<SubdivisionCode>1234</SubdivisionCode>
-    <NonExisitent/>
-</lo:Location>
+<?xml version="1.0"?>
+<lo:Location xmlns:lo="http://openuri.org/test/Location"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<CityName>Bellevue</CityName>
+	<StateCode>WA</StateCode>
+	<PostalCode>98033</PostalCode>
+	<CountryCode>USA</CountryCode>
+	<LocationIdentifier>NA</LocationIdentifier>
+	<SubdivisionCode>1234</SubdivisionCode>
+    <NonExisitent/>
+</lo:Location>

Modified: xmlbeans/trunk/test/cases/xbean/ValidatingStream/location.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/ValidatingStream/location.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/ValidatingStream/location.xml&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/ValidatingStream/location.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/ValidatingStream/location.xml	(original)
+++ xmlbeans/trunk/test/cases/xbean/ValidatingStream/location.xml	Wed Dec  8 08:54:26 2004
@@ -1,10 +1,10 @@
-<?xml version="1.0"?>
-<lo:Location xmlns:lo="http://openuri.org/test/Location"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<lo:CityName>Bellevue</lo:CityName>
-	<lo:StateCode>WA</lo:StateCode>
-	<lo:PostalCode>98033</lo:PostalCode>
-	<lo:CountryCode>USA</lo:CountryCode>
-	<lo:LocationIdentifier>NA</lo:LocationIdentifier>
-	<lo:SubdivisionCode>1234</lo:SubdivisionCode>
-</lo:Location>
+<?xml version="1.0"?>
+<lo:Location xmlns:lo="http://openuri.org/test/Location"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<lo:CityName>Bellevue</lo:CityName>
+	<lo:StateCode>WA</lo:StateCode>
+	<lo:PostalCode>98033</lo:PostalCode>
+	<lo:CountryCode>USA</lo:CountryCode>
+	<lo:LocationIdentifier>NA</lo:LocationIdentifier>
+	<lo:SubdivisionCode>1234</lo:SubdivisionCode>
+</lo:Location>

Modified: xmlbeans/trunk/test/cases/xbean/ValidatingStream/location.xsd
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/ValidatingStream/location.xsd?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/ValidatingStream/location.xsd&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/ValidatingStream/location.xsd&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/ValidatingStream/location.xsd	(original)
+++ xmlbeans/trunk/test/cases/xbean/ValidatingStream/location.xsd	Wed Dec  8 08:54:26 2004
@@ -1,27 +1,27 @@
-<xsd:schema targetNamespace="http://openuri.org/test/Location"
-            xmlns:tns="http://openuri.org/test/Location"
-            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            elementFormDefault="qualified">
-	<xsd:element name="Location">
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element ref="tns:CityName" minOccurs="0"/>
-				<xsd:element ref="tns:StateCode" minOccurs="0"/>
-				<xsd:element ref="tns:PostalCode" minOccurs="0"/>
-				<xsd:element ref="tns:CountryCode" minOccurs="0"/>
-				<xsd:choice minOccurs="0">
-					<xsd:element ref="tns:LocationIdentifier"/>
-					<xsd:element ref="tns:SPLC"/>
-				</xsd:choice>
-				<xsd:element ref="tns:SubdivisionCode" minOccurs="0"/>
-			</xsd:sequence>
-		</xsd:complexType>
-	</xsd:element>
-	<xsd:element name="CityName" type="xsd:string"/>
-	<xsd:element name="StateCode" type="xsd:string"/>
-	<xsd:element name="PostalCode" type="xsd:string"/>
-	<xsd:element name="CountryCode" type="xsd:string"/>
-	<xsd:element name="LocationIdentifier" type="xsd:string"/>
-	<xsd:element name="SPLC" type="xsd:string"/>
-	<xsd:element name="SubdivisionCode" type="xsd:string"/>
-</xsd:schema>
+<xsd:schema targetNamespace="http://openuri.org/test/Location"
+            xmlns:tns="http://openuri.org/test/Location"
+            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            elementFormDefault="qualified">
+	<xsd:element name="Location">
+		<xsd:complexType>
+			<xsd:sequence>
+				<xsd:element ref="tns:CityName" minOccurs="0"/>
+				<xsd:element ref="tns:StateCode" minOccurs="0"/>
+				<xsd:element ref="tns:PostalCode" minOccurs="0"/>
+				<xsd:element ref="tns:CountryCode" minOccurs="0"/>
+				<xsd:choice minOccurs="0">
+					<xsd:element ref="tns:LocationIdentifier"/>
+					<xsd:element ref="tns:SPLC"/>
+				</xsd:choice>
+				<xsd:element ref="tns:SubdivisionCode" minOccurs="0"/>
+			</xsd:sequence>
+		</xsd:complexType>
+	</xsd:element>
+	<xsd:element name="CityName" type="xsd:string"/>
+	<xsd:element name="StateCode" type="xsd:string"/>
+	<xsd:element name="PostalCode" type="xsd:string"/>
+	<xsd:element name="CountryCode" type="xsd:string"/>
+	<xsd:element name="LocationIdentifier" type="xsd:string"/>
+	<xsd:element name="SPLC" type="xsd:string"/>
+	<xsd:element name="SubdivisionCode" type="xsd:string"/>
+</xsd:schema>

Modified: xmlbeans/trunk/test/cases/xbean/ValidatingStream/mixed-content-inv.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/ValidatingStream/mixed-content-inv.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/ValidatingStream/mixed-content-inv.xml&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/ValidatingStream/mixed-content-inv.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/ValidatingStream/mixed-content-inv.xml	(original)
+++ xmlbeans/trunk/test/cases/xbean/ValidatingStream/mixed-content-inv.xml	Wed Dec  8 08:54:26 2004
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mix:Letter xmlns:mix="http://openuri.org/test/MixedContent"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    Your Order is being Shipped.
-    <mix:name>John Doe</mix:name>
-    <mix:orderid>1000</mix:orderid>
-    Your expected Ship-date is: <mix:shipdate>2004-12-12</mix:shipdate>
-    Thank you for your order
+<?xml version="1.0" encoding="UTF-8"?>
+<mix:Letter xmlns:mix="http://openuri.org/test/MixedContent"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    Your Order is being Shipped.
+    <mix:name>John Doe</mix:name>
+    <mix:orderid>1000</mix:orderid>
+    Your expected Ship-date is: <mix:shipdate>2004-12-12</mix:shipdate>
+    Thank you for your order
 </mix:Letter>

Modified: xmlbeans/trunk/test/cases/xbean/ValidatingStream/mixed-content.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/ValidatingStream/mixed-content.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/ValidatingStream/mixed-content.xml&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/ValidatingStream/mixed-content.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/ValidatingStream/mixed-content.xml	(original)
+++ xmlbeans/trunk/test/cases/xbean/ValidatingStream/mixed-content.xml	Wed Dec  8 08:54:26 2004
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mix:Letter xmlns:mix="http://openuri.org/test/MixedContent"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    Your Order is being Shipped.
-    <mix:name>John Doe</mix:name>
-    <mix:orderid>1000</mix:orderid>
-    Your expected Ship-date is: <mix:shipdate>2004-12-12</mix:shipdate>
-    Thank you for your order
+<?xml version="1.0" encoding="UTF-8"?>
+<mix:Letter xmlns:mix="http://openuri.org/test/MixedContent"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    Your Order is being Shipped.
+    <mix:name>John Doe</mix:name>
+    <mix:orderid>1000</mix:orderid>
+    Your expected Ship-date is: <mix:shipdate>2004-12-12</mix:shipdate>
+    Thank you for your order
 </mix:Letter>

Modified: xmlbeans/trunk/test/cases/xbean/ValidatingStream/mixed-content.xsd
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/ValidatingStream/mixed-content.xsd?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/ValidatingStream/mixed-content.xsd&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/ValidatingStream/mixed-content.xsd&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/ValidatingStream/mixed-content.xsd	(original)
+++ xmlbeans/trunk/test/cases/xbean/ValidatingStream/mixed-content.xsd	Wed Dec  8 08:54:26 2004
@@ -1,25 +1,25 @@
-<xsd:schema targetNamespace="http://openuri.org/test/MixedContent"
-            xmlns:tns="http://openuri.org/test/MixedContent"
-            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            elementFormDefault="qualified">
-
-    <xsd:element name="Letter" type="tns:letterType"/>
-
-    <xsd:complexType name="letterType" mixed="true">
-        <xsd:sequence>
-            <xsd:element name="name" type="xsd:string"/>
-            <xsd:element name="orderid" type="xsd:positiveInteger"/>
-            <xsd:element name="shipdate" type="xsd:date"/>
-        </xsd:sequence>
-    </xsd:complexType>
-
-    <xsd:element name="NoMixed" type="tns:letterTypeNoMixed"/>
-    
-    <xsd:complexType name="letterTypeNoMixed" mixed="false">
-        <xsd:sequence>
-            <xsd:element name="name" type="xsd:string"/>
-            <xsd:element name="orderid" type="xsd:positiveInteger"/>
-            <xsd:element name="shipdate" type="xsd:date"/>
-        </xsd:sequence>
-    </xsd:complexType>
+<xsd:schema targetNamespace="http://openuri.org/test/MixedContent"
+            xmlns:tns="http://openuri.org/test/MixedContent"
+            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            elementFormDefault="qualified">
+
+    <xsd:element name="Letter" type="tns:letterType"/>
+
+    <xsd:complexType name="letterType" mixed="true">
+        <xsd:sequence>
+            <xsd:element name="name" type="xsd:string"/>
+            <xsd:element name="orderid" type="xsd:positiveInteger"/>
+            <xsd:element name="shipdate" type="xsd:date"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:element name="NoMixed" type="tns:letterTypeNoMixed"/>
+    
+    <xsd:complexType name="letterTypeNoMixed" mixed="false">
+        <xsd:sequence>
+            <xsd:element name="name" type="xsd:string"/>
+            <xsd:element name="orderid" type="xsd:positiveInteger"/>
+            <xsd:element name="shipdate" type="xsd:date"/>
+        </xsd:sequence>
+    </xsd:complexType>
 </xsd:schema>

Modified: xmlbeans/trunk/test/cases/xbean/ValidatingStream/nomixed-content-inv.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/ValidatingStream/nomixed-content-inv.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/ValidatingStream/nomixed-content-inv.xml&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/ValidatingStream/nomixed-content-inv.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/ValidatingStream/nomixed-content-inv.xml	(original)
+++ xmlbeans/trunk/test/cases/xbean/ValidatingStream/nomixed-content-inv.xml	Wed Dec  8 08:54:26 2004
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mix:NoMixed xmlns:mix="http://openuri.org/test/MixedContent"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    Your Order is being Shipped.
-    <mix:name>John Doe</mix:name>
-    <mix:orderid>1000</mix:orderid>
-    Your expected Ship-date is: <mix:shipdate>2004-12-12</mix:shipdate>
-    Thank you for your order
+<?xml version="1.0" encoding="UTF-8"?>
+<mix:NoMixed xmlns:mix="http://openuri.org/test/MixedContent"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    Your Order is being Shipped.
+    <mix:name>John Doe</mix:name>
+    <mix:orderid>1000</mix:orderid>
+    Your expected Ship-date is: <mix:shipdate>2004-12-12</mix:shipdate>
+    Thank you for your order
 </mix:NoMixed>

Modified: xmlbeans/trunk/test/cases/xbean/ValidatingStream/numerals.xsd
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/ValidatingStream/numerals.xsd?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/ValidatingStream/numerals.xsd&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/ValidatingStream/numerals.xsd&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/ValidatingStream/numerals.xsd	(original)
+++ xmlbeans/trunk/test/cases/xbean/ValidatingStream/numerals.xsd	Wed Dec  8 08:54:26 2004
@@ -1,34 +1,34 @@
-<xs:schema
-   xmlns:xs='http://www.w3.org/2001/XMLSchema'
-   targetNamespace='http://openuri.org/test/Numerals'
-   elementFormDefault='qualified'>
-  <xs:element name='doc'>
-    <xs:complexType>
-      <xs:sequence>
-        <xs:choice minOccurs='0' maxOccurs='unbounded'>
-          <xs:element name='int' type='xs:int' />
-          <xs:element name='short' type='xs:short' />
-          <xs:element name='byte' type='xs:byte' />
-          <xs:element name='double' type='xs:double' />
-          <xs:element name='float' type='xs:float' />
-          <xs:element name='boolean' type='xs:boolean' />
-          <xs:element name='string' type='xs:string' />
-          <xs:element name='decimal' type='xs:decimal' />
-          <xs:element name='integer' type='xs:integer' />
-          <xs:element name='long' type='xs:long' />
-          <xs:element name='hexBinary' type='xs:hexBinary' />
-          <xs:element name='base64Binary' type='xs:base64Binary' />
-          <xs:element name='date' type='xs:date' />
-          <xs:element name='dateTime' type='xs:dateTime' />
-          <xs:element name='gYearMonth' type='xs:gYearMonth' />
-          <xs:element name='duration' type='xs:duration' />
-          <xs:element name='QName' type='xs:QName' />
-        </xs:choice>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:attribute name='price' type='xs:float' />
-  <xs:attribute name='quant' type='xs:byte' />
-    
+<xs:schema
+   xmlns:xs='http://www.w3.org/2001/XMLSchema'
+   targetNamespace='http://openuri.org/test/Numerals'
+   elementFormDefault='qualified'>
+  <xs:element name='doc'>
+    <xs:complexType>
+      <xs:sequence>
+        <xs:choice minOccurs='0' maxOccurs='unbounded'>
+          <xs:element name='int' type='xs:int' />
+          <xs:element name='short' type='xs:short' />
+          <xs:element name='byte' type='xs:byte' />
+          <xs:element name='double' type='xs:double' />
+          <xs:element name='float' type='xs:float' />
+          <xs:element name='boolean' type='xs:boolean' />
+          <xs:element name='string' type='xs:string' />
+          <xs:element name='decimal' type='xs:decimal' />
+          <xs:element name='integer' type='xs:integer' />
+          <xs:element name='long' type='xs:long' />
+          <xs:element name='hexBinary' type='xs:hexBinary' />
+          <xs:element name='base64Binary' type='xs:base64Binary' />
+          <xs:element name='date' type='xs:date' />
+          <xs:element name='dateTime' type='xs:dateTime' />
+          <xs:element name='gYearMonth' type='xs:gYearMonth' />
+          <xs:element name='duration' type='xs:duration' />
+          <xs:element name='QName' type='xs:QName' />
+        </xs:choice>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attribute name='price' type='xs:float' />
+  <xs:attribute name='quant' type='xs:byte' />
+    
 </xs:schema>

Modified: xmlbeans/trunk/test/cases/xbean/ValidatingStream/person-frag.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/ValidatingStream/person-frag.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/ValidatingStream/person-frag.xml&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/ValidatingStream/person-frag.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/ValidatingStream/person-frag.xml	(original)
+++ xmlbeans/trunk/test/cases/xbean/ValidatingStream/person-frag.xml	Wed Dec  8 08:54:26 2004
@@ -1,6 +1,6 @@
-<xml-fragment>
-        <per:First xmlns:per="http://openuri.org/test/Person"
-                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Person</per:First>
-        <per:Last xmlns:per="http://openuri.org/test/Person"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Two</per:Last>
+<xml-fragment>
+        <per:First xmlns:per="http://openuri.org/test/Person"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Person</per:First>
+        <per:Last xmlns:per="http://openuri.org/test/Person"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Two</per:Last>
 </xml-fragment>

Modified: xmlbeans/trunk/test/cases/xbean/ValidatingStream/person-frag2.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/ValidatingStream/person-frag2.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/ValidatingStream/person-frag2.xml&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/ValidatingStream/person-frag2.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/ValidatingStream/person-frag2.xml	(original)
+++ xmlbeans/trunk/test/cases/xbean/ValidatingStream/person-frag2.xml	Wed Dec  8 08:54:26 2004
@@ -1,5 +1,5 @@
-<xml-fragment><per:First xmlns:per="http://openuri.org/test/Person"
-                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Person</per:First>
-        <per:Last xmlns:per="http://openuri.org/test/Person"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Two</per:Last>
+<xml-fragment><per:First xmlns:per="http://openuri.org/test/Person"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Person</per:First>
+        <per:Last xmlns:per="http://openuri.org/test/Person"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Two</per:Last>
 </xml-fragment>

Modified: xmlbeans/trunk/test/cases/xbean/ValidatingStream/person-inv.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/ValidatingStream/person-inv.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/ValidatingStream/person-inv.xml&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/ValidatingStream/person-inv.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/ValidatingStream/person-inv.xml	(original)
+++ xmlbeans/trunk/test/cases/xbean/ValidatingStream/person-inv.xml	Wed Dec  8 08:54:26 2004
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<per:Person xmlns:per="http://openuri.org/test/Person"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    Sex="male" Birthday="1967-08-13">
-	<per:Name>
-		<per:First>Person</per:First>
-		<per:Last>One</per:Last>
-	</per:Name>
-	<per:Sibling Sex="male" Birthday="1967-08-13">
-		<per:Name>
-			<per:First>Person</per:First>
-			<per:Last>Two</per:Last>
-		</per:Name>
-        <per:Sibling Sex="female" Birthday="1992-14-12">
-            <per:Name>
-                <per:First>Person</per:First>
-                <per:Last>Three</per:Last>
-            </per:Name>
-        </per:Sibling>
-	</per:Sibling>
-</per:Person>
+<?xml version="1.0" encoding="UTF-8"?>
+<per:Person xmlns:per="http://openuri.org/test/Person"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    Sex="male" Birthday="1967-08-13">
+	<per:Name>
+		<per:First>Person</per:First>
+		<per:Last>One</per:Last>
+	</per:Name>
+	<per:Sibling Sex="male" Birthday="1967-08-13">
+		<per:Name>
+			<per:First>Person</per:First>
+			<per:Last>Two</per:Last>
+		</per:Name>
+        <per:Sibling Sex="female" Birthday="1992-14-12">
+            <per:Name>
+                <per:First>Person</per:First>
+                <per:Last>Three</per:Last>
+            </per:Name>
+        </per:Sibling>
+	</per:Sibling>
+</per:Person>

Modified: xmlbeans/trunk/test/cases/xbean/ValidatingStream/person-justname-inv.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/ValidatingStream/person-justname-inv.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/ValidatingStream/person-justname-inv.xml&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/ValidatingStream/person-justname-inv.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/ValidatingStream/person-justname-inv.xml	(original)
+++ xmlbeans/trunk/test/cases/xbean/ValidatingStream/person-justname-inv.xml	Wed Dec  8 08:54:26 2004
@@ -1,6 +1,6 @@
-<per:Name xmlns:per="http://openuri.org/test/Person"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <per:First>Person</per:First>
-    <per:Last>Two</per:Last>
-    <per:Middle>M</per:Middle>
+<per:Name xmlns:per="http://openuri.org/test/Person"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <per:First>Person</per:First>
+    <per:Last>Two</per:Last>
+    <per:Middle>M</per:Middle>
 </per:Name>

Modified: xmlbeans/trunk/test/cases/xbean/ValidatingStream/person-justname.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/ValidatingStream/person-justname.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/ValidatingStream/person-justname.xml&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/ValidatingStream/person-justname.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/ValidatingStream/person-justname.xml	(original)
+++ xmlbeans/trunk/test/cases/xbean/ValidatingStream/person-justname.xml	Wed Dec  8 08:54:26 2004
@@ -1,7 +1,7 @@
-<per:Name xmlns:per="http://openuri.org/test/Person"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:type="per:middlename">
-    <per:First>Person</per:First>
-    <per:Last>Two</per:Last>
-    <per:Middle>M</per:Middle>
-</per:Name>
+<per:Name xmlns:per="http://openuri.org/test/Person"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:type="per:middlename">
+    <per:First>Person</per:First>
+    <per:Last>Two</per:Last>
+    <per:Middle>M</per:Middle>
+</per:Name>

Modified: xmlbeans/trunk/test/cases/xbean/ValidatingStream/person-sibling-inv.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/ValidatingStream/person-sibling-inv.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/ValidatingStream/person-sibling-inv.xml&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/ValidatingStream/person-sibling-inv.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/ValidatingStream/person-sibling-inv.xml	(original)
+++ xmlbeans/trunk/test/cases/xbean/ValidatingStream/person-sibling-inv.xml	Wed Dec  8 08:54:26 2004
@@ -1,17 +1,17 @@
-<per:Sibling Sex="male" Birthday="1967-14-13"
-             xmlns:per="http://openuri.org/test/Person"
-             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <per:Name xmlns:per="http://openuri.org/test/Person"
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <per:First>Person</per:First>
-        <per:Last>Two</per:Last>
-    </per:Name>
-    <per:Sibling Sex="female" Birthday="1992-11-12"
-                xmlns:per="http://openuri.org/test/Person"
-                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <per:Name>
-            <per:First>Person</per:First>
-            <per:Last>Three</per:Last>
-        </per:Name>
-    </per:Sibling>
+<per:Sibling Sex="male" Birthday="1967-14-13"
+             xmlns:per="http://openuri.org/test/Person"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <per:Name xmlns:per="http://openuri.org/test/Person"
+              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+        <per:First>Person</per:First>
+        <per:Last>Two</per:Last>
+    </per:Name>
+    <per:Sibling Sex="female" Birthday="1992-11-12"
+                xmlns:per="http://openuri.org/test/Person"
+                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+        <per:Name>
+            <per:First>Person</per:First>
+            <per:Last>Three</per:Last>
+        </per:Name>
+    </per:Sibling>
 </per:Sibling>

Modified: xmlbeans/trunk/test/cases/xbean/ValidatingStream/person-sibling.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/ValidatingStream/person-sibling.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/ValidatingStream/person-sibling.xml&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/ValidatingStream/person-sibling.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/ValidatingStream/person-sibling.xml	(original)
+++ xmlbeans/trunk/test/cases/xbean/ValidatingStream/person-sibling.xml	Wed Dec  8 08:54:26 2004
@@ -1,17 +1,17 @@
-<per:Sibling Sex="male" Birthday="1967-08-13"
-             xmlns:per="http://openuri.org/test/Person"
-             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <per:Name xmlns:per="http://openuri.org/test/Person"
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <per:First>Person</per:First>
-        <per:Last>Two</per:Last>
-    </per:Name>
-    <per:Sibling Sex="female" Birthday="1992-11-12"
-                xmlns:per="http://openuri.org/test/Person"
-                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <per:Name>
-            <per:First>Person</per:First>
-            <per:Last>Three</per:Last>
-        </per:Name>
-    </per:Sibling>
+<per:Sibling Sex="male" Birthday="1967-08-13"
+             xmlns:per="http://openuri.org/test/Person"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <per:Name xmlns:per="http://openuri.org/test/Person"
+              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+        <per:First>Person</per:First>
+        <per:Last>Two</per:Last>
+    </per:Name>
+    <per:Sibling Sex="female" Birthday="1992-11-12"
+                xmlns:per="http://openuri.org/test/Person"
+                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+        <per:Name>
+            <per:First>Person</per:First>
+            <per:Last>Three</per:Last>
+        </per:Name>
+    </per:Sibling>
 </per:Sibling>

Modified: xmlbeans/trunk/test/cases/xbean/ValidatingStream/person-xsi-inv.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/ValidatingStream/person-xsi-inv.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/ValidatingStream/person-xsi-inv.xml&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/ValidatingStream/person-xsi-inv.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/ValidatingStream/person-xsi-inv.xml	(original)
+++ xmlbeans/trunk/test/cases/xbean/ValidatingStream/person-xsi-inv.xml	Wed Dec  8 08:54:26 2004
@@ -1,7 +1,7 @@
-<per:Name xmlns:per="http://openuri.org/test/Person"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:type="per:personType">
-    <per:First>Person</per:First>
-    <per:Last>Two</per:Last>
-    <per:Middle>M</per:Middle>
+<per:Name xmlns:per="http://openuri.org/test/Person"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:type="per:personType">
+    <per:First>Person</per:First>
+    <per:Last>Two</per:Last>
+    <per:Middle>M</per:Middle>
 </per:Name>

Modified: xmlbeans/trunk/test/cases/xbean/ValidatingStream/person.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/ValidatingStream/person.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/ValidatingStream/person.xml&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/ValidatingStream/person.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/ValidatingStream/person.xml	(original)
+++ xmlbeans/trunk/test/cases/xbean/ValidatingStream/person.xml	Wed Dec  8 08:54:26 2004
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<per:Person xmlns:per="http://openuri.org/test/Person"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    Sex="male" Birthday="1967-08-13">
-	<per:Name>
-		<per:First>Person</per:First>
-		<per:Last>One</per:Last>
-	</per:Name>
-	<per:Sibling Sex="male" Birthday="1967-08-13">
-		<per:Name>
-			<per:First>Person</per:First>
-			<per:Last>Two</per:Last>
-		</per:Name>
-        <per:Sibling Sex="female" Birthday="1992-12-12">
-            <per:Name>
-                <per:First>Person</per:First>
-                <per:Last>Three</per:Last>
-            </per:Name>
-        </per:Sibling>
-	</per:Sibling>
-</per:Person>
+<?xml version="1.0" encoding="UTF-8"?>
+<per:Person xmlns:per="http://openuri.org/test/Person"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    Sex="male" Birthday="1967-08-13">
+	<per:Name>
+		<per:First>Person</per:First>
+		<per:Last>One</per:Last>
+	</per:Name>
+	<per:Sibling Sex="male" Birthday="1967-08-13">
+		<per:Name>
+			<per:First>Person</per:First>
+			<per:Last>Two</per:Last>
+		</per:Name>
+        <per:Sibling Sex="female" Birthday="1992-12-12">
+            <per:Name>
+                <per:First>Person</per:First>
+                <per:Last>Three</per:Last>
+            </per:Name>
+        </per:Sibling>
+	</per:Sibling>
+</per:Person>

Modified: xmlbeans/trunk/test/cases/xbean/ValidatingStream/person.xsd
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/ValidatingStream/person.xsd?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/ValidatingStream/person.xsd&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/ValidatingStream/person.xsd&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/ValidatingStream/person.xsd	(original)
+++ xmlbeans/trunk/test/cases/xbean/ValidatingStream/person.xsd	Wed Dec  8 08:54:26 2004
@@ -1,47 +1,47 @@
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:per="http://openuri.org/test/Person" targetNamespace="http://openuri.org/test/Person" elementFormDefault="qualified">
-
-    <xs:element name="Person" type="per:personType"/>
-
-    <xs:complexType name="personType">
-		<xs:sequence>
-			<xs:element name="Name" type="per:name"/>
-			<xs:sequence maxOccurs="unbounded" minOccurs="0">
-				<xs:element name="Sibling" type="per:personType"/>
-			</xs:sequence>
-		</xs:sequence>
-		<xs:attribute name="Sex" type="per:sex"/>
-		<xs:attribute name="Birthday" type="xs:date"/>
-	</xs:complexType>
-
-	<xs:complexType name="name">
-		<xs:sequence>
-			<xs:element name="First" type="xs:string"/>
-			<xs:element name="Last" type="xs:string"/>
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="middlename">
-		<xs:complexContent>
-			<xs:extension base="per:name">
-				<xs:sequence>
-					<xs:element name="Middle" type="xs:string"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-    
-    <xs:complexType name="justName">
-        <xs:sequence>
-            <xs:element name="Name" type="per:name"/>
-        </xs:sequence>
-    </xs:complexType>
-
-	<xs:simpleType name="sex">
-		<xs:restriction base="xs:string">
-			<xs:whiteSpace value="collapse"/>
-			<xs:enumeration value="male"/>
-			<xs:enumeration value="female"/>
-		</xs:restriction>
-	</xs:simpleType>
-
-</xs:schema>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:per="http://openuri.org/test/Person" targetNamespace="http://openuri.org/test/Person" elementFormDefault="qualified">
+
+    <xs:element name="Person" type="per:personType"/>
+
+    <xs:complexType name="personType">
+		<xs:sequence>
+			<xs:element name="Name" type="per:name"/>
+			<xs:sequence maxOccurs="unbounded" minOccurs="0">
+				<xs:element name="Sibling" type="per:personType"/>
+			</xs:sequence>
+		</xs:sequence>
+		<xs:attribute name="Sex" type="per:sex"/>
+		<xs:attribute name="Birthday" type="xs:date"/>
+	</xs:complexType>
+
+	<xs:complexType name="name">
+		<xs:sequence>
+			<xs:element name="First" type="xs:string"/>
+			<xs:element name="Last" type="xs:string"/>
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name="middlename">
+		<xs:complexContent>
+			<xs:extension base="per:name">
+				<xs:sequence>
+					<xs:element name="Middle" type="xs:string"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+    
+    <xs:complexType name="justName">
+        <xs:sequence>
+            <xs:element name="Name" type="per:name"/>
+        </xs:sequence>
+    </xs:complexType>
+
+	<xs:simpleType name="sex">
+		<xs:restriction base="xs:string">
+			<xs:whiteSpace value="collapse"/>
+			<xs:enumeration value="male"/>
+			<xs:enumeration value="female"/>
+		</xs:restriction>
+	</xs:simpleType>
+
+</xs:schema>

Modified: xmlbeans/trunk/test/cases/xbean/ValidatingStream/po.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/ValidatingStream/po.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/ValidatingStream/po.xml&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/ValidatingStream/po.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/ValidatingStream/po.xml	(original)
+++ xmlbeans/trunk/test/cases/xbean/ValidatingStream/po.xml	Wed Dec  8 08:54:26 2004
@@ -1,33 +1,33 @@
-<?xml version="1.0"?>
-<po:purchaseOrder orderDate="1999-10-20"
-    xmlns:po="http://test/PurchaseOrder">
-    <shipTo country="US">
-        <name>Alice Smith</name>
-        <street>123 Maple Street</street>
-        <city>Mill Valley</city>
-        <state>CA</state>
-        <zip>90952</zip>
-    </shipTo>
-    <billTo country="US">
-        <name>Robert Smith</name>
-        <street>8 Oak Avenue</street>
-        <city>Old Town</city>
-        <state>PA</state>
-        <zip>95819</zip>
-    </billTo>
-    <comment>Hurry, my lawn is going wild!</comment>
-    <items>
-        <item partNum="872-AA">
-            <productName>Lawnmower</productName>
-            <quantity>1</quantity>
-            <USPrice>148.95</USPrice>
-            <comment>Confirm this is electric</comment>
-        </item>
-        <item partNum="926-AA">
-            <productName>Baby Monitor</productName>
-            <quantity>1</quantity>
-            <USPrice>39.98</USPrice>
-            <shipDate>1999-05-21</shipDate>
-        </item>
-    </items>
+<?xml version="1.0"?>
+<po:purchaseOrder orderDate="1999-10-20"
+    xmlns:po="http://test/PurchaseOrder">
+    <shipTo country="US">
+        <name>Alice Smith</name>
+        <street>123 Maple Street</street>
+        <city>Mill Valley</city>
+        <state>CA</state>
+        <zip>90952</zip>
+    </shipTo>
+    <billTo country="US">
+        <name>Robert Smith</name>
+        <street>8 Oak Avenue</street>
+        <city>Old Town</city>
+        <state>PA</state>
+        <zip>95819</zip>
+    </billTo>
+    <comment>Hurry, my lawn is going wild!</comment>
+    <items>
+        <item partNum="872-AA">
+            <productName>Lawnmower</productName>
+            <quantity>1</quantity>
+            <USPrice>148.95</USPrice>
+            <comment>Confirm this is electric</comment>
+        </item>
+        <item partNum="926-AA">
+            <productName>Baby Monitor</productName>
+            <quantity>1</quantity>
+            <USPrice>39.98</USPrice>
+            <shipDate>1999-05-21</shipDate>
+        </item>
+    </items>
 </po:purchaseOrder>

Modified: xmlbeans/trunk/test/cases/xbean/ValidatingStream/simpleTypes.xsd
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/ValidatingStream/simpleTypes.xsd?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/ValidatingStream/simpleTypes.xsd&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/ValidatingStream/simpleTypes.xsd&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/ValidatingStream/simpleTypes.xsd	(original)
+++ xmlbeans/trunk/test/cases/xbean/ValidatingStream/simpleTypes.xsd	Wed Dec  8 08:54:26 2004
@@ -1,23 +1,23 @@
-<xsd:schema targetNamespace="http://openuri.org/test/SimType"
-            xmlns:tns="http://openuri.org/test/SimType"
-            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            elementFormDefault="qualified">
-
-    <xsd:simpleType name="ageType">
-        <xsd:restriction base="xsd:integer">
-            <xsd:minInclusive value="1"/>
-            <xsd:maxInclusive value="100"/>
-        </xsd:restriction>
-    </xsd:simpleType>
-
-    <xsd:simpleType name="qNameType"
-                    xmlns:my="http://openuri.org/test/My">
-        <xsd:restriction base="xsd:QName">
-            <xsd:enumeration value="my:foo"/>
-            <xsd:enumeration value="my:bar"/>
-        </xsd:restriction>
-    </xsd:simpleType>
-
-    <xsd:element name="Age" type="tns:ageType"/>
-    <xsd:element name="QN" type="tns:qNameType"/>
+<xsd:schema targetNamespace="http://openuri.org/test/SimType"
+            xmlns:tns="http://openuri.org/test/SimType"
+            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            elementFormDefault="qualified">
+
+    <xsd:simpleType name="ageType">
+        <xsd:restriction base="xsd:integer">
+            <xsd:minInclusive value="1"/>
+            <xsd:maxInclusive value="100"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="qNameType"
+                    xmlns:my="http://openuri.org/test/My">
+        <xsd:restriction base="xsd:QName">
+            <xsd:enumeration value="my:foo"/>
+            <xsd:enumeration value="my:bar"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:element name="Age" type="tns:ageType"/>
+    <xsd:element name="QN" type="tns:qNameType"/>
 </xsd:schema>

Modified: xmlbeans/trunk/test/cases/xbean/compile/scomp/j2ee/XML.xsd
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/compile/scomp/j2ee/XML.xsd?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/compile/scomp/j2ee/XML.xsd&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/compile/scomp/j2ee/XML.xsd&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/compile/scomp/j2ee/XML.xsd	(original)
+++ xmlbeans/trunk/test/cases/xbean/compile/scomp/j2ee/XML.xsd	Wed Dec  8 08:54:26 2004
@@ -1,81 +1,81 @@
-<?xml version='1.0'?>
-<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "XMLSchema.dtd" >
-<xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace" xmlns:xs="http://www.w3.org/2001/XMLSchema" xml:lang="en">
-
- <xs:annotation>
-  <xs:documentation>
-   See http://www.w3.org/XML/1998/namespace.html and
-   http://www.w3.org/TR/REC-xml for information about this namespace.
-  </xs:documentation>
- </xs:annotation>
-
- <xs:annotation>
-  <xs:documentation>This schema defines attributes and an attribute group
-        suitable for use by
-        schemas wishing to allow xml:base, xml:lang or xml:space attributes
-        on elements they define.
-
-        To enable this, such a schema must import this schema
-        for the XML namespace, e.g. as follows:
-        &lt;schema . . .>
-         . . .
-         &lt;import namespace="http://www.w3.org/XML/1998/namespace"
-                    schemaLocation="http://www.w3.org/2001/03/xml.xsd"/>
-
-        Subsequently, qualified reference to any of the attributes
-        or the group defined below will have the desired effect, e.g.
-
-        &lt;type . . .>
-         . . .
-         &lt;attributeGroup ref="xml:specialAttrs"/>
- 
-         will define a type which will schema-validate an instance
-         element with any of those attributes</xs:documentation>
- </xs:annotation>
-
- <xs:annotation>
-  <xs:documentation>In keeping with the XML Schema WG's standard versioning
-   policy, this schema document will persist at
-   http://www.w3.org/2001/03/xml.xsd.
-   At the date of issue it can also be found at
-   http://www.w3.org/2001/xml.xsd.
-   The schema document at that URI may however change in the future,
-   in order to remain compatible with the latest version of XML Schema
-   itself.  In other words, if the XML Schema namespace changes, the version
-   of this document at
-   http://www.w3.org/2001/xml.xsd will change
-   accordingly; the version at
-   http://www.w3.org/2001/03/xml.xsd will not change.
-  </xs:documentation>
- </xs:annotation>
-
- <xs:attribute name="lang" type="xs:language">
-  <xs:annotation>
-   <xs:documentation>In due course, we should install the relevant ISO 2- and 3-letter
-         codes as the enumerated possible values . . .</xs:documentation>
-  </xs:annotation>
- </xs:attribute>
-
- <xs:attribute name="space" default="preserve">
-  <xs:simpleType>
-   <xs:restriction base="xs:NCName">
-    <xs:enumeration value="default"/>
-    <xs:enumeration value="preserve"/>
-   </xs:restriction>
-  </xs:simpleType>
- </xs:attribute>
-
- <xs:attribute name="base" type="xs:anyURI">
-  <xs:annotation>
-   <xs:documentation>See http://www.w3.org/TR/xmlbase/ for
-                     information about this attribute.</xs:documentation>
-  </xs:annotation>
- </xs:attribute>
-
- <xs:attributeGroup name="specialAttrs">
-  <xs:attribute ref="xml:base"/>
-  <xs:attribute ref="xml:lang"/>
-  <xs:attribute ref="xml:space"/>
- </xs:attributeGroup>
-
-</xs:schema>
+<?xml version='1.0'?>
+<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "XMLSchema.dtd" >
+<xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace" xmlns:xs="http://www.w3.org/2001/XMLSchema" xml:lang="en">
+
+ <xs:annotation>
+  <xs:documentation>
+   See http://www.w3.org/XML/1998/namespace.html and
+   http://www.w3.org/TR/REC-xml for information about this namespace.
+  </xs:documentation>
+ </xs:annotation>
+
+ <xs:annotation>
+  <xs:documentation>This schema defines attributes and an attribute group
+        suitable for use by
+        schemas wishing to allow xml:base, xml:lang or xml:space attributes
+        on elements they define.
+
+        To enable this, such a schema must import this schema
+        for the XML namespace, e.g. as follows:
+        &lt;schema . . .>
+         . . .
+         &lt;import namespace="http://www.w3.org/XML/1998/namespace"
+                    schemaLocation="http://www.w3.org/2001/03/xml.xsd"/>
+
+        Subsequently, qualified reference to any of the attributes
+        or the group defined below will have the desired effect, e.g.
+
+        &lt;type . . .>
+         . . .
+         &lt;attributeGroup ref="xml:specialAttrs"/>
+ 
+         will define a type which will schema-validate an instance
+         element with any of those attributes</xs:documentation>
+ </xs:annotation>
+
+ <xs:annotation>
+  <xs:documentation>In keeping with the XML Schema WG's standard versioning
+   policy, this schema document will persist at
+   http://www.w3.org/2001/03/xml.xsd.
+   At the date of issue it can also be found at
+   http://www.w3.org/2001/xml.xsd.
+   The schema document at that URI may however change in the future,
+   in order to remain compatible with the latest version of XML Schema
+   itself.  In other words, if the XML Schema namespace changes, the version
+   of this document at
+   http://www.w3.org/2001/xml.xsd will change
+   accordingly; the version at
+   http://www.w3.org/2001/03/xml.xsd will not change.
+  </xs:documentation>
+ </xs:annotation>
+
+ <xs:attribute name="lang" type="xs:language">
+  <xs:annotation>
+   <xs:documentation>In due course, we should install the relevant ISO 2- and 3-letter
+         codes as the enumerated possible values . . .</xs:documentation>
+  </xs:annotation>
+ </xs:attribute>
+
+ <xs:attribute name="space" default="preserve">
+  <xs:simpleType>
+   <xs:restriction base="xs:NCName">
+    <xs:enumeration value="default"/>
+    <xs:enumeration value="preserve"/>
+   </xs:restriction>
+  </xs:simpleType>
+ </xs:attribute>
+
+ <xs:attribute name="base" type="xs:anyURI">
+  <xs:annotation>
+   <xs:documentation>See http://www.w3.org/TR/xmlbase/ for
+                     information about this attribute.</xs:documentation>
+  </xs:annotation>
+ </xs:attribute>
+
+ <xs:attributeGroup name="specialAttrs">
+  <xs:attribute ref="xml:base"/>
+  <xs:attribute ref="xml:lang"/>
+  <xs:attribute ref="xml:space"/>
+ </xs:attributeGroup>
+
+</xs:schema>

Modified: xmlbeans/trunk/test/cases/xbean/compile/scomp/j2ee/application-client_1_4.xsd
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/compile/scomp/j2ee/application-client_1_4.xsd?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/compile/scomp/j2ee/application-client_1_4.xsd&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/compile/scomp/j2ee/application-client_1_4.xsd&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/compile/scomp/j2ee/application-client_1_4.xsd	(original)
+++ xmlbeans/trunk/test/cases/xbean/compile/scomp/j2ee/application-client_1_4.xsd	Wed Dec  8 08:54:26 2004
@@ -1,276 +1,276 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
-     targetNamespace="http://java.sun.com/xml/ns/j2ee"
-     xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
-     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-     elementFormDefault="qualified"
-     attributeFormDefault="unqualified"
-     version="1.4">
-<xsd:annotation>
-<xsd:documentation>
-@(#)application-client_1_4.xsds	1.7 07/08/02
-</xsd:documentation>
-</xsd:annotation>
-
-<xsd:annotation>
-<xsd:documentation>
-
-Copyright 2002 Sun Microsystems, Inc., 901 San Antonio
-Road, Palo Alto, California 94303, U.S.A. All rights
-reserved.
-
-Sun Microsystems, Inc. has intellectual property rights
-relating to technology described in this document. In
-particular, and without limitation, these intellectual
-property rights may include one or more of the U.S. patents
-listed at http://www.sun.com/patents and one or more
-additional patents or pending patent applications in the
-U.S. and other countries.
-
-This document and the technology which it describes are
-distributed under licenses restricting their use, copying,
-distribution, and decompilation. No part of this document
-may be reproduced in any form by any means without prior
-written authorization of Sun and its licensors, if any.
-
-Third-party software, including font technology, is
-copyrighted and licensed from Sun suppliers.
-
-Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
-JavaServer Pages, Enterprise JavaBeans and the Java Coffee
-Cup logo are trademarks or registered trademarks of Sun
-Microsystems, Inc. in the U.S. and other countries.
-
-Federal Acquisitions: Commercial Software - Government Users
-Subject to Standard License Terms and Conditions.
-
-</xsd:documentation>
-</xsd:annotation>
-
-<xsd:annotation>
-<xsd:documentation>
-<![CDATA[
-This is the XML Schema for the application client 1.4
-deployment descriptor.  All application client deployment
-descriptors must indicate the application client
-schema by using the J2EE namespace:
-
-http://java.sun.com/xml/ns/j2ee
-
-and by indicating the version of the schema by
-using the version element as shown below:
-
-    <application-client xmlns="http://java.sun.com/xml/ns/j2ee"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
-       http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd"
-     version="1.4">
-
-    ...
-    </application-client>
-]]>
-The instance documents may indicate the published version of
-the schema using the xsi:schemaLocation attribute for J2EE
-namespace with the following location:
-
-http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd
-
-</xsd:documentation>
-</xsd:annotation>
-
-<xsd:annotation>
-<xsd:documentation>
-
-The following conventions apply to all J2EE
-deployment descriptor elements unless indicated otherwise.
-
-- In elements that specify a pathname to a file within the
-  same JAR file, relative filenames (i.e., those not
-  starting with "/") are considered relative to the root of
-  the JAR file's namespace.  Absolute filenames (i.e., those
-  starting with "/") also specify names in the root of the
-  JAR file's namespace.  In general, relative names are
-  preferred.  The exception is .war files where absolute
-  names are preferred for consistency with the Servlet API.
-
-</xsd:documentation>
-</xsd:annotation>
-
-<include schemaLocation="j2ee_1_4.xsd"/>
-
-
-<!-- **************************************************** -->
-
-
-<xsd:element name="application-client" type="j2ee:application-clientType">
-    <xsd:annotation>
-    <xsd:documentation>
-
-    The application-client element is the root element of an
-    application client deployment descriptor.  The application
-    client deployment descriptor describes the EJB components
-    and external resources referenced by the application
-    client.
-
-    </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:unique name="env-entry-name-uniqueness">
-    <xsd:annotation>
-    <xsd:documentation>
-
-    The env-entry-name element contains the name of an
-    application client's environment entry.  The name is a JNDI
-    name relative to the java:comp/env context.  The name must
-    be unique within an application client.
-
-    </xsd:documentation>
-    </xsd:annotation>
-        <xsd:selector xpath="j2ee:env-entry"/>
-        <xsd:field    xpath="j2ee:env-entry-name"/>
-    </xsd:unique>
-
-    <xsd:unique name="ejb-ref-name-uniqueness">
-    <xsd:annotation>
-    <xsd:documentation>
-
-    The ejb-ref-name element contains the name of an EJB
-    reference. The EJB reference is an entry in the application
-    client's environment and is relative to the
-    java:comp/env context. The name must be unique within the
-    application client.
-
-    It is recommended that name is prefixed with "ejb/".
-
-    </xsd:documentation>
-    </xsd:annotation>
-        <xsd:selector xpath="j2ee:ejb-ref"/>
-        <xsd:field    xpath="j2ee:ejb-ref-name"/>
-    </xsd:unique>
-
-    <xsd:unique name="res-ref-name-uniqueness">
-    <xsd:annotation>
-    <xsd:documentation>
-
-    The res-ref-name element specifies the name of a
-    resource manager connection factory reference.The name
-    is a JNDI name relative to the java:comp/env context.
-    The name must be unique within an application client.
-
-    </xsd:documentation>
-    </xsd:annotation>
-        <xsd:selector xpath="j2ee:resource-ref"/>
-        <xsd:field    xpath="j2ee:res-ref-name"/>
-    </xsd:unique>
-
-    <xsd:unique name="resource-env-ref-uniqueness">
-    <xsd:annotation>
-    <xsd:documentation>
-
-    The resource-env-ref-name element specifies the name of
-    a resource environment reference; its value is the
-    environment entry name used in the application client
-    code. The name is a JNDI name relative to the
-    java:comp/env context and must be unique within an
-    application client.
-
-    </xsd:documentation>
-    </xsd:annotation>
-        <xsd:selector xpath="j2ee:resource-env-ref"/>
-        <xsd:field    xpath="j2ee:resource-env-ref-name"/>
-    </xsd:unique>
-
-    <xsd:unique name="message-destination-ref-uniqueness">
-    <xsd:annotation>
-    <xsd:documentation>
-
-    The message-destination-ref-name element specifies the
-    name of a message destination reference; its value is
-    the message destination reference name used in the
-    application client code. The name is a JNDI name
-    relative to the java:comp/env context and must be unique
-    within an application client.
-
-    </xsd:documentation>
-    </xsd:annotation>
-        <xsd:selector xpath="j2ee:message-destination-ref"/>
-        <xsd:field    xpath="j2ee:message-destination-ref-name"/>
-    </xsd:unique>
-
-</xsd:element>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="application-clientType">
-    <xsd:sequence>
-        <xsd:element name="description"
-                     type="j2ee:descriptionType"
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="display-name"
-                     type="j2ee:display-nameType"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="icon"
-                     type="j2ee:iconType"
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="env-entry"
-                     type="j2ee:env-entryType"
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="ejb-ref"
-                     type="j2ee:ejb-refType"
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="resource-ref"
-                     type="j2ee:resource-refType"
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="resource-env-ref"
-                     type="j2ee:resource-env-refType"
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="message-destination-ref"
-                     type="j2ee:message-destination-refType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="callback-handler"
-                     type="j2ee:fully-qualified-classType"
-                     minOccurs="0">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The callback-handler element names a class provided by
-        the application.  The class must have a no args
-        constructor and must implement the
-        javax.security.auth.callback.CallbackHandler
-        interface.  The class will be instantiated by the
-        application client container and used by the container
-        to collect authentication information from the user.
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="message-destination"
-                     type="j2ee:message-destinationType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="deployment-extension"
-                     type="j2ee:deployment-extensionType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-
-    </xsd:sequence>
-
-    <xsd:attribute name="version"
-                   type="j2ee:dewey-versionType"
-                   fixed="1.4"
-                   use="required">
-    <xsd:annotation>
-    <xsd:documentation>
-
-    The required value for the version is 1.4.
-
-    </xsd:documentation>
-    </xsd:annotation>
-
-    </xsd:attribute>
-
-</xsd:complexType>
-
-</xsd:schema>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
+     targetNamespace="http://java.sun.com/xml/ns/j2ee"
+     xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
+     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+     elementFormDefault="qualified"
+     attributeFormDefault="unqualified"
+     version="1.4">
+<xsd:annotation>
+<xsd:documentation>
+@(#)application-client_1_4.xsds	1.7 07/08/02
+</xsd:documentation>
+</xsd:annotation>
+
+<xsd:annotation>
+<xsd:documentation>
+
+Copyright 2002 Sun Microsystems, Inc., 901 San Antonio
+Road, Palo Alto, California 94303, U.S.A. All rights
+reserved.
+
+Sun Microsystems, Inc. has intellectual property rights
+relating to technology described in this document. In
+particular, and without limitation, these intellectual
+property rights may include one or more of the U.S. patents
+listed at http://www.sun.com/patents and one or more
+additional patents or pending patent applications in the
+U.S. and other countries.
+
+This document and the technology which it describes are
+distributed under licenses restricting their use, copying,
+distribution, and decompilation. No part of this document
+may be reproduced in any form by any means without prior
+written authorization of Sun and its licensors, if any.
+
+Third-party software, including font technology, is
+copyrighted and licensed from Sun suppliers.
+
+Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
+JavaServer Pages, Enterprise JavaBeans and the Java Coffee
+Cup logo are trademarks or registered trademarks of Sun
+Microsystems, Inc. in the U.S. and other countries.
+
+Federal Acquisitions: Commercial Software - Government Users
+Subject to Standard License Terms and Conditions.
+
+</xsd:documentation>
+</xsd:annotation>
+
+<xsd:annotation>
+<xsd:documentation>
+<![CDATA[
+This is the XML Schema for the application client 1.4
+deployment descriptor.  All application client deployment
+descriptors must indicate the application client
+schema by using the J2EE namespace:
+
+http://java.sun.com/xml/ns/j2ee
+
+and by indicating the version of the schema by
+using the version element as shown below:
+
+    <application-client xmlns="http://java.sun.com/xml/ns/j2ee"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+       http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd"
+     version="1.4">
+
+    ...
+    </application-client>
+]]>
+The instance documents may indicate the published version of
+the schema using the xsi:schemaLocation attribute for J2EE
+namespace with the following location:
+
+http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd
+
+</xsd:documentation>
+</xsd:annotation>
+
+<xsd:annotation>
+<xsd:documentation>
+
+The following conventions apply to all J2EE
+deployment descriptor elements unless indicated otherwise.
+
+- In elements that specify a pathname to a file within the
+  same JAR file, relative filenames (i.e., those not
+  starting with "/") are considered relative to the root of
+  the JAR file's namespace.  Absolute filenames (i.e., those
+  starting with "/") also specify names in the root of the
+  JAR file's namespace.  In general, relative names are
+  preferred.  The exception is .war files where absolute
+  names are preferred for consistency with the Servlet API.
+
+</xsd:documentation>
+</xsd:annotation>
+
+<include schemaLocation="j2ee_1_4.xsd"/>
+
+
+<!-- **************************************************** -->
+
+
+<xsd:element name="application-client" type="j2ee:application-clientType">
+    <xsd:annotation>
+    <xsd:documentation>
+
+    The application-client element is the root element of an
+    application client deployment descriptor.  The application
+    client deployment descriptor describes the EJB components
+    and external resources referenced by the application
+    client.
+
+    </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:unique name="env-entry-name-uniqueness">
+    <xsd:annotation>
+    <xsd:documentation>
+
+    The env-entry-name element contains the name of an
+    application client's environment entry.  The name is a JNDI
+    name relative to the java:comp/env context.  The name must
+    be unique within an application client.
+
+    </xsd:documentation>
+    </xsd:annotation>
+        <xsd:selector xpath="j2ee:env-entry"/>
+        <xsd:field    xpath="j2ee:env-entry-name"/>
+    </xsd:unique>
+
+    <xsd:unique name="ejb-ref-name-uniqueness">
+    <xsd:annotation>
+    <xsd:documentation>
+
+    The ejb-ref-name element contains the name of an EJB
+    reference. The EJB reference is an entry in the application
+    client's environment and is relative to the
+    java:comp/env context. The name must be unique within the
+    application client.
+
+    It is recommended that name is prefixed with "ejb/".
+
+    </xsd:documentation>
+    </xsd:annotation>
+        <xsd:selector xpath="j2ee:ejb-ref"/>
+        <xsd:field    xpath="j2ee:ejb-ref-name"/>
+    </xsd:unique>
+
+    <xsd:unique name="res-ref-name-uniqueness">
+    <xsd:annotation>
+    <xsd:documentation>
+
+    The res-ref-name element specifies the name of a
+    resource manager connection factory reference.The name
+    is a JNDI name relative to the java:comp/env context.
+    The name must be unique within an application client.
+
+    </xsd:documentation>
+    </xsd:annotation>
+        <xsd:selector xpath="j2ee:resource-ref"/>
+        <xsd:field    xpath="j2ee:res-ref-name"/>
+    </xsd:unique>
+
+    <xsd:unique name="resource-env-ref-uniqueness">
+    <xsd:annotation>
+    <xsd:documentation>
+
+    The resource-env-ref-name element specifies the name of
+    a resource environment reference; its value is the
+    environment entry name used in the application client
+    code. The name is a JNDI name relative to the
+    java:comp/env context and must be unique within an
+    application client.
+
+    </xsd:documentation>
+    </xsd:annotation>
+        <xsd:selector xpath="j2ee:resource-env-ref"/>
+        <xsd:field    xpath="j2ee:resource-env-ref-name"/>
+    </xsd:unique>
+
+    <xsd:unique name="message-destination-ref-uniqueness">
+    <xsd:annotation>
+    <xsd:documentation>
+
+    The message-destination-ref-name element specifies the
+    name of a message destination reference; its value is
+    the message destination reference name used in the
+    application client code. The name is a JNDI name
+    relative to the java:comp/env context and must be unique
+    within an application client.
+
+    </xsd:documentation>
+    </xsd:annotation>
+        <xsd:selector xpath="j2ee:message-destination-ref"/>
+        <xsd:field    xpath="j2ee:message-destination-ref-name"/>
+    </xsd:unique>
+
+</xsd:element>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="application-clientType">
+    <xsd:sequence>
+        <xsd:element name="description"
+                     type="j2ee:descriptionType"
+                     minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="display-name"
+                     type="j2ee:display-nameType"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="icon"
+                     type="j2ee:iconType"
+                     minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="env-entry"
+                     type="j2ee:env-entryType"
+                     minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="ejb-ref"
+                     type="j2ee:ejb-refType"
+                     minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="resource-ref"
+                     type="j2ee:resource-refType"
+                     minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="resource-env-ref"
+                     type="j2ee:resource-env-refType"
+                     minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="message-destination-ref"
+                     type="j2ee:message-destination-refType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="callback-handler"
+                     type="j2ee:fully-qualified-classType"
+                     minOccurs="0">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The callback-handler element names a class provided by
+        the application.  The class must have a no args
+        constructor and must implement the
+        javax.security.auth.callback.CallbackHandler
+        interface.  The class will be instantiated by the
+        application client container and used by the container
+        to collect authentication information from the user.
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+        <xsd:element name="message-destination"
+                     type="j2ee:message-destinationType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="deployment-extension"
+                     type="j2ee:deployment-extensionType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+
+    </xsd:sequence>
+
+    <xsd:attribute name="version"
+                   type="j2ee:dewey-versionType"
+                   fixed="1.4"
+                   use="required">
+    <xsd:annotation>
+    <xsd:documentation>
+
+    The required value for the version is 1.4.
+
+    </xsd:documentation>
+    </xsd:annotation>
+
+    </xsd:attribute>
+
+</xsd:complexType>
+
+</xsd:schema>
+

Modified: xmlbeans/trunk/test/cases/xbean/compile/scomp/j2ee/application_1_4.xsd
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/compile/scomp/j2ee/application_1_4.xsd?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/compile/scomp/j2ee/application_1_4.xsd&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/compile/scomp/j2ee/application_1_4.xsd&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/compile/scomp/j2ee/application_1_4.xsd	(original)
+++ xmlbeans/trunk/test/cases/xbean/compile/scomp/j2ee/application_1_4.xsd	Wed Dec  8 08:54:26 2004
@@ -1,329 +1,329 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
-     targetNamespace="http://java.sun.com/xml/ns/j2ee"
-     xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
-     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-     elementFormDefault="qualified"
-     attributeFormDefault="unqualified"
-     version="1.4">
-<xsd:annotation>
-<xsd:documentation>
-@(#)application_1_4.xsds	1.6 08/09/02
-</xsd:documentation>
-</xsd:annotation>
-
-<xsd:annotation>
-<xsd:documentation>
-
-Copyright 2002 Sun Microsystems, Inc., 901 San Antonio
-Road, Palo Alto, California 94303, U.S.A. All rights
-reserved.
-
-Sun Microsystems, Inc. has intellectual property rights
-relating to technology described in this document. In
-particular, and without limitation, these intellectual
-property rights may include one or more of the U.S. patents
-listed at http://www.sun.com/patents and one or more
-additional patents or pending patent applications in the
-U.S. and other countries.
-
-This document and the technology which it describes are
-distributed under licenses restricting their use, copying,
-distribution, and decompilation. No part of this document
-may be reproduced in any form by any means without prior
-written authorization of Sun and its licensors, if any.
-
-Third-party software, including font technology, is
-copyrighted and licensed from Sun suppliers.
-
-Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
-JavaServer Pages, Enterprise JavaBeans and the Java Coffee
-Cup logo are trademarks or registered trademarks of Sun
-Microsystems, Inc. in the U.S. and other countries.
-
-Federal Acquisitions: Commercial Software - Government Users
-Subject to Standard License Terms and Conditions.
-
-</xsd:documentation>
-</xsd:annotation>
-
-<xsd:annotation>
-<xsd:documentation>
-<![CDATA[
-This is the XML Schema for the application 1.4 deployment
-descriptor.  All application deployment descriptors must
-indicate that the schema by using the J2EE namespace
-
-http://java.sun.com/xml/ns/j2ee
-
-and by indicating the version of the schema by
-using the version element as shown below:
-
-    <application xmlns="http://java.sun.com/xml/ns/j2ee"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
-        http://java.sun.com/xml/ns/j2ee/application_1_4.xsd"
-     version="1.4">
-
-    ...
-    </application>
-
-The instance documents may indicate the published version of
-the schema using the xsi:schemaLocation attribute for J2EE
-namespace with the following location:
-
-http://java.sun.com/xml/ns/j2ee/application_1_4.xsd
-]]>
-</xsd:documentation>
-</xsd:annotation>
-
-<xsd:annotation>
-<xsd:documentation>
-
-The following conventions apply to all J2EE
-deployment descriptor elements unless indicated otherwise.
-
-- In elements that specify a pathname to a file within the
-  same JAR file, relative filenames (i.e., those not
-  starting with "/") are considered relative to the root of
-  the JAR file's namespace.  Absolute filenames (i.e., those
-  starting with "/") also specify names in the root of the
-  JAR file's namespace.  In general, relative names are
-  preferred.  The exception is .war files where absolute
-  names are preferred for consistency with the Servlet API.
-
-</xsd:documentation>
-</xsd:annotation>
-
-<xsd:include schemaLocation="j2ee_1_4.xsd"/>
-
-
-<!-- **************************************************** -->
-
-
-<xsd:element name="application" type="j2ee:applicationType">
-    <xsd:annotation>
-    <xsd:documentation>
-
-    The application element is the root element of a J2EE
-    application deployment descriptor.
-
-    </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:unique name="context-root-uniqueness">
-    <xsd:annotation>
-    <xsd:documentation>
-
-    The context-root element content must be unique
-    in the ear.
-
-    </xsd:documentation>
-    </xsd:annotation>
-        <xsd:selector xpath="j2ee:module/j2ee:web"/>
-        <xsd:field    xpath="j2ee:context-root"/>
-    </xsd:unique>
-
-    <xsd:unique name="security-role-uniqueness">
-    <xsd:annotation>
-    <xsd:documentation>
-
-    The security-role-name element content
-    must be unique in the ear.
-
-    </xsd:documentation>
-    </xsd:annotation>
-        <xsd:selector xpath="j2ee:security-role"/>
-        <xsd:field    xpath="j2ee:role-name"/>
-    </xsd:unique>
-
-</xsd:element>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="applicationType">
-<xsd:annotation>
-<xsd:documentation>
-
-The applicationType defines the structure of the
-application.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="description"
-                     type="j2ee:descriptionType"
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="display-name"
-                     type="j2ee:display-nameType"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="icon"
-                     type="j2ee:iconType"
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="module"
-                     type="j2ee:moduleType"
-                     maxOccurs="unbounded">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The application deployment descriptor must have one
-        module element for each J2EE module in the
-        application package. A module element is defined
-        by moduleType definition.
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="security-role"
-                     type="j2ee:security-roleType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="deployment-extension"
-                     type="j2ee:deployment-extensionType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="version"
-                   type="j2ee:dewey-versionType"
-                   fixed="1.4"
-                   use="required">
-    <xsd:annotation>
-    <xsd:documentation>
-
-    The required value for the version is 1.4.
-
-    </xsd:documentation>
-    </xsd:annotation>
-    </xsd:attribute>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="moduleType">
-<xsd:annotation>
-<xsd:documentation>
-
-The moduleType defines a single J2EE module and contains a
-connector, ejb, java, or web element, which indicates the
-module type and contains a path to the module file, and an
-optional alt-dd element, which specifies an optional URI to
-the post-assembly version of the deployment descriptor.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:choice>
-            <xsd:element name="connector"
-                         type="j2ee:pathType">
-            <xsd:annotation>
-            <xsd:documentation>
-
-            The connector element specifies the URI of a
-            resource adapter archive file, relative to the
-            top level of the application package.
-
-            </xsd:documentation>
-            </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="ejb"
-                         type="j2ee:pathType">
-            <xsd:annotation>
-            <xsd:documentation>
-
-            The ejb element specifies the URI of an ejb-jar,
-            relative to the top level of the application
-            package.
-
-            </xsd:documentation>
-            </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="java"
-                         type="j2ee:pathType">
-            <xsd:annotation>
-            <xsd:documentation>
-
-            The java element specifies the URI of a java
-            application client module, relative to the top
-            level of the application package.
-
-            </xsd:documentation>
-            </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="web"
-                         type="j2ee:webType"/>
-        </xsd:choice>
-        <xsd:element name="alt-dd"
-                     type="j2ee:pathType"
-                     minOccurs="0">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The alt-dd element specifies an optional URI to the
-        post-assembly version of the deployment descriptor
-        file for a particular J2EE module.  The URI must
-        specify the full pathname of the deployment
-        descriptor file relative to the application's root
-        directory. If alt-dd is not specified, the deployer
-        must read the deployment descriptor from the default
-        location and file name required by the respective
-        component specification.
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="deployment-extension"
-                     type="j2ee:deployment-extensionType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-
-    </xsd:sequence>
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="webType">
-<xsd:annotation>
-<xsd:documentation>
-
-The webType defines the web-uri and context-root of
-a web application module.
-
-</xsd:documentation>
-</xsd:annotation>
-    <xsd:sequence>
-        <xsd:element name="web-uri"
-                     type="j2ee:pathType">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The web-uri element specifies the URI of a web
-        application file, relative to the top level of the
-        application package.
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="context-root"
-                     type="j2ee:string">
-
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The context-root element specifies the context root
-        of a web application.
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="deployment-extension"
-                     type="j2ee:deployment-extensionType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-    </xsd:sequence>
-</xsd:complexType>
-
-</xsd:schema>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
+     targetNamespace="http://java.sun.com/xml/ns/j2ee"
+     xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
+     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+     elementFormDefault="qualified"
+     attributeFormDefault="unqualified"
+     version="1.4">
+<xsd:annotation>
+<xsd:documentation>
+@(#)application_1_4.xsds	1.6 08/09/02
+</xsd:documentation>
+</xsd:annotation>
+
+<xsd:annotation>
+<xsd:documentation>
+
+Copyright 2002 Sun Microsystems, Inc., 901 San Antonio
+Road, Palo Alto, California 94303, U.S.A. All rights
+reserved.
+
+Sun Microsystems, Inc. has intellectual property rights
+relating to technology described in this document. In
+particular, and without limitation, these intellectual
+property rights may include one or more of the U.S. patents
+listed at http://www.sun.com/patents and one or more
+additional patents or pending patent applications in the
+U.S. and other countries.
+
+This document and the technology which it describes are
+distributed under licenses restricting their use, copying,
+distribution, and decompilation. No part of this document
+may be reproduced in any form by any means without prior
+written authorization of Sun and its licensors, if any.
+
+Third-party software, including font technology, is
+copyrighted and licensed from Sun suppliers.
+
+Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
+JavaServer Pages, Enterprise JavaBeans and the Java Coffee
+Cup logo are trademarks or registered trademarks of Sun
+Microsystems, Inc. in the U.S. and other countries.
+
+Federal Acquisitions: Commercial Software - Government Users
+Subject to Standard License Terms and Conditions.
+
+</xsd:documentation>
+</xsd:annotation>
+
+<xsd:annotation>
+<xsd:documentation>
+<![CDATA[
+This is the XML Schema for the application 1.4 deployment
+descriptor.  All application deployment descriptors must
+indicate that the schema by using the J2EE namespace
+
+http://java.sun.com/xml/ns/j2ee
+
+and by indicating the version of the schema by
+using the version element as shown below:
+
+    <application xmlns="http://java.sun.com/xml/ns/j2ee"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+        http://java.sun.com/xml/ns/j2ee/application_1_4.xsd"
+     version="1.4">
+
+    ...
+    </application>
+
+The instance documents may indicate the published version of
+the schema using the xsi:schemaLocation attribute for J2EE
+namespace with the following location:
+
+http://java.sun.com/xml/ns/j2ee/application_1_4.xsd
+]]>
+</xsd:documentation>
+</xsd:annotation>
+
+<xsd:annotation>
+<xsd:documentation>
+
+The following conventions apply to all J2EE
+deployment descriptor elements unless indicated otherwise.
+
+- In elements that specify a pathname to a file within the
+  same JAR file, relative filenames (i.e., those not
+  starting with "/") are considered relative to the root of
+  the JAR file's namespace.  Absolute filenames (i.e., those
+  starting with "/") also specify names in the root of the
+  JAR file's namespace.  In general, relative names are
+  preferred.  The exception is .war files where absolute
+  names are preferred for consistency with the Servlet API.
+
+</xsd:documentation>
+</xsd:annotation>
+
+<xsd:include schemaLocation="j2ee_1_4.xsd"/>
+
+
+<!-- **************************************************** -->
+
+
+<xsd:element name="application" type="j2ee:applicationType">
+    <xsd:annotation>
+    <xsd:documentation>
+
+    The application element is the root element of a J2EE
+    application deployment descriptor.
+
+    </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:unique name="context-root-uniqueness">
+    <xsd:annotation>
+    <xsd:documentation>
+
+    The context-root element content must be unique
+    in the ear.
+
+    </xsd:documentation>
+    </xsd:annotation>
+        <xsd:selector xpath="j2ee:module/j2ee:web"/>
+        <xsd:field    xpath="j2ee:context-root"/>
+    </xsd:unique>
+
+    <xsd:unique name="security-role-uniqueness">
+    <xsd:annotation>
+    <xsd:documentation>
+
+    The security-role-name element content
+    must be unique in the ear.
+
+    </xsd:documentation>
+    </xsd:annotation>
+        <xsd:selector xpath="j2ee:security-role"/>
+        <xsd:field    xpath="j2ee:role-name"/>
+    </xsd:unique>
+
+</xsd:element>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="applicationType">
+<xsd:annotation>
+<xsd:documentation>
+
+The applicationType defines the structure of the
+application.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="description"
+                     type="j2ee:descriptionType"
+                     minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="display-name"
+                     type="j2ee:display-nameType"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="icon"
+                     type="j2ee:iconType"
+                     minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="module"
+                     type="j2ee:moduleType"
+                     maxOccurs="unbounded">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The application deployment descriptor must have one
+        module element for each J2EE module in the
+        application package. A module element is defined
+        by moduleType definition.
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+        <xsd:element name="security-role"
+                     type="j2ee:security-roleType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="deployment-extension"
+                     type="j2ee:deployment-extensionType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="version"
+                   type="j2ee:dewey-versionType"
+                   fixed="1.4"
+                   use="required">
+    <xsd:annotation>
+    <xsd:documentation>
+
+    The required value for the version is 1.4.
+
+    </xsd:documentation>
+    </xsd:annotation>
+    </xsd:attribute>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="moduleType">
+<xsd:annotation>
+<xsd:documentation>
+
+The moduleType defines a single J2EE module and contains a
+connector, ejb, java, or web element, which indicates the
+module type and contains a path to the module file, and an
+optional alt-dd element, which specifies an optional URI to
+the post-assembly version of the deployment descriptor.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:choice>
+            <xsd:element name="connector"
+                         type="j2ee:pathType">
+            <xsd:annotation>
+            <xsd:documentation>
+
+            The connector element specifies the URI of a
+            resource adapter archive file, relative to the
+            top level of the application package.
+
+            </xsd:documentation>
+            </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="ejb"
+                         type="j2ee:pathType">
+            <xsd:annotation>
+            <xsd:documentation>
+
+            The ejb element specifies the URI of an ejb-jar,
+            relative to the top level of the application
+            package.
+
+            </xsd:documentation>
+            </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="java"
+                         type="j2ee:pathType">
+            <xsd:annotation>
+            <xsd:documentation>
+
+            The java element specifies the URI of a java
+            application client module, relative to the top
+            level of the application package.
+
+            </xsd:documentation>
+            </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="web"
+                         type="j2ee:webType"/>
+        </xsd:choice>
+        <xsd:element name="alt-dd"
+                     type="j2ee:pathType"
+                     minOccurs="0">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The alt-dd element specifies an optional URI to the
+        post-assembly version of the deployment descriptor
+        file for a particular J2EE module.  The URI must
+        specify the full pathname of the deployment
+        descriptor file relative to the application's root
+        directory. If alt-dd is not specified, the deployer
+        must read the deployment descriptor from the default
+        location and file name required by the respective
+        component specification.
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+        <xsd:element name="deployment-extension"
+                     type="j2ee:deployment-extensionType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+
+    </xsd:sequence>
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="webType">
+<xsd:annotation>
+<xsd:documentation>
+
+The webType defines the web-uri and context-root of
+a web application module.
+
+</xsd:documentation>
+</xsd:annotation>
+    <xsd:sequence>
+        <xsd:element name="web-uri"
+                     type="j2ee:pathType">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The web-uri element specifies the URI of a web
+        application file, relative to the top level of the
+        application package.
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+        <xsd:element name="context-root"
+                     type="j2ee:string">
+
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The context-root element specifies the context root
+        of a web application.
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+        <xsd:element name="deployment-extension"
+                     type="j2ee:deployment-extensionType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+    </xsd:sequence>
+</xsd:complexType>
+
+</xsd:schema>
+

Modified: xmlbeans/trunk/test/cases/xbean/compile/scomp/j2ee/connector_1_5.xsd
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/compile/scomp/j2ee/connector_1_5.xsd?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/compile/scomp/j2ee/connector_1_5.xsd&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/compile/scomp/j2ee/connector_1_5.xsd&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/compile/scomp/j2ee/connector_1_5.xsd	(original)
+++ xmlbeans/trunk/test/cases/xbean/compile/scomp/j2ee/connector_1_5.xsd	Wed Dec  8 08:54:26 2004
@@ -1,1011 +1,1011 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
-     targetNamespace="http://java.sun.com/xml/ns/j2ee"
-     xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
-     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-     elementFormDefault="qualified"
-     attributeFormDefault="unqualified"
-     version="1.5">
-<xsd:annotation>
-<xsd:documentation>
-@(#)connector_1_5.xsds	1.16 07/06/02
-</xsd:documentation>
-</xsd:annotation>
-
-<xsd:annotation>
-<xsd:documentation>
-
-Copyright 2002 Sun Microsystems, Inc., 901 San Antonio
-Road, Palo Alto, California 94303, U.S.A. All rights
-reserved.
-
-Sun Microsystems, Inc. has intellectual property rights
-relating to technology described in this document. In
-particular, and without limitation, these intellectual
-property rights may include one or more of the U.S. patents
-listed at http://www.sun.com/patents and one or more
-additional patents or pending patent applications in the
-U.S. and other countries.
-
-This document and the technology which it describes are
-distributed under licenses restricting their use, copying,
-distribution, and decompilation. No part of this document
-may be reproduced in any form by any means without prior
-written authorization of Sun and its licensors, if any.
-
-Third-party software, including font technology, is
-copyrighted and licensed from Sun suppliers.
-
-Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
-JavaServer Pages, Enterprise JavaBeans and the Java Coffee
-Cup logo are trademarks or registered trademarks of Sun
-Microsystems, Inc. in the U.S. and other countries.
-
-Federal Acquisitions: Commercial Software - Government Users
-Subject to Standard License Terms and Conditions.
-
-</xsd:documentation>
-</xsd:annotation>
-
-<xsd:annotation>
-<xsd:documentation>
-<![CDATA[
-This is the XML Schema for the Connector 1.5 deployment
-descriptor.  All Connector deployment descriptors must
-indicate the connector resource adapter schema by using the
-J2EE namespace:
-
-http://java.sun.com/xml/ns/j2ee
-
-and by indicating the version of the schema by
-using the version element as shown below:
-
-    <connector xmlns="http://java.sun.com/xml/ns/j2ee"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
-         http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
-     version="1.5">
-    ...
-    </connector>
-
-The instance documents may indicate the published version of
-the schema using the xsi:schemaLocation attribute for J2EE
-namespace with the following location:
-
-http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd
-]]>
-</xsd:documentation>
-</xsd:annotation>
-
-<xsd:annotation>
-<xsd:documentation>
-
-The following conventions apply to all J2EE
-deployment descriptor elements unless indicated otherwise.
-
-- In elements that specify a pathname to a file within the
-  same JAR file, relative filenames (i.e., those not
-  starting with "/") are considered relative to the root of
-  the JAR file's namespace.  Absolute filenames (i.e., those
-  starting with "/") also specify names in the root of the
-  JAR file's namespace.  In general, relative names are
-  preferred.  The exception is .war files where absolute
-  names are preferred for consistency with the Servlet API.
-
-</xsd:documentation>
-</xsd:annotation>
-
-<include schemaLocation="j2ee_1_4.xsd"/>
-
-
-<!-- **************************************************** -->
-
-
-<xsd:element name="connector" type="j2ee:connectorType">
-<xsd:annotation>
-<xsd:documentation>
-
-The connector element is the root element of the deployment
-descriptor for the resource adapter. This element includes
-general information - vendor name, resource adapter version,
-icon - about the resource adapter module. It also includes
-information specific to the implementation of the resource
-adapter library as specified through the element
-resourceadapter.
-
-</xsd:documentation>
-</xsd:annotation>
-
-</xsd:element>
-
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="activationspecType">
-<xsd:annotation>
-<xsd:documentation>
-
-The activationspecType specifies an activation
-specification.  The information includes fully qualified
-Java class name of an activation specification and a set of
-required configuration property names.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="activationspec-class"
-                     type="j2ee:fully-qualified-classType">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The element activationspec-class specifies the fully
-        qualified Java class name of the activation
-        specification class. This class must implement the
-        javax.resource.spi.ActivationSpec interface. The
-        implementation of this class is required to be a
-        JavaBean.
-
-        Example:
-            <activationspec-class>com.wombat.ActivationSpecImpl
-            </activationspec-class>
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="required-config-property"
-                     type="j2ee:required-config-propertyType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="adminobjectType">
-<xsd:annotation>
-<xsd:documentation>
-
-The adminobjectType specifies information about an
-administered object.  Administered objects are specific to a
-messaging style or message provider.  This contains
-information on the Java type of the interface implemented by
-an administered object, its Java class name and its
-configuration properties.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="adminobject-interface"
-                     type="j2ee:fully-qualified-classType">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The element adminobject-interface specifies the
-        fully qualified name of the Java type of the
-        interface implemented by an administered object.
-
-         Example:
-         <adminobject-interface>javax.jms.Destination
-         </adminobject-interface>
-
-        </xsd:documentation>
-        </xsd:annotation>
-
-        </xsd:element>
-        <xsd:element name="adminobject-class"
-                     type="j2ee:fully-qualified-classType">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The element adminobject-class specifies the fully
-        qualified Java class name of an administered object.
-
-        Example:
-            <adminobject-class>com.wombat.DestinationImpl
-            </adminobject-class>
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-
-        <xsd:element name="config-property"
-                     type="j2ee:config-propertyType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="authentication-mechanismType">
-<xsd:annotation>
-<xsd:documentation>
-
-The authentication-mechanismType specifies an authentication
-mechanism supported by the resource adapter. Note that this
-support is for the resource adapter and not for the
-underlying EIS instance. The optional description specifies
-any resource adapter specific requirement for the support of
-security contract and authentication mechanism.
-
-Note that BasicPassword mechanism type should support the
-javax.resource.spi.security.PasswordCredential interface.
-The Kerbv5 mechanism type should support the
-org.ietf.jgss.GSSCredential interface or the deprecated
-javax.resource.spi.security.GenericCredential interface.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="description"
-                     type="j2ee:descriptionType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="authentication-mechanism-type"
-                     type="xsd:string">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The element authentication-mechanism-type specifies
-        type of an authentication mechanism.
-
-        The example values are:
-
-        <authentication-mechanism-type>BasicPassword
-        </authentication-mechanism-type>
-
-        <authentication-mechanism-type>Kerbv5
-        </authentication-mechanism-type>
-
-        Any additional security mechanisms are outside the
-        scope of the Connector architecture specification.
-
-        </xsd:documentation>
-        </xsd:annotation>
-
-        </xsd:element>
-        <xsd:element name="credential-interface"
-                     type="j2ee:credential-interfaceType"/>
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:simpleType name="config-property-nameType">
-<xsd:annotation>
-<xsd:documentation>
-
-The config-property-nameType contains the name of a
-configuration property.
-
-The connector architecture defines a set of well-defined
-properties all of type java.lang.String. These are as
-follows.
-
-     ServerName
-     PortNumber
-     UserName
-     Password
-     ConnectionURL
-
-A resource adapter provider can extend this property set to
-include properties specific to the resource adapter and its
-underlying EIS.
-
-Possible values include
-        ServerName
-        PortNumber
-        UserName
-        Password
-        ConnectionURL
-
-Example: <config-property-name>ServerName</config-property-name>
-
-</xsd:documentation>
-</xsd:annotation>
-    <xsd:restriction base="xsd:string">
-    </xsd:restriction>
-</xsd:simpleType>
-
-<!-- **************************************************** -->
-
-<xsd:simpleType name="config-property-typeType">
-<xsd:annotation>
-<xsd:documentation>
-
-The config-property-typeType contains the fully
-qualified Java type of a configuration property.
-
-The following are the legal values:
-   java.lang.Boolean, java.lang.String, java.lang.Integer,
-   java.lang.Double, java.lang.Byte, java.lang.Short,
-   java.lang.Long, java.lang.Float, java.lang.Character
-
-Used in: config-property
-
-Example:
-<config-property-type>java.lang.String</config-property-type>
-
-</xsd:documentation>
-</xsd:annotation>
-    <xsd:restriction base="j2ee:string">
-        <xsd:enumeration value="java.lang.Boolean"/>
-        <xsd:enumeration value="java.lang.String"/>
-        <xsd:enumeration value="java.lang.Integer"/>
-        <xsd:enumeration value="java.lang.Double"/>
-        <xsd:enumeration value="java.lang.Byte"/>
-        <xsd:enumeration value="java.lang.Short"/>
-        <xsd:enumeration value="java.lang.Long"/>
-        <xsd:enumeration value="java.lang.Float"/>
-        <xsd:enumeration value="java.lang.Character"/>
-    </xsd:restriction>
-</xsd:simpleType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="config-propertyType">
-<xsd:annotation>
-<xsd:documentation>
-
-The config-propertyType contains a declaration of a single
-configuration property that may be used for providing
-configuration information.
-
-The declaration consists of an optional description, name,
-type and an optional value of the configuration property. If
-the resource adapter provider does not specify a value than
-the deployer is responsible for providing a valid value for
-a configuration property.
-
-Any bounds or well-defined values of properties should be
-described in the description element.
-
-</xsd:documentation>
-</xsd:annotation>
-    <xsd:sequence>
-        <xsd:element name="description"
-                     type="j2ee:descriptionType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="config-property-name"
-                     type="j2ee:config-property-nameType"/>
-        <xsd:element name="config-property-type"
-                     type="j2ee:config-property-typeType"/>
-        <xsd:element name="config-property-value"
-                     type="xsd:string"
-                     minOccurs="0">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The element config-property-value contains the value
-        of a configuration entry. Note, it is possible for a
-        resource adapter deployer to override this
-        configuration information during deployment.
-
-        Example:
-        <config-property-value>WombatServer</config-property-value>
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="connection-definitionType">
-<xsd:annotation>
-<xsd:documentation>
-
-The connection-definitionType defines a set of connection
-interfaces and classes pertaining to a particular connection
-type. This also includes configurable properties for
-ManagedConnectionFactory instances that may be produced out
-of this set.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="managedconnectionfactory-class"
-                     type="j2ee:fully-qualified-classType">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The element managedconnectionfactory-class specifies
-        the fully qualified name of the Java class that
-        implements the
-        javax.resource.spi.ManagedConnectionFactory interface.
-        This Java class is provided as part of resource
-        adapter's implementation of connector architecture
-        specified contracts. The implementation of this
-        class is required to be a JavaBean.
-
-        Example:
-        <managedconnectionfactory-class>
-            com.wombat.ManagedConnectionFactoryImpl
-        </managedconnectionfactory-class>
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="config-property"
-                     type="j2ee:config-propertyType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="connectionfactory-interface"
-                     type="j2ee:fully-qualified-classType">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The element connectionfactory-interface specifies
-        the fully qualified name of the ConnectionFactory
-        interface supported by the resource adapter.
-
-        Example:
-        <connectionfactory-interface>com.wombat.ConnectionFactory
-        </connectionfactory-interface>
-
-        OR
-
-        <connectionfactory-interface>javax.resource.cci.ConnectionFactory
-        </connectionfactory-interface>
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-
-        <xsd:element name="connectionfactory-impl-class"
-                     type="j2ee:fully-qualified-classType">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The element connectionfactory-impl-class specifies
-        the fully qualified name of the ConnectionFactory
-        class that implements resource adapter
-        specific ConnectionFactory interface.
-
-        Example:
-
-        <connectionfactory-impl-class>com.wombat.ConnectionFactoryImpl
-        </connectionfactory-impl-class>
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="connection-interface"
-                     type="j2ee:fully-qualified-classType">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The connection-interface element specifies the fully
-        qualified name of the Connection interface supported
-        by the resource adapter.
-
-        Example:
-
-            <connection-interface>javax.resource.cci.Connection
-            </connection-interface>
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="connection-impl-class"
-                     type="j2ee:fully-qualified-classType">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The connection-impl-classType specifies the fully
-        qualified name of the Connection class that
-        implements resource adapter specific Connection
-        interface.  It is used by the connection-impl-class
-        elements.
-
-        Example:
-
-            <connection-impl-class>com.wombat.ConnectionImpl
-            </connection-impl-class>
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="connectorType">
-<xsd:annotation>
-<xsd:documentation>
-
-The connectorType defines a resource adapter.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="description"
-                     type="j2ee:descriptionType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="display-name"
-                     type="j2ee:display-nameType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="icon"
-                     type="j2ee:iconType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="vendor-name">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The element vendor-name specifies the name of
-        resource adapter provider vendor.
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="eis-type"
-                     type="xsd:string">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The element eis-type contains information about the
-        type of the EIS. For example, the type of an EIS can
-        be product name of EIS independent of any version
-        info.
-
-        This helps in identifying EIS instances that can be
-        used with this resource adapter.
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="resourceadapter-version"
-                     type="xsd:string">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The element version specifies a string-based version
-        of the resource adapter from the resource adapter
-        provider.
-
-        </xsd:documentation>
-        </xsd:annotation>
-
-        </xsd:element>
-        <xsd:element name="license"
-                     type="j2ee:licenseType"
-                     minOccurs="0"/>
-        <xsd:element name="resourceadapter"
-                     type="j2ee:resourceadapterType"/>
-        <xsd:element name="deployment-extension"
-                     type="j2ee:deployment-extensionType"
-                     minOccurs="0"
-                     maxOccurs="unbounded">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        Resource adapter specific extensions can be
-        specified by using the deployment-extension
-        elements.
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-
-    </xsd:sequence>
-    <xsd:attribute name="version"
-                   type="j2ee:dewey-versionType"
-                   fixed="1.5"
-                   use="required">
-    <xsd:annotation>
-    <xsd:documentation>
-
-    The version specifies the version of the
-    connector architecture specification that is
-    supported by this resource adapter. This information
-    enables deployer to configure the resource adapter to
-    support deployment and runtime requirements of the
-    corresponding connector architecture specification.
-
-    </xsd:documentation>
-    </xsd:annotation>
-    </xsd:attribute>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:simpleType name="credential-interfaceType">
-<xsd:annotation>
-<xsd:documentation>
-
-The credential-interfaceType specifies the
-interface that the resource adapter implementation
-supports for the representation of the
-credentials. This element(s) that use this type,
-i.e. credential-interface,  should be used by
-application server to find out the Credential
-interface it should use as part of the security
-contract.
-
-The possible values are:
-
-javax.resource.spi.security.PasswordCredential
-org.ietf.jgss.GSSCredential
-javax.resource.spi.security.GenericCredential
-
-</xsd:documentation>
-</xsd:annotation>
-
-  <xsd:restriction base="j2ee:fully-qualified-classType">
-        <xsd:enumeration
-            value="javax.resource.spi.security.PasswordCredential"/>
-        <xsd:enumeration
-            value="org.ietf.jgss.GSSCredential"/>
-        <xsd:enumeration
-            value="javax.resource.spi.security.GenericCredential"/>
-    </xsd:restriction>
-
-</xsd:simpleType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="inbound-resourceadapterType">
-<xsd:annotation>
-<xsd:documentation>
-
-The inbound-resourceadapterType specifies information
-about an inbound resource adapter. This contains information
-specific to the implementation of the resource adapter
-library as specified through the messageadapter element.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="messageadapter"
-                     type="j2ee:messageadapterType"
-                     minOccurs="0">
-        <xsd:unique name="messagelistener-type-uniqueness">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The messagelistener-type element content must be
-        unique in the messageadapter. Several messagelisteners
-        can not use the same messagelistener-type.
-
-        </xsd:documentation>
-        </xsd:annotation>
-        <xsd:selector xpath="j2ee:messagelistener"/>
-        <xsd:field    xpath="j2ee:messagelistener-type"/>
-        </xsd:unique>
-        </xsd:element>
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="licenseType">
-<xsd:annotation>
-<xsd:documentation>
-
-The licenseType specifies licensing requirements for the
-resource adapter module. This type specifies whether a
-license is required to deploy and use this resource adapter,
-and an optional description of the licensing terms
-(examples: duration of license, number of connection
-restrictions). It is used by the license element.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-            <xsd:element name="description"
-                         type="j2ee:descriptionType"
-                         minOccurs="0"
-                         maxOccurs="unbounded"/>
-            <xsd:element name="license-required"
-                         type="j2ee:true-falseType">
-            <xsd:annotation>
-            <xsd:documentation>
-
-            The element license-required specifies whether a
-            license is required to deploy and use the
-            resource adapter. This element must be one of
-            the following, "true" or "false".
-
-            </xsd:documentation>
-            </xsd:annotation>
-            </xsd:element>
-    </xsd:sequence>
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="messageadapterType">
-<xsd:annotation>
-<xsd:documentation>
-
-The messageadapterType specifies information about the
-messaging capabilities of the resource adapter. This
-contains information specific to the implementation of the
-resource adapter library as specified through the
-messagelistener element.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="messagelistener"
-                     type="j2ee:messagelistenerType"
-                     maxOccurs="unbounded"/>
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="messagelistenerType">
-<xsd:annotation>
-<xsd:documentation>
-
-The messagelistenerType specifies information about a
-specific message listener supported by the messaging
-resource adapter. It contains information on the Java type
-of the message listener interface and an activation
-specification.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="messagelistener-type"
-                     type="j2ee:fully-qualified-classType">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The element messagelistener-type specifies the fully
-        qualified name of the Java type of a message
-        listener interface.
-
-        Example:
-
-          <messagelistener-type>javax.jms.MessageListener
-          </messagelistener-type>
-
-        </xsd:documentation>
-        </xsd:annotation>
-
-        </xsd:element>
-        <xsd:element name="activationspec"
-                     type="j2ee:activationspecType"/>
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="outbound-resourceadapterType">
-<xsd:annotation>
-<xsd:documentation>
-
-The outbound-resourceadapterType specifies information about
-an outbound resource adapter. The information includes fully
-qualified names of classes/interfaces required as part of
-the connector architecture specified contracts for
-connection management, level of transaction support
-provided, one or more authentication mechanisms supported
-and additional required security permissions.
-
-If there is no authentication-mechanism specified as part of
-resource adapter element then the resource adapter does not
-support any standard security authentication mechanisms as
-part of security contract. The application server ignores
-the security part of the system contracts in this case.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="connection-definition"
-                     type="j2ee:connection-definitionType"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="transaction-support"
-                     type="j2ee:transaction-supportType"/>
-        <xsd:element name="authentication-mechanism"
-                     type="j2ee:authentication-mechanismType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="reauthentication-support"
-                     type="j2ee:true-falseType">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The element reauthentication-support specifies
-        whether the resource adapter implementation supports
-        re-authentication of existing Managed- Connection
-        instance. Note that this information is for the
-        resource adapter implementation and not for the
-        underlying EIS instance. This element must have
-        either a "true" or "false" value.
-
-        </xsd:documentation>
-        </xsd:annotation>
-
-        </xsd:element>
-        <xsd:element name="security-permission"
-                     type="j2ee:security-permissionType"
-                     minOccurs="0"
-                     maxOccurs="unbounded">
-        </xsd:element>
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="required-config-propertyType">
-<xsd:annotation>
-<xsd:documentation>
-
-The required-config-propertyType contains a declaration
-of a single configuration property used for specifying a
-required configuration property name. It is used
-by required-config-property elements.
-
-Example:
-
-<required-config-property>Destination</required-config-property>
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="description"
-                     type="j2ee:descriptionType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="config-property-name"
-                     type="j2ee:config-property-nameType"/>
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="resourceadapterType">
-<xsd:annotation>
-<xsd:documentation>
-
-The resourceadapterType specifies information about the
-resource adapter. The information includes fully qualified
-resource adapter Java class name, configuration properties,
-information specific to the implementation of the resource
-adapter library as specified through the
-outbound-resourceadapter and inbound-resourceadapter
-elements, and an optional set of administered objects.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="resourceadapter-class"
-                     type="j2ee:fully-qualified-classType"
-                     minOccurs="0">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The element resourceadapter-class specifies the
-        fully qualified name of a Java class that implements
-        the javax.resource.spi.ResourceAdapter
-        interface. This Java class is provided as part of
-        resource adapter's implementation of connector
-        architecture specified contracts. The implementation
-        of this class is required to be a JavaBean.
-
-        </xsd:documentation>
-        </xsd:annotation>
-
-        </xsd:element>
-        <xsd:element name="config-property"
-                     type="j2ee:config-propertyType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="outbound-resourceadapter"
-                     type="j2ee:outbound-resourceadapterType"
-                     minOccurs="0"/>
-        <xsd:element name="inbound-resourceadapter"
-                     type="j2ee:inbound-resourceadapterType"
-                     minOccurs="0"/>
-        <xsd:element name="adminobject"
-                     type="j2ee:adminobjectType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="security-permissionType">
-<xsd:annotation>
-<xsd:documentation>
-
-The security-permissionType specifies a security
-permission that is required by the resource adapter code.
-
-The security permission listed in the deployment descriptor
-are ones that are different from those required by the
-default permission set as specified in the connector
-specification. The optional description can mention specific
-reason that resource adapter requires a given security
-permission.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="description"
-                     type="j2ee:descriptionType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="security-permission-spec"
-                     type="xsd:string">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The element permission-spec specifies a security
-        permission based on the Security policy file
-        syntax. Refer to the following URL for Sun's
-        implementation of the security permission
-        specification:
-
-        http://java.sun.com/products/jdk/1.4/docs/guide/security/PolicyFiles.html#FileSyntax
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:simpleType name="transaction-supportType">
-<xsd:annotation>
-<xsd:documentation>
-
-The transaction-supportType specifies the level of
-transaction support provided by the resource adapter. It is
-used by transaction-support elements.
-
-The value must be one of the following:
-
-    NoTransaction
-    LocalTransaction
-    XATransaction
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:restriction base="j2ee:string">
-        <xsd:enumeration value="NoTransaction"/>
-        <xsd:enumeration value="LocalTransaction"/>
-        <xsd:enumeration value="XATransaction"/>
-    </xsd:restriction>
-
-</xsd:simpleType>
-
-</xsd:schema>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
+     targetNamespace="http://java.sun.com/xml/ns/j2ee"
+     xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
+     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+     elementFormDefault="qualified"
+     attributeFormDefault="unqualified"
+     version="1.5">
+<xsd:annotation>
+<xsd:documentation>
+@(#)connector_1_5.xsds	1.16 07/06/02
+</xsd:documentation>
+</xsd:annotation>
+
+<xsd:annotation>
+<xsd:documentation>
+
+Copyright 2002 Sun Microsystems, Inc., 901 San Antonio
+Road, Palo Alto, California 94303, U.S.A. All rights
+reserved.
+
+Sun Microsystems, Inc. has intellectual property rights
+relating to technology described in this document. In
+particular, and without limitation, these intellectual
+property rights may include one or more of the U.S. patents
+listed at http://www.sun.com/patents and one or more
+additional patents or pending patent applications in the
+U.S. and other countries.
+
+This document and the technology which it describes are
+distributed under licenses restricting their use, copying,
+distribution, and decompilation. No part of this document
+may be reproduced in any form by any means without prior
+written authorization of Sun and its licensors, if any.
+
+Third-party software, including font technology, is
+copyrighted and licensed from Sun suppliers.
+
+Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
+JavaServer Pages, Enterprise JavaBeans and the Java Coffee
+Cup logo are trademarks or registered trademarks of Sun
+Microsystems, Inc. in the U.S. and other countries.
+
+Federal Acquisitions: Commercial Software - Government Users
+Subject to Standard License Terms and Conditions.
+
+</xsd:documentation>
+</xsd:annotation>
+
+<xsd:annotation>
+<xsd:documentation>
+<![CDATA[
+This is the XML Schema for the Connector 1.5 deployment
+descriptor.  All Connector deployment descriptors must
+indicate the connector resource adapter schema by using the
+J2EE namespace:
+
+http://java.sun.com/xml/ns/j2ee
+
+and by indicating the version of the schema by
+using the version element as shown below:
+
+    <connector xmlns="http://java.sun.com/xml/ns/j2ee"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+         http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
+     version="1.5">
+    ...
+    </connector>
+
+The instance documents may indicate the published version of
+the schema using the xsi:schemaLocation attribute for J2EE
+namespace with the following location:
+
+http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd
+]]>
+</xsd:documentation>
+</xsd:annotation>
+
+<xsd:annotation>
+<xsd:documentation>
+
+The following conventions apply to all J2EE
+deployment descriptor elements unless indicated otherwise.
+
+- In elements that specify a pathname to a file within the
+  same JAR file, relative filenames (i.e., those not
+  starting with "/") are considered relative to the root of
+  the JAR file's namespace.  Absolute filenames (i.e., those
+  starting with "/") also specify names in the root of the
+  JAR file's namespace.  In general, relative names are
+  preferred.  The exception is .war files where absolute
+  names are preferred for consistency with the Servlet API.
+
+</xsd:documentation>
+</xsd:annotation>
+
+<include schemaLocation="j2ee_1_4.xsd"/>
+
+
+<!-- **************************************************** -->
+
+
+<xsd:element name="connector" type="j2ee:connectorType">
+<xsd:annotation>
+<xsd:documentation>
+
+The connector element is the root element of the deployment
+descriptor for the resource adapter. This element includes
+general information - vendor name, resource adapter version,
+icon - about the resource adapter module. It also includes
+information specific to the implementation of the resource
+adapter library as specified through the element
+resourceadapter.
+
+</xsd:documentation>
+</xsd:annotation>
+
+</xsd:element>
+
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="activationspecType">
+<xsd:annotation>
+<xsd:documentation>
+
+The activationspecType specifies an activation
+specification.  The information includes fully qualified
+Java class name of an activation specification and a set of
+required configuration property names.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="activationspec-class"
+                     type="j2ee:fully-qualified-classType">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The element activationspec-class specifies the fully
+        qualified Java class name of the activation
+        specification class. This class must implement the
+        javax.resource.spi.ActivationSpec interface. The
+        implementation of this class is required to be a
+        JavaBean.
+
+        Example:
+            <activationspec-class>com.wombat.ActivationSpecImpl
+            </activationspec-class>
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+        <xsd:element name="required-config-property"
+                     type="j2ee:required-config-propertyType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="adminobjectType">
+<xsd:annotation>
+<xsd:documentation>
+
+The adminobjectType specifies information about an
+administered object.  Administered objects are specific to a
+messaging style or message provider.  This contains
+information on the Java type of the interface implemented by
+an administered object, its Java class name and its
+configuration properties.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="adminobject-interface"
+                     type="j2ee:fully-qualified-classType">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The element adminobject-interface specifies the
+        fully qualified name of the Java type of the
+        interface implemented by an administered object.
+
+         Example:
+         <adminobject-interface>javax.jms.Destination
+         </adminobject-interface>
+
+        </xsd:documentation>
+        </xsd:annotation>
+
+        </xsd:element>
+        <xsd:element name="adminobject-class"
+                     type="j2ee:fully-qualified-classType">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The element adminobject-class specifies the fully
+        qualified Java class name of an administered object.
+
+        Example:
+            <adminobject-class>com.wombat.DestinationImpl
+            </adminobject-class>
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+
+        <xsd:element name="config-property"
+                     type="j2ee:config-propertyType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="authentication-mechanismType">
+<xsd:annotation>
+<xsd:documentation>
+
+The authentication-mechanismType specifies an authentication
+mechanism supported by the resource adapter. Note that this
+support is for the resource adapter and not for the
+underlying EIS instance. The optional description specifies
+any resource adapter specific requirement for the support of
+security contract and authentication mechanism.
+
+Note that BasicPassword mechanism type should support the
+javax.resource.spi.security.PasswordCredential interface.
+The Kerbv5 mechanism type should support the
+org.ietf.jgss.GSSCredential interface or the deprecated
+javax.resource.spi.security.GenericCredential interface.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="description"
+                     type="j2ee:descriptionType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="authentication-mechanism-type"
+                     type="xsd:string">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The element authentication-mechanism-type specifies
+        type of an authentication mechanism.
+
+        The example values are:
+
+        <authentication-mechanism-type>BasicPassword
+        </authentication-mechanism-type>
+
+        <authentication-mechanism-type>Kerbv5
+        </authentication-mechanism-type>
+
+        Any additional security mechanisms are outside the
+        scope of the Connector architecture specification.
+
+        </xsd:documentation>
+        </xsd:annotation>
+
+        </xsd:element>
+        <xsd:element name="credential-interface"
+                     type="j2ee:credential-interfaceType"/>
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:simpleType name="config-property-nameType">
+<xsd:annotation>
+<xsd:documentation>
+
+The config-property-nameType contains the name of a
+configuration property.
+
+The connector architecture defines a set of well-defined
+properties all of type java.lang.String. These are as
+follows.
+
+     ServerName
+     PortNumber
+     UserName
+     Password
+     ConnectionURL
+
+A resource adapter provider can extend this property set to
+include properties specific to the resource adapter and its
+underlying EIS.
+
+Possible values include
+        ServerName
+        PortNumber
+        UserName
+        Password
+        ConnectionURL
+
+Example: <config-property-name>ServerName</config-property-name>
+
+</xsd:documentation>
+</xsd:annotation>
+    <xsd:restriction base="xsd:string">
+    </xsd:restriction>
+</xsd:simpleType>
+
+<!-- **************************************************** -->
+
+<xsd:simpleType name="config-property-typeType">
+<xsd:annotation>
+<xsd:documentation>
+
+The config-property-typeType contains the fully
+qualified Java type of a configuration property.
+
+The following are the legal values:
+   java.lang.Boolean, java.lang.String, java.lang.Integer,
+   java.lang.Double, java.lang.Byte, java.lang.Short,
+   java.lang.Long, java.lang.Float, java.lang.Character
+
+Used in: config-property
+
+Example:
+<config-property-type>java.lang.String</config-property-type>
+
+</xsd:documentation>
+</xsd:annotation>
+    <xsd:restriction base="j2ee:string">
+        <xsd:enumeration value="java.lang.Boolean"/>
+        <xsd:enumeration value="java.lang.String"/>
+        <xsd:enumeration value="java.lang.Integer"/>
+        <xsd:enumeration value="java.lang.Double"/>
+        <xsd:enumeration value="java.lang.Byte"/>
+        <xsd:enumeration value="java.lang.Short"/>
+        <xsd:enumeration value="java.lang.Long"/>
+        <xsd:enumeration value="java.lang.Float"/>
+        <xsd:enumeration value="java.lang.Character"/>
+    </xsd:restriction>
+</xsd:simpleType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="config-propertyType">
+<xsd:annotation>
+<xsd:documentation>
+
+The config-propertyType contains a declaration of a single
+configuration property that may be used for providing
+configuration information.
+
+The declaration consists of an optional description, name,
+type and an optional value of the configuration property. If
+the resource adapter provider does not specify a value than
+the deployer is responsible for providing a valid value for
+a configuration property.
+
+Any bounds or well-defined values of properties should be
+described in the description element.
+
+</xsd:documentation>
+</xsd:annotation>
+    <xsd:sequence>
+        <xsd:element name="description"
+                     type="j2ee:descriptionType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="config-property-name"
+                     type="j2ee:config-property-nameType"/>
+        <xsd:element name="config-property-type"
+                     type="j2ee:config-property-typeType"/>
+        <xsd:element name="config-property-value"
+                     type="xsd:string"
+                     minOccurs="0">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The element config-property-value contains the value
+        of a configuration entry. Note, it is possible for a
+        resource adapter deployer to override this
+        configuration information during deployment.
+
+        Example:
+        <config-property-value>WombatServer</config-property-value>
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="connection-definitionType">
+<xsd:annotation>
+<xsd:documentation>
+
+The connection-definitionType defines a set of connection
+interfaces and classes pertaining to a particular connection
+type. This also includes configurable properties for
+ManagedConnectionFactory instances that may be produced out
+of this set.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="managedconnectionfactory-class"
+                     type="j2ee:fully-qualified-classType">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The element managedconnectionfactory-class specifies
+        the fully qualified name of the Java class that
+        implements the
+        javax.resource.spi.ManagedConnectionFactory interface.
+        This Java class is provided as part of resource
+        adapter's implementation of connector architecture
+        specified contracts. The implementation of this
+        class is required to be a JavaBean.
+
+        Example:
+        <managedconnectionfactory-class>
+            com.wombat.ManagedConnectionFactoryImpl
+        </managedconnectionfactory-class>
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+        <xsd:element name="config-property"
+                     type="j2ee:config-propertyType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="connectionfactory-interface"
+                     type="j2ee:fully-qualified-classType">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The element connectionfactory-interface specifies
+        the fully qualified name of the ConnectionFactory
+        interface supported by the resource adapter.
+
+        Example:
+        <connectionfactory-interface>com.wombat.ConnectionFactory
+        </connectionfactory-interface>
+
+        OR
+
+        <connectionfactory-interface>javax.resource.cci.ConnectionFactory
+        </connectionfactory-interface>
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+
+        <xsd:element name="connectionfactory-impl-class"
+                     type="j2ee:fully-qualified-classType">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The element connectionfactory-impl-class specifies
+        the fully qualified name of the ConnectionFactory
+        class that implements resource adapter
+        specific ConnectionFactory interface.
+
+        Example:
+
+        <connectionfactory-impl-class>com.wombat.ConnectionFactoryImpl
+        </connectionfactory-impl-class>
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+        <xsd:element name="connection-interface"
+                     type="j2ee:fully-qualified-classType">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The connection-interface element specifies the fully
+        qualified name of the Connection interface supported
+        by the resource adapter.
+
+        Example:
+
+            <connection-interface>javax.resource.cci.Connection
+            </connection-interface>
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+        <xsd:element name="connection-impl-class"
+                     type="j2ee:fully-qualified-classType">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The connection-impl-classType specifies the fully
+        qualified name of the Connection class that
+        implements resource adapter specific Connection
+        interface.  It is used by the connection-impl-class
+        elements.
+
+        Example:
+
+            <connection-impl-class>com.wombat.ConnectionImpl
+            </connection-impl-class>
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="connectorType">
+<xsd:annotation>
+<xsd:documentation>
+
+The connectorType defines a resource adapter.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="description"
+                     type="j2ee:descriptionType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="display-name"
+                     type="j2ee:display-nameType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="icon"
+                     type="j2ee:iconType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="vendor-name">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The element vendor-name specifies the name of
+        resource adapter provider vendor.
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+        <xsd:element name="eis-type"
+                     type="xsd:string">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The element eis-type contains information about the
+        type of the EIS. For example, the type of an EIS can
+        be product name of EIS independent of any version
+        info.
+
+        This helps in identifying EIS instances that can be
+        used with this resource adapter.
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+        <xsd:element name="resourceadapter-version"
+                     type="xsd:string">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The element version specifies a string-based version
+        of the resource adapter from the resource adapter
+        provider.
+
+        </xsd:documentation>
+        </xsd:annotation>
+
+        </xsd:element>
+        <xsd:element name="license"
+                     type="j2ee:licenseType"
+                     minOccurs="0"/>
+        <xsd:element name="resourceadapter"
+                     type="j2ee:resourceadapterType"/>
+        <xsd:element name="deployment-extension"
+                     type="j2ee:deployment-extensionType"
+                     minOccurs="0"
+                     maxOccurs="unbounded">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        Resource adapter specific extensions can be
+        specified by using the deployment-extension
+        elements.
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+
+    </xsd:sequence>
+    <xsd:attribute name="version"
+                   type="j2ee:dewey-versionType"
+                   fixed="1.5"
+                   use="required">
+    <xsd:annotation>
+    <xsd:documentation>
+
+    The version specifies the version of the
+    connector architecture specification that is
+    supported by this resource adapter. This information
+    enables deployer to configure the resource adapter to
+    support deployment and runtime requirements of the
+    corresponding connector architecture specification.
+
+    </xsd:documentation>
+    </xsd:annotation>
+    </xsd:attribute>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:simpleType name="credential-interfaceType">
+<xsd:annotation>
+<xsd:documentation>
+
+The credential-interfaceType specifies the
+interface that the resource adapter implementation
+supports for the representation of the
+credentials. This element(s) that use this type,
+i.e. credential-interface,  should be used by
+application server to find out the Credential
+interface it should use as part of the security
+contract.
+
+The possible values are:
+
+javax.resource.spi.security.PasswordCredential
+org.ietf.jgss.GSSCredential
+javax.resource.spi.security.GenericCredential
+
+</xsd:documentation>
+</xsd:annotation>
+
+  <xsd:restriction base="j2ee:fully-qualified-classType">
+        <xsd:enumeration
+            value="javax.resource.spi.security.PasswordCredential"/>
+        <xsd:enumeration
+            value="org.ietf.jgss.GSSCredential"/>
+        <xsd:enumeration
+            value="javax.resource.spi.security.GenericCredential"/>
+    </xsd:restriction>
+
+</xsd:simpleType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="inbound-resourceadapterType">
+<xsd:annotation>
+<xsd:documentation>
+
+The inbound-resourceadapterType specifies information
+about an inbound resource adapter. This contains information
+specific to the implementation of the resource adapter
+library as specified through the messageadapter element.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="messageadapter"
+                     type="j2ee:messageadapterType"
+                     minOccurs="0">
+        <xsd:unique name="messagelistener-type-uniqueness">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The messagelistener-type element content must be
+        unique in the messageadapter. Several messagelisteners
+        can not use the same messagelistener-type.
+
+        </xsd:documentation>
+        </xsd:annotation>
+        <xsd:selector xpath="j2ee:messagelistener"/>
+        <xsd:field    xpath="j2ee:messagelistener-type"/>
+        </xsd:unique>
+        </xsd:element>
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="licenseType">
+<xsd:annotation>
+<xsd:documentation>
+
+The licenseType specifies licensing requirements for the
+resource adapter module. This type specifies whether a
+license is required to deploy and use this resource adapter,
+and an optional description of the licensing terms
+(examples: duration of license, number of connection
+restrictions). It is used by the license element.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+            <xsd:element name="description"
+                         type="j2ee:descriptionType"
+                         minOccurs="0"
+                         maxOccurs="unbounded"/>
+            <xsd:element name="license-required"
+                         type="j2ee:true-falseType">
+            <xsd:annotation>
+            <xsd:documentation>
+
+            The element license-required specifies whether a
+            license is required to deploy and use the
+            resource adapter. This element must be one of
+            the following, "true" or "false".
+
+            </xsd:documentation>
+            </xsd:annotation>
+            </xsd:element>
+    </xsd:sequence>
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="messageadapterType">
+<xsd:annotation>
+<xsd:documentation>
+
+The messageadapterType specifies information about the
+messaging capabilities of the resource adapter. This
+contains information specific to the implementation of the
+resource adapter library as specified through the
+messagelistener element.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="messagelistener"
+                     type="j2ee:messagelistenerType"
+                     maxOccurs="unbounded"/>
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="messagelistenerType">
+<xsd:annotation>
+<xsd:documentation>
+
+The messagelistenerType specifies information about a
+specific message listener supported by the messaging
+resource adapter. It contains information on the Java type
+of the message listener interface and an activation
+specification.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="messagelistener-type"
+                     type="j2ee:fully-qualified-classType">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The element messagelistener-type specifies the fully
+        qualified name of the Java type of a message
+        listener interface.
+
+        Example:
+
+          <messagelistener-type>javax.jms.MessageListener
+          </messagelistener-type>
+
+        </xsd:documentation>
+        </xsd:annotation>
+
+        </xsd:element>
+        <xsd:element name="activationspec"
+                     type="j2ee:activationspecType"/>
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="outbound-resourceadapterType">
+<xsd:annotation>
+<xsd:documentation>
+
+The outbound-resourceadapterType specifies information about
+an outbound resource adapter. The information includes fully
+qualified names of classes/interfaces required as part of
+the connector architecture specified contracts for
+connection management, level of transaction support
+provided, one or more authentication mechanisms supported
+and additional required security permissions.
+
+If there is no authentication-mechanism specified as part of
+resource adapter element then the resource adapter does not
+support any standard security authentication mechanisms as
+part of security contract. The application server ignores
+the security part of the system contracts in this case.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="connection-definition"
+                     type="j2ee:connection-definitionType"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="transaction-support"
+                     type="j2ee:transaction-supportType"/>
+        <xsd:element name="authentication-mechanism"
+                     type="j2ee:authentication-mechanismType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="reauthentication-support"
+                     type="j2ee:true-falseType">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The element reauthentication-support specifies
+        whether the resource adapter implementation supports
+        re-authentication of existing Managed- Connection
+        instance. Note that this information is for the
+        resource adapter implementation and not for the
+        underlying EIS instance. This element must have
+        either a "true" or "false" value.
+
+        </xsd:documentation>
+        </xsd:annotation>
+
+        </xsd:element>
+        <xsd:element name="security-permission"
+                     type="j2ee:security-permissionType"
+                     minOccurs="0"
+                     maxOccurs="unbounded">
+        </xsd:element>
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="required-config-propertyType">
+<xsd:annotation>
+<xsd:documentation>
+
+The required-config-propertyType contains a declaration
+of a single configuration property used for specifying a
+required configuration property name. It is used
+by required-config-property elements.
+
+Example:
+
+<required-config-property>Destination</required-config-property>
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="description"
+                     type="j2ee:descriptionType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="config-property-name"
+                     type="j2ee:config-property-nameType"/>
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="resourceadapterType">
+<xsd:annotation>
+<xsd:documentation>
+
+The resourceadapterType specifies information about the
+resource adapter. The information includes fully qualified
+resource adapter Java class name, configuration properties,
+information specific to the implementation of the resource
+adapter library as specified through the
+outbound-resourceadapter and inbound-resourceadapter
+elements, and an optional set of administered objects.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="resourceadapter-class"
+                     type="j2ee:fully-qualified-classType"
+                     minOccurs="0">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The element resourceadapter-class specifies the
+        fully qualified name of a Java class that implements
+        the javax.resource.spi.ResourceAdapter
+        interface. This Java class is provided as part of
+        resource adapter's implementation of connector
+        architecture specified contracts. The implementation
+        of this class is required to be a JavaBean.
+
+        </xsd:documentation>
+        </xsd:annotation>
+
+        </xsd:element>
+        <xsd:element name="config-property"
+                     type="j2ee:config-propertyType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="outbound-resourceadapter"
+                     type="j2ee:outbound-resourceadapterType"
+                     minOccurs="0"/>
+        <xsd:element name="inbound-resourceadapter"
+                     type="j2ee:inbound-resourceadapterType"
+                     minOccurs="0"/>
+        <xsd:element name="adminobject"
+                     type="j2ee:adminobjectType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="security-permissionType">
+<xsd:annotation>
+<xsd:documentation>
+
+The security-permissionType specifies a security
+permission that is required by the resource adapter code.
+
+The security permission listed in the deployment descriptor
+are ones that are different from those required by the
+default permission set as specified in the connector
+specification. The optional description can mention specific
+reason that resource adapter requires a given security
+permission.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="description"
+                     type="j2ee:descriptionType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="security-permission-spec"
+                     type="xsd:string">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The element permission-spec specifies a security
+        permission based on the Security policy file
+        syntax. Refer to the following URL for Sun's
+        implementation of the security permission
+        specification:
+
+        http://java.sun.com/products/jdk/1.4/docs/guide/security/PolicyFiles.html#FileSyntax
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:simpleType name="transaction-supportType">
+<xsd:annotation>
+<xsd:documentation>
+
+The transaction-supportType specifies the level of
+transaction support provided by the resource adapter. It is
+used by transaction-support elements.
+
+The value must be one of the following:
+
+    NoTransaction
+    LocalTransaction
+    XATransaction
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:restriction base="j2ee:string">
+        <xsd:enumeration value="NoTransaction"/>
+        <xsd:enumeration value="LocalTransaction"/>
+        <xsd:enumeration value="XATransaction"/>
+    </xsd:restriction>
+
+</xsd:simpleType>
+
+</xsd:schema>
+

Modified: xmlbeans/trunk/test/cases/xbean/compile/scomp/j2ee/ejb-jar_2_1.xsd
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/compile/scomp/j2ee/ejb-jar_2_1.xsd?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/compile/scomp/j2ee/ejb-jar_2_1.xsd&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/compile/scomp/j2ee/ejb-jar_2_1.xsd&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/compile/scomp/j2ee/ejb-jar_2_1.xsd	(original)
+++ xmlbeans/trunk/test/cases/xbean/compile/scomp/j2ee/ejb-jar_2_1.xsd	Wed Dec  8 08:54:26 2004
@@ -1,2383 +1,2383 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
-     targetNamespace="http://java.sun.com/xml/ns/j2ee"
-     xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
-     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-     elementFormDefault="qualified"
-     attributeFormDefault="unqualified"
-     version="2.1">
-<xsd:annotation>
-<xsd:documentation>
-@(#)ejb-jar_2_1.xsds	1.10 07/24/02
-</xsd:documentation>
-</xsd:annotation>
-
-<xsd:annotation>
-<xsd:documentation>
-
-Copyright 2002 Sun Microsystems, Inc., 901 San Antonio
-Road, Palo Alto, California 94303, U.S.A. All rights
-reserved.
-
-Sun Microsystems, Inc. has intellectual property rights
-relating to technology described in this document. In
-particular, and without limitation, these intellectual
-property rights may include one or more of the U.S. patents
-listed at http://www.sun.com/patents and one or more
-additional patents or pending patent applications in the
-U.S. and other countries.
-
-This document and the technology which it describes are
-distributed under licenses restricting their use, copying,
-distribution, and decompilation. No part of this document
-may be reproduced in any form by any means without prior
-written authorization of Sun and its licensors, if any.
-
-Third-party software, including font technology, is
-copyrighted and licensed from Sun suppliers.
-
-Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
-JavaServer Pages, Enterprise JavaBeans and the Java Coffee
-Cup logo are trademarks or registered trademarks of Sun
-Microsystems, Inc. in the U.S. and other countries.
-
-Federal Acquisitions: Commercial Software - Government Users
-Subject to Standard License Terms and Conditions.
-
-</xsd:documentation>
-</xsd:annotation>
-
-<xsd:annotation>
-<xsd:documentation>
-
-This is the XML Schema for the EJB 2.1 deployment
-descriptor.  All EJB deployment descriptors must indicate
-the ejb-jar schema by using the J2EE namespace:
-
-http://java.sun.com/xml/ns/j2ee
-
-and by indicating the version of the schema by
-using the version element as shown below:
-<!--
-    <ejb-jar xmlns="http://java.sun.com/xml/ns/j2ee"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
-         http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd"
-     version="2.1">
-    ...
-    </ejb-jar>
--->
-The instance documents may indicate the published version of
-the schema using the xsi:schemaLocation attribute for the
-J2EE namespace with the following location:
-
-http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd
-
-</xsd:documentation>
-</xsd:annotation>
-
-<xsd:annotation>
-<xsd:documentation>
-
-The following conventions apply to all J2EE
-deployment descriptor elements unless indicated otherwise.
-
-- In elements that specify a pathname to a file within the
-  same JAR file, relative filenames (i.e., those not
-  starting with "/") are considered relative to the root of
-  the JAR file's namespace.  Absolute filenames (i.e., those
-  starting with "/") also specify names in the root of the
-  JAR file's namespace.  In general, relative names are
-  preferred.  The exception is .war files where absolute
-  names are preferred for consistency with the Servlet API.
-
-</xsd:documentation>
-</xsd:annotation>
-
-<include schemaLocation="j2ee_1_4.xsd"/>
-
-
-<!-- **************************************************** -->
-
-
-<xsd:element name="ejb-jar" type="j2ee:ejb-jarType">
-    <xsd:annotation>
-    <xsd:documentation>
-
-    This is the root of the ejb-jar deployment descriptor.
-
-    </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:key name="ejb-name-key">
-    <xsd:annotation>
-    <xsd:documentation>
-
-    The ejb-name element contains the name of an enterprise
-    bean. The name must be unique within the ejb-jar file.
-
-    </xsd:documentation>
-    </xsd:annotation>
-        <xsd:selector xpath="j2ee:enterprise-beans/*"/>
-        <xsd:field    xpath="j2ee:ejb-name"/>
-    </xsd:key>
-
-    <xsd:keyref name="ejb-name-references"
-            refer="j2ee:ejb-name-key">
-    <xsd:annotation>
-    <xsd:documentation>
-
-    The keyref indicates the references from
-    relationship-role-source must be to a specific ejb-name
-    defined within the scope of enterprise-beans element.
-
-    </xsd:documentation>
-    </xsd:annotation>
-        <xsd:selector
-            xpath=".//j2ee:ejb-relationship-role/j2ee:relationship-role-source"/>
-        <xsd:field
-            xpath="j2ee:ejb-name"/>
-    </xsd:keyref>
-
-    <xsd:key name="role-name-key">
-    <xsd:annotation>
-    <xsd:documentation>
-
-    A role-name-key is specified to allow the references
-    from the security-role-refs.
-
-    </xsd:documentation>
-    </xsd:annotation>
-        <xsd:selector xpath="j2ee:enterprise-beans/*/j2ee:security-role"/>
-        <xsd:field    xpath="j2ee:role-name"/>
-    </xsd:key>
-
-    <xsd:keyref name="role-name-references"
-            refer="j2ee:role-name-key">
-    <xsd:annotation>
-    <xsd:documentation>
-
-    The keyref indicates the references from
-    security-role-ref to a specified role-name.
-
-    </xsd:documentation>
-    </xsd:annotation>
-        <xsd:selector xpath="j2ee:enterprise-beans/*/j2ee:security-role-ref"/>
-        <xsd:field    xpath="j2ee:role-link"/>
-    </xsd:keyref>
-
-</xsd:element>
-
-
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="activation-config-propertyType">
-<xsd:annotation>
-<xsd:documentation>
-
-The activation-config-propertyType contains a name/value
-configuration property pair for a message-driven bean.
-
-The properties that are recognized for a particular
-message-driven bean are determined by the messaging type.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="activation-config-property-name"
-                     type="xsd:string">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The activation-config-property-name element contains
-        the name for an activation configuration property of
-        a message-driven bean.
-
-        For JMS message-driven beans, the following property
-        names are recognized: acknowledgeMode,
-        messageSelector, destinationType, subscriptionDurability
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="activation-config-property-value"
-                     type="xsd:string">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The activation-config-property-value element
-        contains the value for an activation configuration
-        property of a message-driven bean.
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="activation-configType">
-<xsd:annotation>
-<xsd:documentation>
-
-The activation-configType defines information about the
-expected configuration properties of the message-driven bean
-in its operational environment. This may include information
-about message acknowledgement, message selector, expected
-destination type, etc.
-
-The configuration information is expressed in terms of
-name/value configuration properties.
-
-The properties that are recognized for a particular
-message-driven bean are determined by the messaging type.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="description"
-                     type="j2ee:descriptionType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="activation-config-property"
-                     type="j2ee:activation-config-propertyType"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="deployment-extension"
-                     type="j2ee:deployment-extensionType"
-                     minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="assembly-descriptorType">
-<xsd:annotation>
-<xsd:documentation>
-
-The assembly-descriptorType defines
-application-assembly information.
-
-The application-assembly information consists of the
-following parts: the definition of security roles, the
-definition of method permissions, the definition of
-transaction attributes for enterprise beans with
-container-managed transaction demarcation and a list of
-methods to be excluded from being invoked.
-
-All the parts are optional in the sense that they are
-omitted if the lists represented by them are empty.
-
-Providing an assembly-descriptor in the deployment
-descriptor is optional for the ejb-jar file producer.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="security-role"
-                     type="j2ee:security-roleType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="method-permission"
-                     type="j2ee:method-permissionType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="container-transaction"
-                     type="j2ee:container-transactionType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="message-destination"
-                     type="j2ee:message-destinationType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="exclude-list"
-                     type="j2ee:exclude-listType"
-                     minOccurs="0"/>
-        <xsd:element name="deployment-extension"
-                     type="j2ee:deployment-extensionType"
-                     minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="cmp-fieldType">
-<xsd:annotation>
-<xsd:documentation>
-
-The cmp-fieldType describes a container-managed field. The
-cmp-fieldType contains an optional description of the field,
-and the name of the field.
-
-</xsd:documentation>
-</xsd:annotation>
-    <xsd:sequence>
-        <xsd:element name="description"
-                     type="j2ee:descriptionType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="field-name"
-                     type="j2ee:java-identifierType">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The field-name element specifies the name of a
-        container managed field.
-
-        The name of the cmp-field of an entity bean with
-        cmp-version 2.x must begin with a lowercase
-        letter. This field is accessed by methods whose
-        names consists of the name of the field specified by
-        field-name in which the first letter is uppercased,
-        prefixed by "get" or "set".
-
-        The name of the cmp-field of an entity bean with
-        cmp-version 1.x must denote a public field of the
-        enterprise bean class or one of its superclasses.
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="deployment-extension"
-                     type="j2ee:deployment-extensionType"
-                     minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:simpleType name="cmp-versionType">
-<xsd:annotation>
-<xsd:documentation>
-
-The cmp-versionType specifies the version of an entity bean
-with container-managed persistence. It is used by
-cmp-version elements.
-
-The value must be one of the two following:
-
-    1.x
-    2.x
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:restriction base="j2ee:string">
-        <xsd:enumeration value="1.x"/>
-        <xsd:enumeration value="2.x"/>
-    </xsd:restriction>
-
-</xsd:simpleType>
-
-<!-- **************************************************** -->
-
-<xsd:simpleType name="cmr-field-typeType">
-<xsd:annotation>
-<xsd:documentation>
-
-The cmr-field-type element specifies the class of a
-collection-valued logical relationship field in the entity
-bean class. The value of an element using cmr-field-typeType
-must be either: java.util.Collection or java.util.Set.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:restriction base="j2ee:string">
-        <xsd:enumeration value="java.util.Collection"/>
-        <xsd:enumeration value="java.util.Set"/>
-    </xsd:restriction>
-
-</xsd:simpleType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="cmr-fieldType">
-<xsd:annotation>
-<xsd:documentation>
-
-The cmr-fieldType describes the bean provider's view of
-a relationship. It consists of an optional description, and
-the name and the class type of a field in the source of a
-role of a relationship. The cmr-field-name element
-corresponds to the name used for the get and set accessor
-methods for the relationship. The cmr-field-type element is
-used only for collection-valued cmr-fields. It specifies the
-type of the collection that is used.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="description"
-                     type="j2ee:descriptionType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="cmr-field-name"
-                     type="j2ee:string">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The cmr-field-name element specifies the name of a
-        logical relationship field in the entity bean
-        class. The name of the cmr-field must begin with a
-        lowercase letter. This field is accessed by methods
-        whose names consist of the name of the field
-        specified by cmr-field-name in which the first
-        letter is uppercased, prefixed by "get" or "set".
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="cmr-field-type"
-                     type="j2ee:cmr-field-typeType"
-                     minOccurs="0"/>
-        <xsd:element name="deployment-extension"
-                     type="j2ee:deployment-extensionType"
-                     minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="container-transactionType">
-<xsd:annotation>
-<xsd:documentation>
-
-The container-transactionType specifies how the container
-must manage transaction scopes for the enterprise bean's
-method invocations. It defines an optional description, a
-list of method elements, and a transaction attribute. The
-transaction attribute is to be applied to all the specified
-methods.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="description"
-                     type="j2ee:descriptionType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="method"
-                     type="j2ee:methodType"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="trans-attribute"
-                     type="j2ee:trans-attributeType"/>
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:simpleType name="ejb-classType">
-<xsd:annotation>
-<xsd:documentation>
-
-The ejb-classType contains the fully-qualified name of the
-enterprise bean's class. It is used by ejb-class elements.
-
-Example:
-
-    <ejb-class>com.wombat.empl.EmployeeServiceBean</ejb-class>
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:restriction base="j2ee:fully-qualified-classType"/>
-
-</xsd:simpleType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="ejb-jarType">
-<xsd:annotation>
-<xsd:documentation>
-
-The ejb-jarType defines the root element of the EJB
-deployment descriptor. It contains
-
-    - an optional description of the ejb-jar file
-    - an optional display name
-    - an optional icon that contains a small and a large
-      icon file name
-    - mandatory structural information about all included
-      enterprise beans
-    - a descriptor for container managed relationships,
-      if any
-    - an optional application-assembly descriptor
-    - an optional name of an ejb-client-jar file for the
-      ejb-jar.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="description"
-                     type="j2ee:descriptionType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="display-name"
-                     type="j2ee:display-nameType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="icon"
-                     type="j2ee:iconType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="enterprise-beans"
-                     type="j2ee:enterprise-beansType"/>
-        <xsd:element name="relationships"
-                     type="j2ee:relationshipsType"
-                     minOccurs="0">
-        <xsd:unique name="relationship-name-uniqueness">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The ejb-relation-name contains the name of a
-        relation. The name must be unique within
-        relationships.
-
-        </xsd:documentation>
-        </xsd:annotation>
-            <xsd:selector xpath="j2ee:ejb-relation"/>
-            <xsd:field    xpath="j2ee:ejb-relation-name"/>
-        </xsd:unique>
-        </xsd:element>
-        <xsd:element name="assembly-descriptor"
-                     type="j2ee:assembly-descriptorType"
-                     minOccurs="0">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        Providing an assembly-descriptor in the deployment
-        descriptor is optional for the ejb-jar file
-        producer.
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="ejb-client-jar"
-                     type="j2ee:pathType"
-                     minOccurs="0">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The optional ejb-client-jar element specifies a JAR
-        file that contains the class files necessary for a
-        client program to access the
-        enterprise beans in the ejb-jar file.
-
-        Example:
-
-            <ejb-client-jar>employee_service_client.jar
-            </ejb-client-jar>
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="deployment-extension"
-                     type="j2ee:deployment-extensionType"
-                     minOccurs="0" maxOccurs="unbounded"/>
-
-    </xsd:sequence>
-    <xsd:attribute name="version"
-                   type="j2ee:dewey-versionType"
-                   fixed="2.1"
-                   use="required">
-    <xsd:annotation>
-    <xsd:documentation>
-
-    The version specifies the version of the
-    EJB specification that the instance document must
-    comply with. This information enables deployment tools
-    to validate a particular EJB Deployment
-    Descriptor with respect to a specific version of the EJB
-    schema.
-
-    </xsd:documentation>
-    </xsd:annotation>
-    </xsd:attribute>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:simpleType name="ejb-nameType">
-<xsd:annotation>
-<xsd:documentation>
-
-The ejb-nameType specifies an enterprise bean's name. It is
-used by ejb-name elements. This name is assigned by the
-ejb-jar file producer to name the enterprise bean in the
-ejb-jar file's deployment descriptor. The name must be
-unique among the names of the enterprise beans in the same
-ejb-jar file.
-
-There is no architected relationship between the used
-ejb-name in the deployment descriptor and the JNDI name that
-the Deployer will assign to the enterprise bean's home.
-
-The name for an entity bean must conform to the lexical
-rules for an NMTOKEN.
-
-Example:
-
-<ejb-name>EmployeeService</ejb-name>
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:restriction base="xsd:NMTOKEN">
-        <xsd:whiteSpace value="collapse"/>
-    </xsd:restriction>
-
-</xsd:simpleType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="ejb-relationType">
-<xsd:annotation>
-<xsd:documentation>
-
-The ejb-relationType describes a relationship between two
-entity beans with container-managed persistence.  It is used
-by ejb-relation elements. It contains a description; an
-optional ejb-relation-name element; and exactly two
-relationship role declarations, defined by the
-ejb-relationship-role elements. The name of the
-relationship, if specified, is unique within the ejb-jar
-file.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="description"
-                     type="j2ee:descriptionType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="ejb-relation-name"
-                     type="j2ee:string"
-                     minOccurs="0">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The ejb-relation-name element provides a unique name
-        within the ejb-jar file for a relationship.
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="ejb-relationship-role"
-                     type="j2ee:ejb-relationship-roleType"/>
-        <xsd:element name="ejb-relationship-role"
-                     type="j2ee:ejb-relationship-roleType"/>
-        <xsd:element name="deployment-extension"
-                     type="j2ee:deployment-extensionType"
-                     minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="ejb-relationship-roleType">
-<xsd:annotation>
-<xsd:documentation>
-
-The ejb-relationship-roleType describes a role within a
-relationship. There are two roles in each relationship.
-
-The ejb-relationship-roleType contains an optional
-description; an optional name for the relationship role; a
-specification of the multiplicity of the role; an optional
-specification of cascade-delete functionality for the role;
-the role source; and a declaration of the cmr-field, if any,
-by means of which the other side of the relationship is
-accessed from the perspective of the role source.
-
-The multiplicity and role-source element are mandatory.
-
-The relationship-role-source element designates an entity
-bean by means of an ejb-name element. For bidirectional
-relationships, both roles of a relationship must declare a
-relationship-role-source element that specifies a cmr-field
-in terms of which the relationship is accessed. The lack of
-a cmr-field element in an ejb-relationship-role specifies
-that the relationship is unidirectional in navigability and
-the entity bean that participates in the relationship is
-"not aware" of the relationship.
-
-Example:
-
-<ejb-relation>
-    <ejb-relation-name>Product-LineItem</ejb-relation-name>
-    <ejb-relationship-role>
-        <ejb-relationship-role-name>product-has-lineitems
-        </ejb-relationship-role-name>
-        <multiplicity>One</multiplicity>
-        <relationship-role-source>
-        <ejb-name>ProductEJB</ejb-name>
-        </relationship-role-source>
-     </ejb-relationship-role>
-</ejb-relation>
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="description"
-                     type="j2ee:descriptionType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="ejb-relationship-role-name"
-                     type="j2ee:string"
-                     minOccurs="0">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The ejb-relationship-role-name element defines a
-        name for a role that is unique within an
-        ejb-relation. Different relationships can use the
-        same name for a role.
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="multiplicity"
-                     type="j2ee:multiplicityType"/>
-        <xsd:element name="cascade-delete"
-                     type="j2ee:emptyType"
-                     minOccurs="0">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The cascade-delete element specifies that, within a
-        particular relationship, the lifetime of one or more
-        entity beans is dependent upon the lifetime of
-        another entity bean. The cascade-delete element can
-        only be specified for an ejb-relationship-role
-        element contained in an ejb-relation element in
-        which the other ejb-relationship-role
-        element specifies a multiplicity of One.
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="relationship-role-source"
-                     type="j2ee:relationship-role-sourceType"/>
-        <xsd:element name="cmr-field"
-                     type="j2ee:cmr-fieldType"
-                     minOccurs="0"/>
-        <xsd:element name="deployment-extension"
-                     type="j2ee:deployment-extensionType"
-                     minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="enterprise-beansType">
-<xsd:annotation>
-<xsd:documentation>
-
-The enterprise-beansType declares one or more enterprise
-beans. Each bean can be a session, entity or message-driven
-bean.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:choice maxOccurs="unbounded">
-        <xsd:element name="session"
-                     type="j2ee:session-beanType">
-        <xsd:unique name="session-ejb-local-ref-name-uniqueness">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The ejb-ref-name element contains the name of
-        an EJB reference. The EJB reference is an entry in
-        the component's environment and is relative to the
-        java:comp/env context.  The name must be unique within
-        the component.
-
-        It is recommended that name be prefixed with "ejb/".
-
-        </xsd:documentation>
-        </xsd:annotation>
-            <xsd:selector xpath="j2ee:ejb-local-ref"/>
-            <xsd:field    xpath="j2ee:ejb-ref-name"/>
-        </xsd:unique>
-
-        <xsd:unique name="session-ejb-ref-name-uniqueness">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The ejb-ref-name element contains the name of an EJB
-        reference. The EJB reference is an entry in the
-        component's environment and is relative to the
-        java:comp/env context. The name must be unique
-        within the component.
-
-        It is recommended that name is prefixed with "ejb/".
-
-        </xsd:documentation>
-        </xsd:annotation>
-            <xsd:selector xpath="j2ee:ejb-ref"/>
-            <xsd:field    xpath="j2ee:ejb-ref-name"/>
-        </xsd:unique>
-
-        <xsd:unique name="session-resource-env-ref-uniqueness">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The resource-env-ref-name element specifies the name
-        of a resource environment reference; its value is
-        the environment entry name used in the component
-        code. The name is a JNDI name relative to the
-        java:comp/env context and must be unique within an
-        component.
-
-        </xsd:documentation>
-        </xsd:annotation>
-            <xsd:selector xpath="j2ee:resource-env-ref"/>
-            <xsd:field    xpath="j2ee:resource-env-ref-name"/>
-        </xsd:unique>
-
-        <xsd:unique name="session-message-destination-ref-uniqueness">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The message-destination-ref-name element specifies the name
-        of a message destination reference; its value is
-        the message destination reference name used in the component
-        code. The name is a JNDI name relative to the
-        java:comp/env context and must be unique within an
-        component.
-
-        </xsd:documentation>
-        </xsd:annotation>
-            <xsd:selector xpath="j2ee:message-destination-ref"/>
-            <xsd:field    xpath="j2ee:message-destination-ref-name"/>
-        </xsd:unique>
-
-        <xsd:unique name="session-res-ref-name-uniqueness">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The res-ref-name element specifies the name of a
-        resource manager connection factory reference.  The name
-        is a JNDI name relative to the java:comp/env context.
-        The name must be unique within an component.
-
-        </xsd:documentation>
-        </xsd:annotation>
-            <xsd:selector xpath="j2ee:resource-ref"/>
-            <xsd:field    xpath="j2ee:res-ref-name"/>
-        </xsd:unique>
-
-        <xsd:unique name="session-env-entry-name-uniqueness">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The env-entry-name element contains the name of a
-        component's environment entry.  The name is a JNDI
-        name relative to the java:comp/env context.  The
-        name must be unique within an component.
-
-        </xsd:documentation>
-        </xsd:annotation>
-            <xsd:selector xpath="j2ee:env-entry"/>
-            <xsd:field    xpath="j2ee:env-entry-name"/>
-        </xsd:unique>
-        </xsd:element>
-
-        <xsd:element name="entity"
-                     type="j2ee:entity-beanType">
-        <xsd:unique name="entity-ejb-local-ref-name-uniqueness">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The ejb-ref-name element contains the name of
-        an EJB reference. The EJB reference is an entry in
-        the component's environment and is relative to the
-        java:comp/env context.  The name must be unique within
-        the component.
-
-        It is recommended that name be prefixed with "ejb/".
-
-        </xsd:documentation>
-        </xsd:annotation>
-            <xsd:selector xpath="j2ee:ejb-local-ref"/>
-            <xsd:field    xpath="j2ee:ejb-ref-name"/>
-        </xsd:unique>
-
-        <xsd:unique name="entity-ejb-ref-name-uniqueness">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The ejb-ref-name element contains the name of an EJB
-        reference. The EJB reference is an entry in the
-        component's environment and is relative to the
-        java:comp/env context. The name must be unique
-        within the component.
-
-        It is recommended that name is prefixed with "ejb/".
-
-        </xsd:documentation>
-        </xsd:annotation>
-            <xsd:selector xpath="j2ee:ejb-ref"/>
-            <xsd:field    xpath="j2ee:ejb-ref-name"/>
-        </xsd:unique>
-
-        <xsd:unique name="entity-resource-env-ref-uniqueness">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The resource-env-ref-name element specifies the name
-        of a resource environment reference; its value is
-        the environment entry name used in the component
-        code. The name is a JNDI name relative to the
-        java:comp/env context and must be unique within an
-        component.
-
-        </xsd:documentation>
-        </xsd:annotation>
-            <xsd:selector xpath="j2ee:resource-env-ref"/>
-            <xsd:field    xpath="j2ee:resource-env-ref-name"/>
-        </xsd:unique>
-
-        <xsd:unique name="entity-message-destination-ref-uniqueness">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The message-destination-ref-name element specifies the name
-        of a message destination reference; its value is
-        the message destination reference name used in the component
-        code. The name is a JNDI name relative to the
-        java:comp/env context and must be unique within an
-        component.
-
-        </xsd:documentation>
-        </xsd:annotation>
-            <xsd:selector xpath="j2ee:message-destination-ref"/>
-            <xsd:field    xpath="j2ee:message-destination-ref-name"/>
-        </xsd:unique>
-
-        <xsd:unique name="entity-res-ref-name-uniqueness">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The res-ref-name element specifies the name of a
-        resource manager connection factory reference.  The name
-        is a JNDI name relative to the java:comp/env context.
-        The name must be unique within an component.
-
-        </xsd:documentation>
-        </xsd:annotation>
-            <xsd:selector xpath="j2ee:resource-ref"/>
-            <xsd:field    xpath="j2ee:res-ref-name"/>
-        </xsd:unique>
-
-        <xsd:unique name="entity-env-entry-name-uniqueness">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The env-entry-name element contains the name of a
-        component's environment entry.  The name is a JNDI
-        name relative to the java:comp/env context.  The
-        name must be unique within an component.
-
-        </xsd:documentation>
-        </xsd:annotation>
-            <xsd:selector xpath="j2ee:env-entry"/>
-            <xsd:field    xpath="j2ee:env-entry-name"/>
-        </xsd:unique>
-        </xsd:element>
-
-        <xsd:element name="message-driven"
-                     type="j2ee:message-driven-beanType">
-        <xsd:unique name="messaged-ejb-local-ref-name-uniqueness">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The ejb-ref-name element contains the name of
-        an EJB reference. The EJB reference is an entry in
-        the component's environment and is relative to the
-        java:comp/env context.  The name must be unique within
-        the component.
-
-        It is recommended that name be prefixed with "ejb/".
-
-        </xsd:documentation>
-        </xsd:annotation>
-            <xsd:selector xpath="j2ee:ejb-local-ref"/>
-            <xsd:field    xpath="j2ee:ejb-ref-name"/>
-        </xsd:unique>
-
-        <xsd:unique name="messaged-ejb-ref-name-uniqueness">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The ejb-ref-name element contains the name of an EJB
-        reference. The EJB reference is an entry in the
-        component's environment and is relative to the
-        java:comp/env context. The name must be unique
-        within the component.
-
-        It is recommended that name is prefixed with "ejb/".
-
-        </xsd:documentation>
-        </xsd:annotation>
-            <xsd:selector xpath="j2ee:ejb-ref"/>
-            <xsd:field    xpath="j2ee:ejb-ref-name"/>
-        </xsd:unique>
-
-        <xsd:unique name="messaged-resource-env-ref-uniqueness">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The resource-env-ref-name element specifies the name
-        of a resource environment reference; its value is
-        the environment entry name used in the component
-        code. The name is a JNDI name relative to the
-        java:comp/env context and must be unique within an
-        component.
-
-        </xsd:documentation>
-        </xsd:annotation>
-            <xsd:selector xpath="j2ee:resource-env-ref"/>
-            <xsd:field    xpath="j2ee:resource-env-ref-name"/>
-        </xsd:unique>
-
-        <xsd:unique name="messaged-message-destination-ref-uniqueness">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The message-destination-ref-name element specifies the name
-        of a message destination reference; its value is
-        the message destination reference name used in the component
-        code. The name is a JNDI name relative to the
-        java:comp/env context and must be unique within an
-        component.
-
-        </xsd:documentation>
-        </xsd:annotation>
-            <xsd:selector xpath="j2ee:message-destination-ref"/>
-            <xsd:field    xpath="j2ee:message-destination-ref-name"/>
-        </xsd:unique>
-
-        <xsd:unique name="messaged-res-ref-name-uniqueness">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The res-ref-name element specifies the name of a
-        resource manager connection factory reference.  The name
-        is a JNDI name relative to the java:comp/env context.
-        The name must be unique within an component.
-
-        </xsd:documentation>
-        </xsd:annotation>
-            <xsd:selector xpath="j2ee:resource-ref"/>
-            <xsd:field    xpath="j2ee:res-ref-name"/>
-        </xsd:unique>
-
-        <xsd:unique name="messaged-env-entry-name-uniqueness">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The env-entry-name element contains the name of a
-        component's environment entry.  The name is a JNDI
-        name relative to the java:comp/env context.  The
-        name must be unique within an component.
-
-        </xsd:documentation>
-        </xsd:annotation>
-            <xsd:selector xpath="j2ee:env-entry"/>
-            <xsd:field    xpath="j2ee:env-entry-name"/>
-        </xsd:unique>
-        </xsd:element>
-
-    </xsd:choice>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="entity-beanType">
-<xsd:annotation>
-<xsd:documentation>
-
-The entity-beanType declares an entity bean. The declaration
-consists of:
-
-    - an optional description
-    - an optional display name
-    - an optional icon element that contains a small and a large
-      icon file name
-    - a unique name assigned to the enterprise bean
-      in the deployment descriptor
-    - the names of the entity bean's remote home
-      and remote interfaces, if any
-    - the names of the entity bean's local home and local
-      interfaces, if any
-    - the entity bean's implementation class
-    - the entity bean's persistence management type
-    - the entity bean's primary key class name
-    - an indication of the entity bean's reentrancy
-    - an optional specification of the
-      entity bean's cmp-version
-    - an optional specification of the entity bean's
-      abstract schema name
-    - an optional list of container-managed fields
-    - an optional specification of the primary key
-      field
-    - an optional declaration of the bean's environment
-      entries
-    - an optional declaration of the bean's EJB
-      references
-    - an optional declaration of the bean's local
-      EJB references
-    - an optional declaration of the bean's web
-      service references
-    - an optional declaration of the security role
-      references
-    - an optional declaration of the security identity
-      to be used for the execution of the bean's methods
-    - an optional declaration of the bean's
-      resource manager connection factory references
-    - an optional declaration of the bean's
-      resource environment references
-    - an optional declaration of the bean's message
-      destination references
-    - an optional set of query declarations
-      for finder and select methods for an entity
-      bean with cmp-version 2.x.
-    - an optional set of deployment-extension
-      declarations.
-
-The optional abstract-schema-name element must be specified
-for an entity bean with container-managed persistence and
-cmp-version 2.x.
-
-The optional primkey-field may be present in the descriptor
-if the entity's persistence-type is Container.
-
-The optional cmp-version element may be present in the
-descriptor if the entity's persistence-type is Container. If
-the persistence-type is Container and the cmp-version
-element is not specified, its value defaults to 2.x.
-
-The optional home and remote elements must be specified if
-the entity bean cmp-version is 1.x.
-
-The optional home and remote elements must be specified if
-the entity bean has a remote home and remote interface.
-
-The optional local-home and local elements must be specified
-if the entity bean has a local home and local interface.
-
-Either both the local-home and the local elements or both
-the home and the remote elements must be specified.
-
-The optional query elements must be present if the
-persistence-type is Container and the cmp-version is 2.x and
-query methods other than findByPrimaryKey have been defined
-for the entity bean.
-
-The other elements that are optional are "optional" in the
-sense that they are omitted if the lists represented by them
-are empty.
-
-At least one cmp-field element must be present in the
-descriptor if the entity's persistence-type is Container and
-the cmp-version is 1.x, and none must not be present if the
-entity's persistence-type is Bean.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="description"
-                     type="j2ee:descriptionType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="display-name"
-                     type="j2ee:display-nameType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="icon"
-                     type="j2ee:iconType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="ejb-name"
-                     type="j2ee:ejb-nameType"/>
-        <xsd:element name="home"
-                     type="j2ee:homeType"
-                     minOccurs="0"/>
-        <xsd:element name="remote"
-                     type="j2ee:remoteType"
-                     minOccurs="0"/>
-        <xsd:element name="local-home"
-                     type="j2ee:local-homeType"
-                     minOccurs="0"/>
-        <xsd:element name="local"
-                     type="j2ee:localType"
-                     minOccurs="0"/>
-        <xsd:element name="ejb-class"
-                     type="j2ee:ejb-classType"/>
-        <xsd:element name="persistence-type"
-                     type="j2ee:persistence-typeType"/>
-        <xsd:element name="prim-key-class"
-                     type="j2ee:fully-qualified-classType">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The prim-key-class element contains the
-        fully-qualified name of an
-        entity bean's primary key class.
-
-        If the definition of the primary key class is
-        deferred to deployment time, the prim-key-class
-        element should specify java.lang.Object.
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="reentrant"
-                     type="j2ee:true-falseType">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The reentrant element specifies whether an entity
-        bean is reentrant or not.
-
-        The reentrant element must be one of the two
-        following: true or false
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="cmp-version"
-                     type="j2ee:cmp-versionType"
-                     minOccurs="0"/>
-        <xsd:element name="abstract-schema-name"
-                     type="j2ee:java-identifierType"
-                     minOccurs="0">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The abstract-schema-name element specifies the name
-        of the abstract schema type of an entity bean with
-        cmp-version 2.x. It is used in EJB QL queries.
-
-        For example, the abstract-schema-name for an entity
-        bean whose local interface is
-        com.acme.commerce.Order might be Order.
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="cmp-field"
-                     type="j2ee:cmp-fieldType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="primkey-field"
-                     type="j2ee:string"
-                     minOccurs="0">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The primkey-field element is used to specify the
-        name of the primary key field for an entity with
-        container-managed persistence.
-
-        The primkey-field must be one of the fields declared
-        in the cmp-field element, and the type of the field
-        must be the same as the primary key type.
-
-        The primkey-field element is not used if the primary
-        key maps to multiple container-managed fields
-        (i.e. the key is a compound key). In this case, the
-        fields of the primary key class must be public, and
-        their names must correspond to the field names of
-        the entity bean class that comprise the key.
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="env-entry"
-                     type="j2ee:env-entryType"
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="ejb-ref"
-                     type="j2ee:ejb-refType"
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="ejb-local-ref"
-                     type="j2ee:ejb-local-refType"
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="service-ref"
-                     type="j2ee:service-refType"
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="security-role-ref"
-                     type="j2ee:security-role-refType"
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="security-identity"
-                     type="j2ee:security-identityType"
-                     minOccurs="0"/>
-        <xsd:element name="resource-ref"
-                     type="j2ee:resource-refType"
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="resource-env-ref"
-                     type="j2ee:resource-env-refType"
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="message-destination-ref"
-                     type="j2ee:message-destination-refType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="query"
-                     type="j2ee:queryType"
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="deployment-extension"
-                     type="j2ee:deployment-extensionType"
-                     minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="exclude-listType">
-<xsd:annotation>
-<xsd:documentation>
-
-The exclude-listType specifies one or more methods which
-the Assembler marks to be uncallable.
-
-If the method permission relation contains methods that are
-in the exclude list, the Deployer should consider those
-methods to be uncallable.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="description"
-                     type="j2ee:descriptionType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="method"
-                     type="j2ee:methodType"
-                     maxOccurs="unbounded"/>
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:simpleType name="java-typeType">
-<xsd:annotation>
-<xsd:documentation>
-
-This is a generic type that designates a Java primitive
-type or a fully qualified name of a Java interface/type.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:restriction base="j2ee:string">
-        <xsd:pattern value="[^\p{Z}]*"/>
-    </xsd:restriction>
-</xsd:simpleType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="message-driven-beanType">
-<xsd:annotation>
-<xsd:documentation>
-
-The message-driven element declares a message-driven
-bean. The declaration consists of:
-
-    - an optional description
-    - an optional display name
-    - an optional icon element that contains a small and a large
-      icon file name.
-    - a name assigned to the enterprise bean in
-      the deployment descriptor
-    - the message-driven bean's implementation class
-    - an optional declaration of the bean's messaging
-      type
-    - the message-driven bean's transaction management type
-    - an optional declaration of the bean's
-      message-destination-type
-    - an optional declaration of the bean's
-      message-destination-link
-    - an optional declaration of the message-driven bean's
-      activation configuration properties
-    - an optional declaration of the bean's environment
-      entries
-    - an optional declaration of the bean's EJB references
-    - an optional declaration of the bean's local EJB
-      references
-    - an optional declaration of the bean's web service
-      references
-    - an optional declaration of the security
-      identity to be used for the execution of the bean's
-      methods
-    - an optional declaration of the bean's
-      resource manager connection factory
-      references
-    - an optional declaration of the bean's resource
-      environment references.
-    - an optional declaration of the bean's message
-      destination references
-    - an optional declaration of deployment extensions
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="description"
-                     type="j2ee:descriptionType"
-                     minOccurs="0"/>
-        <xsd:element name="display-name"
-                     type="j2ee:display-nameType"
-                     minOccurs="0"/>
-        <xsd:element name="icon"
-                     type="j2ee:iconType"
-                     minOccurs="0"/>
-        <xsd:element name="ejb-name"
-                     type="j2ee:ejb-nameType"/>
-        <xsd:element name="ejb-class"
-                     type="j2ee:ejb-classType"/>
-        <xsd:element name="messaging-type"
-                     type="j2ee:fully-qualified-classType"
-                     minOccurs="0">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The messaging-type element specifies the message
-        listener interface of the message-driven bean. If
-        the messaging-type element is not specified, it is
-        assumed to be javax.jms.MessageListener.
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="transaction-type"
-                     type="j2ee:transaction-typeType"/>
-        <xsd:element name="message-destination-type"
-                     type="j2ee:message-destination-typeType"
-                     minOccurs="0"/>
-        <xsd:element name="message-destination-link"
-                     type="j2ee:message-destination-linkType"
-                     minOccurs="0"/>
-        <xsd:element name="activation-config"
-                     type="j2ee:activation-configType"
-                     minOccurs="0"/>
-        <xsd:element name="env-entry"
-                     type="j2ee:env-entryType"
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="ejb-ref"
-                     type="j2ee:ejb-refType"
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="ejb-local-ref"
-                     type="j2ee:ejb-local-refType"
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="service-ref"
-                     type="j2ee:service-refType"
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="security-identity"
-                     type="j2ee:security-identityType"
-                     minOccurs="0"/>
-        <xsd:element name="resource-ref"
-                     type="j2ee:resource-refType"
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="resource-env-ref"
-                     type="j2ee:resource-env-refType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="message-destination-ref"
-                     type="j2ee:message-destination-refType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="deployment-extension"
-                     type="j2ee:deployment-extensionType"
-                     minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:simpleType name="method-intfType">
-
-<xsd:annotation>
-<xsd:documentation>
-
-The method-intf element allows a method element to
-differentiate between the methods with the same name and
-signature that are multiply defined across the home and
-component interfaces (e.g, in both an enterprise bean's
-remote and local interfaces or in both an enterprise bean's
-home and remote interfaces, etc.); the component and web
-service endpoint interfaces, and so on.
-
-The method-intf element must be one of the following:
-
-    Home
-    Remote
-    LocalHome
-    Local
-    ServiceEndpoint
-
-</xsd:documentation>
-</xsd:annotation>
-
-  <xsd:restriction base="j2ee:string">
-    <xsd:enumeration value="Home"/>
-    <xsd:enumeration value="Remote"/>
-    <xsd:enumeration value="LocalHome"/>
-    <xsd:enumeration value="Local"/>
-    <xsd:enumeration value="ServiceEndpoint"/>
-  </xsd:restriction>
-
-</xsd:simpleType>
-
-<!-- **************************************************** -->
-
-<xsd:simpleType name="method-nameType">
-<xsd:annotation>
-<xsd:documentation>
-
-The method-nameType contains a name of an enterprise
-bean method or the asterisk (*) character. The asterisk is
-used when the element denotes all the methods of an
-enterprise bean's client view interfaces.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:restriction base="j2ee:string"/>
-
-</xsd:simpleType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="method-paramsType">
-<xsd:annotation>
-<xsd:documentation>
-
-The method-paramsType defines a list of the
-fully-qualified Java type names of the method parameters.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="method-param"
-                     type="j2ee:java-typeType"
-                     minOccurs="0"
-                     maxOccurs="unbounded">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The method-param element contains a primitive
-        or a fully-qualified Java type name of a method
-        parameter.
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="method-permissionType">
-<xsd:annotation>
-<xsd:documentation>
-
-The method-permissionType specifies that one or more
-security roles are allowed to invoke one or more enterprise
-bean methods. The method-permissionType consists of an
-optional description, a list of security role names or an
-indicator to state that the method is unchecked for
-authorization, and a list of method elements.
-
-The security roles used in the method-permissionType
-must be defined in the security-role elements of the
-deployment descriptor, and the methods must be methods
-defined in the enterprise bean's home, component and/or web
-service endpoint interfaces.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="description"
-                     type="j2ee:descriptionType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:choice>
-            <xsd:element name="role-name"
-                         type="j2ee:role-nameType"
-                         maxOccurs="unbounded"/>
-            <xsd:element name="unchecked"
-                         type="j2ee:emptyType">
-            <xsd:annotation>
-            <xsd:documentation>
-
-            The unchecked element specifies that a method is
-            not checked for authorization by the container
-            prior to invocation of the method.
-
-            </xsd:documentation>
-            </xsd:annotation>
-            </xsd:element>
-        </xsd:choice>
-        <xsd:element name="method"
-                     type="j2ee:methodType"
-                     maxOccurs="unbounded"/>
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="methodType">
-<xsd:annotation>
-<xsd:documentation>
-
-The methodType is used to denote a method of an enterprise
-bean's home, component, and/or web service endpoint
-interface, or, in the case of a message-driven bean, the
-bean's message listener method, or a set of such
-methods. The ejb-name element must be the name of one of the
-enterprise beans declared in the deployment descriptor; the
-optional method-intf element allows to distinguish between a
-method with the same signature that is multiply defined
-across the home, component, and/or web service endpoint
-interfaces; the method-name element specifies the method
-name; and the optional method-params elements identify a
-single method among multiple methods with an overloaded
-method name.
-
-There are three possible styles of using methodType element
-within a method element:
-
-1.
-<method>
-    <ejb-name>EJBNAME</ejb-name>
-    <method-name>*</method-name>
-</method>
-
-   This style is used to refer to all the methods of the
-   specified enterprise bean's home, component, and/or web
-   service endpoint interfaces.
-
-2.
-<method>
-    <ejb-name>EJBNAME</ejb-name>
-    <method-name>METHOD</method-name>
-</method>>
-
-   This style is used to refer to the specified method of
-   the specified enterprise bean. If there are multiple
-   methods with the same overloaded name, the element of
-   this style refers to all the methods with the overloaded
-   name.
-
-3.
-<method>
-    <ejb-name>EJBNAME</ejb-name>
-    <method-name>METHOD</method-name>
-    <method-params>
-        <method-param>PARAM-1</method-param>
-        <method-param>PARAM-2</method-param>
-        ...
-        <method-param>PARAM-n</method-param>
-    </method-params>
-</method>
-
-   This style is used to refer to a single method within a
-   set of methods with an overloaded name. PARAM-1 through
-   PARAM-n are the fully-qualified Java types of the
-   method's input parameters (if the method has no input
-   arguments, the method-params element contains no
-   method-param elements). Arrays are specified by the
-   array element's type, followed by one or more pair of
-   square brackets (e.g. int[][]). If there are multiple
-   methods with the same overloaded name, this style refers
-   to all of the overloaded methods.
-
-Examples:
-
-Style 1: The following method element refers to all the
-methods of the EmployeeService bean's home, component,
-and/or web service endpoint interfaces:
-
-<method>
-    <ejb-name>EmployeeService</ejb-name>
-    <method-name>*</method-name>
-</method>
-
-Style 2: The following method element refers to all the
-create methods of the EmployeeService bean's home
-interface(s).
-
-<method>
-    <ejb-name>EmployeeService</ejb-name>
-    <method-name>create</method-name>
-</method>
-
-Style 3: The following method element refers to the
-create(String firstName, String LastName) method of the
-EmployeeService bean's home interface(s).
-
-<method>
-    <ejb-name>EmployeeService</ejb-name>
-    <method-name>create</method-name>
-    <method-params>
-        <method-param>java.lang.String</method-param>
-        <method-param>java.lang.String</method-param>
-    </method-params>
-</method>
-
-The following example illustrates a Style 3 element with
-more complex parameter types. The method
-foobar(char s, int i, int[] iar, mypackage.MyClass mycl,
-mypackage.MyClass[][] myclaar) would be specified as:
-
-<method>
-    <ejb-name>EmployeeService</ejb-name>
-    <method-name>foobar</method-name>
-    <method-params>
-        <method-param>char</method-param>
-        <method-param>int</method-param>
-        <method-param>int[]</method-param>
-        <method-param>mypackage.MyClass</method-param>
-        <method-param>mypackage.MyClass[][]</method-param>
-    </method-params>
-</method>
-
-The optional method-intf element can be used when it becomes
-necessary to differentiate between a method that is multiply
-defined across the enterprise bean's home, component, and/or
-web service endpoint interfaces with the same name and
-signature.
-
-For example, the method element
-
-<method>
-    <ejb-name>EmployeeService</ejb-name>
-    <method-intf>Remote</method-intf>
-    <method-name>create</method-name>
-    <method-params>
-        <method-param>java.lang.String</method-param>
-        <method-param>java.lang.String</method-param>
-    </method-params>
-</method>
-
-can be used to differentiate the create(String, String)
-method defined in the remote interface from the
-create(String, String) method defined in the remote home
-interface, which would be defined as
-
-<method>
-    <ejb-name>EmployeeService</ejb-name>
-    <method-intf>Home</method-intf>
-    <method-name>create</method-name>
-    <method-params>
-        <method-param>java.lang.String</method-param>
-        <method-param>java.lang.String</method-param>
-    </method-params>
-</method>
-
-and the create method that is defined in the local home
-interface which would be defined as
-
-<method>
-    <ejb-name>EmployeeService</ejb-name>
-    <method-intf>LocalHome</method-intf>
-    <method-name>create</method-name>
-    <method-params>
-        <method-param>java.lang.String</method-param>
-        <method-param>java.lang.String</method-param>
-    </method-params>
-</method>
-
-The method-intf element can be used with all th ree Styles
-of the method element usage. For example, the following
-method element example could be used to refer to all the
-methods of the EmployeeService bean's remote home interface.
-
-<method>
-    <ejb-name>EmployeeService</ejb-name>
-    <method-intf>Home</method-intf>
-    <method-name>*</method-name>
-</method>
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="description"
-                     type="j2ee:descriptionType"
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="ejb-name"
-                     type="j2ee:ejb-nameType"/>
-        <xsd:element name="method-intf"
-                     type="j2ee:method-intfType"
-                     minOccurs="0">
-        </xsd:element>
-        <xsd:element name="method-name"
-                     type="j2ee:method-nameType"/>
-        <xsd:element name="method-params"
-                     type="j2ee:method-paramsType"
-                     minOccurs="0"/>
-    </xsd:sequence>
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:simpleType name="multiplicityType">
-<xsd:annotation>
-<xsd:documentation>
-
-The multiplicityType describes the multiplicity of the
-role that participates in a relation.
-
-The value must be one of the two following:
-
-    One
-    Many
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:restriction base="j2ee:string">
-        <xsd:enumeration value="One"/>
-        <xsd:enumeration value="Many"/>
-    </xsd:restriction>
-
-</xsd:simpleType>
-
-<!-- **************************************************** -->
-
-<xsd:simpleType name="persistence-typeType">
-<xsd:annotation>
-<xsd:documentation>
-
-The persistence-typeType specifies an entity bean's persistence
-management type.
-
-The persistence-type element must be one of the two following:
-
-    Bean
-    Container
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:restriction base="j2ee:string">
-        <xsd:enumeration value="Bean"/>
-        <xsd:enumeration value="Container"/>
-    </xsd:restriction>
-
-</xsd:simpleType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="query-methodType">
-<xsd:annotation>
-<xsd:documentation>
-
-The query-method specifies the method for a finder or select
-query.
-
-The method-name element specifies the name of a finder or select
-method in the entity bean's implementation class.
-
-Each method-param must be defined for a query-method using the
-method-params element.
-
-It is used by the query-method element.
-
-Example:
-
-<query>
-    <description>Method finds large orders</description>
-    <query-method>
-        <method-name>findLargeOrders</method-name>
-        <method-params></method-params>
-    </query-method>
-    <ejb-ql>SELECT OBJECT(o) FROM Order o WHERE o.amount &gt; 1000</ejb-ql>
-</query>
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="method-name"
-                     type="j2ee:method-nameType"/>
-        <xsd:element name="method-params"
-                     type="j2ee:method-paramsType"/>
-        <xsd:element name="deployment-extension"
-                     type="j2ee:deployment-extensionType"
-                     minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="queryType">
-<xsd:annotation>
-<xsd:documentation>
-
-The queryType defines a finder or select
-query. It contains
-    - an optional description of the query
-    - the specification of the finder or select
-      method it is used by
-        - an optional specification of the result type
-          mapping, if the query is for a select method
-          and entity objects are returned.
-        - the EJB QL query string that defines the query.
-    - an optional declaration of deployment extensions
-
-Queries that are expressible in EJB QL must use the ejb-ql
-element to specify the query. If a query is not expressible
-in EJB QL, the description element should be used to
-describe the semantics of the query and the ejb-ql element
-should be empty.
-
-The result-type-mapping is an optional element. It can only
-be present if the query-method specifies a select method
-that returns entity objects.  The default value for the
-result-type-mapping element is "Local".
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="description"
-                     type="j2ee:descriptionType" minOccurs="0"/>
-        <xsd:element name="query-method"
-                     type="j2ee:query-methodType"/>
-        <xsd:element name="result-type-mapping"
-                     type="j2ee:result-type-mappingType"
-                     minOccurs="0"/>
-        <xsd:element name="ejb-ql"
-                     type="xsd:string"/>
-        <xsd:element name="deployment-extension"
-                     type="j2ee:deployment-extensionType"
-                     minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="relationship-role-sourceType">
-<xsd:annotation>
-<xsd:documentation>
-
-The relationship-role-sourceType designates the source of a
-role that participates in a relationship. A
-relationship-role-sourceType is used by
-relationship-role-source elements to uniquely identify an
-entity bean.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="description"
-                     type="j2ee:descriptionType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="ejb-name"
-                     type="j2ee:ejb-nameType"/>
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="relationshipsType">
-<xsd:annotation>
-<xsd:documentation>
-
-The relationshipsType describes the relationships in
-which entity beans with container-managed persistence
-participate. The relationshipsType contains an optional
-description; and a list of ejb-relation elements, which
-specify the container managed relationships.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="description"
-                     type="j2ee:descriptionType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="ejb-relation"
-                     type="j2ee:ejb-relationType"
-                     maxOccurs="unbounded">
-
-        <xsd:unique name="role-name-uniqueness">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The ejb-relationship-role-name contains the name of a
-        relationship role. The name must be unique within
-        a relationship, but can be reused in different
-        relationships.
-
-        </xsd:documentation>
-        </xsd:annotation>
-            <xsd:selector
-                xpath=".//j2ee:ejb-relationship-role-name"/>
-            <xsd:field
-                xpath="."/>
-        </xsd:unique>
-        </xsd:element>
-        <xsd:element name="deployment-extension"
-                     type="j2ee:deployment-extensionType"
-                     minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:simpleType name="result-type-mappingType">
-<xsd:annotation>
-<xsd:documentation>
-
-The result-type-mappingType is used in the query element to
-specify whether an abstract schema type returned by a query
-for a select method is to be mapped to an EJBLocalObject or
-EJBObject type.
-
-The value must be one of the following:
-
-    Local
-    Remote
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:restriction base="j2ee:string">
-        <xsd:enumeration value="Local"/>
-        <xsd:enumeration value="Remote"/>
-    </xsd:restriction>
-
-</xsd:simpleType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="security-identityType">
-<xsd:annotation>
-<xsd:documentation>
-
-The security-identityType specifies whether the caller's
-security identity is to be used for the execution of the
-methods of the enterprise bean or whether a specific run-as
-identity is to be used. It contains an optional description
-and a specification of the security identity to be used.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="description"
-                     type="j2ee:descriptionType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:choice>
-            <xsd:element name="use-caller-identity"
-                         type="j2ee:emptyType">
-            <xsd:annotation>
-            <xsd:documentation>
-
-            The use-caller-identity element specifies that
-            the caller's security identity be used as the
-            security identity for the execution of the
-            enterprise bean's methods.
-
-            </xsd:documentation>
-            </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="run-as"
-                         type="j2ee:run-asType"/>
-        </xsd:choice>
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="service-refType">
-<xsd:annotation>
-<xsd:documentation>
-
-THIS IS A PLACEHOLDER TYPE which will
-be REPLACED. It will be defined based on
-definition to be supplied by JSR109.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:simpleContent>
-        <xsd:extension base="xsd:string">
-        </xsd:extension>
-    </xsd:simpleContent>
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="session-beanType">
-<xsd:annotation>
-<xsd:documentation>
-
-The session-beanType declares an session bean. The
-declaration consists of:
-
-    - an optional description
-    - an optional display name
-    - an optional icon element that contains a small and a large
-      icon file name
-    - a name assigned to the enterprise bean
-      in the deployment description
-    - the names of the session bean's remote home and
-      remote interfaces, if any
-    - the names of the session bean's local home and
-      local interfaces, if any
-    - the name of the session bean's web service endpoint
-      interface, if any
-    - the session bean's implementation class
-    - the session bean's state management type
-    - the session bean's transaction management type
-    - an optional declaration of the bean's
-      environment entries
-    - an optional declaration of the bean's EJB references
-    - an optional declaration of the bean's local
-      EJB references
-    - an optional declaration of the bean's web
-      service references
-    - an optional declaration of the security role
-      references
-    - an optional declaration of the security identity
-      to be used for the execution of the bean's methods
-    - an optional declaration of the bean's resource
-      manager connection factory references
-    - an optional declaration of the bean's resource
-      environment references.
-    - an optional declaration of the bean's message
-      destination references
-    - an optional declaration deployment extensions
-
-The elements that are optional are "optional" in the sense
-that they are omitted when if lists represented by them are
-empty.
-
-Either both the local-home and the local elements or both
-the home and the remote elements must be specified for the
-session bean.
-
-The service-endpoint element may only be specified if the
-bean is a stateless session bean.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="description"
-                     type="j2ee:descriptionType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="display-name"
-                     type="j2ee:display-nameType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="icon"
-                     type="j2ee:iconType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="ejb-name"
-                     type="j2ee:ejb-nameType"/>
-        <xsd:element name="home"
-                     type="j2ee:homeType"
-                     minOccurs="0"/>
-        <xsd:element name="remote"
-                     type="j2ee:remoteType"
-                     minOccurs="0"/>
-        <xsd:element name="local-home"
-                     type="j2ee:local-homeType"
-                     minOccurs="0"/>
-        <xsd:element name="local"
-                     type="j2ee:localType"
-                     minOccurs="0"/>
-        <xsd:element name="service-endpoint"
-                     type="j2ee:fully-qualified-classType"
-                     minOccurs="0">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The service-endpoint element contains the
-        fully-qualified name of the enterprise bean's web
-        service endpoint interface. The service-endpoint
-        element may only be specified for a stateless
-        session bean. The specified interface must be a
-        valid JAX-RPC service endpoint interface.
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="ejb-class"
-                     type="j2ee:ejb-classType"/>
-        <xsd:element name="session-type"
-                     type="j2ee:session-typeType"/>
-        <xsd:element name="transaction-type"
-                     type="j2ee:transaction-typeType"/>
-        <xsd:element name="env-entry"
-                     type="j2ee:env-entryType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="ejb-ref"
-                     type="j2ee:ejb-refType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="ejb-local-ref"
-                     type="j2ee:ejb-local-refType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="service-ref"
-                     type="j2ee:service-refType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="security-role-ref"
-                     type="j2ee:security-role-refType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="security-identity"
-                     type="j2ee:security-identityType"
-                     minOccurs="0"/>
-        <xsd:element name="resource-ref"
-                     type="j2ee:resource-refType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="resource-env-ref"
-                     type="j2ee:resource-env-refType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="message-destination-ref"
-                     type="j2ee:message-destination-refType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="deployment-extension"
-                     type="j2ee:deployment-extensionType"
-                     minOccurs="0" maxOccurs="unbounded"/>
-        </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:simpleType name="session-typeType">
-<xsd:annotation>
-<xsd:documentation>
-
-The session-typeType describes whether the session bean is a
-stateful session or stateless session. It is used by
-session-type elements.
-
-The value must be one of the two following:
-
-    Stateful
-    Stateless
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:restriction base="j2ee:string">
-        <xsd:enumeration value="Stateful"/>
-        <xsd:enumeration value="Stateless"/>
-    </xsd:restriction>
-
-</xsd:simpleType>
-
-<!-- **************************************************** -->
-
-<xsd:simpleType name="trans-attributeType">
-<xsd:annotation>
-<xsd:documentation>
-
-The trans-attributeType specifies how the container must
-manage the transaction boundaries when delegating a method
-invocation to an enterprise bean's business method.
-
-The value must be one of the following:
-
-    NotSupported
-    Supports
-    Required
-    RequiresNew
-    Mandatory
-    Never
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:restriction base="j2ee:string">
-        <xsd:enumeration value="NotSupported"/>
-        <xsd:enumeration value="Supports"/>
-        <xsd:enumeration value="Required"/>
-        <xsd:enumeration value="RequiresNew"/>
-        <xsd:enumeration value="Mandatory"/>
-        <xsd:enumeration value="Never"/>
-    </xsd:restriction>
-
-</xsd:simpleType>
-
-<!-- **************************************************** -->
-
-<xsd:simpleType name="transaction-typeType">
-<xsd:annotation>
-<xsd:documentation>
-
-The transaction-typeType specifies an enterprise bean's
-transaction management type.
-
-The transaction-type must be one of the two following:
-
-    Bean
-    Container
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:restriction base="j2ee:string">
-        <xsd:enumeration value="Bean"/>
-        <xsd:enumeration value="Container"/>
-    </xsd:restriction>
-
-</xsd:simpleType>
-
-</xsd:schema>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
+     targetNamespace="http://java.sun.com/xml/ns/j2ee"
+     xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
+     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+     elementFormDefault="qualified"
+     attributeFormDefault="unqualified"
+     version="2.1">
+<xsd:annotation>
+<xsd:documentation>
+@(#)ejb-jar_2_1.xsds	1.10 07/24/02
+</xsd:documentation>
+</xsd:annotation>
+
+<xsd:annotation>
+<xsd:documentation>
+
+Copyright 2002 Sun Microsystems, Inc., 901 San Antonio
+Road, Palo Alto, California 94303, U.S.A. All rights
+reserved.
+
+Sun Microsystems, Inc. has intellectual property rights
+relating to technology described in this document. In
+particular, and without limitation, these intellectual
+property rights may include one or more of the U.S. patents
+listed at http://www.sun.com/patents and one or more
+additional patents or pending patent applications in the
+U.S. and other countries.
+
+This document and the technology which it describes are
+distributed under licenses restricting their use, copying,
+distribution, and decompilation. No part of this document
+may be reproduced in any form by any means without prior
+written authorization of Sun and its licensors, if any.
+
+Third-party software, including font technology, is
+copyrighted and licensed from Sun suppliers.
+
+Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
+JavaServer Pages, Enterprise JavaBeans and the Java Coffee
+Cup logo are trademarks or registered trademarks of Sun
+Microsystems, Inc. in the U.S. and other countries.
+
+Federal Acquisitions: Commercial Software - Government Users
+Subject to Standard License Terms and Conditions.
+
+</xsd:documentation>
+</xsd:annotation>
+
+<xsd:annotation>
+<xsd:documentation>
+
+This is the XML Schema for the EJB 2.1 deployment
+descriptor.  All EJB deployment descriptors must indicate
+the ejb-jar schema by using the J2EE namespace:
+
+http://java.sun.com/xml/ns/j2ee
+
+and by indicating the version of the schema by
+using the version element as shown below:
+<!--
+    <ejb-jar xmlns="http://java.sun.com/xml/ns/j2ee"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+         http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd"
+     version="2.1">
+    ...
+    </ejb-jar>
+-->
+The instance documents may indicate the published version of
+the schema using the xsi:schemaLocation attribute for the
+J2EE namespace with the following location:
+
+http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd
+
+</xsd:documentation>
+</xsd:annotation>
+
+<xsd:annotation>
+<xsd:documentation>
+
+The following conventions apply to all J2EE
+deployment descriptor elements unless indicated otherwise.
+
+- In elements that specify a pathname to a file within the
+  same JAR file, relative filenames (i.e., those not
+  starting with "/") are considered relative to the root of
+  the JAR file's namespace.  Absolute filenames (i.e., those
+  starting with "/") also specify names in the root of the
+  JAR file's namespace.  In general, relative names are
+  preferred.  The exception is .war files where absolute
+  names are preferred for consistency with the Servlet API.
+
+</xsd:documentation>
+</xsd:annotation>
+
+<include schemaLocation="j2ee_1_4.xsd"/>
+
+
+<!-- **************************************************** -->
+
+
+<xsd:element name="ejb-jar" type="j2ee:ejb-jarType">
+    <xsd:annotation>
+    <xsd:documentation>
+
+    This is the root of the ejb-jar deployment descriptor.
+
+    </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:key name="ejb-name-key">
+    <xsd:annotation>
+    <xsd:documentation>
+
+    The ejb-name element contains the name of an enterprise
+    bean. The name must be unique within the ejb-jar file.
+
+    </xsd:documentation>
+    </xsd:annotation>
+        <xsd:selector xpath="j2ee:enterprise-beans/*"/>
+        <xsd:field    xpath="j2ee:ejb-name"/>
+    </xsd:key>
+
+    <xsd:keyref name="ejb-name-references"
+            refer="j2ee:ejb-name-key">
+    <xsd:annotation>
+    <xsd:documentation>
+
+    The keyref indicates the references from
+    relationship-role-source must be to a specific ejb-name
+    defined within the scope of enterprise-beans element.
+
+    </xsd:documentation>
+    </xsd:annotation>
+        <xsd:selector
+            xpath=".//j2ee:ejb-relationship-role/j2ee:relationship-role-source"/>
+        <xsd:field
+            xpath="j2ee:ejb-name"/>
+    </xsd:keyref>
+
+    <xsd:key name="role-name-key">
+    <xsd:annotation>
+    <xsd:documentation>
+
+    A role-name-key is specified to allow the references
+    from the security-role-refs.
+
+    </xsd:documentation>
+    </xsd:annotation>
+        <xsd:selector xpath="j2ee:enterprise-beans/*/j2ee:security-role"/>
+        <xsd:field    xpath="j2ee:role-name"/>
+    </xsd:key>
+
+    <xsd:keyref name="role-name-references"
+            refer="j2ee:role-name-key">
+    <xsd:annotation>
+    <xsd:documentation>
+
+    The keyref indicates the references from
+    security-role-ref to a specified role-name.
+
+    </xsd:documentation>
+    </xsd:annotation>
+        <xsd:selector xpath="j2ee:enterprise-beans/*/j2ee:security-role-ref"/>
+        <xsd:field    xpath="j2ee:role-link"/>
+    </xsd:keyref>
+
+</xsd:element>
+
+
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="activation-config-propertyType">
+<xsd:annotation>
+<xsd:documentation>
+
+The activation-config-propertyType contains a name/value
+configuration property pair for a message-driven bean.
+
+The properties that are recognized for a particular
+message-driven bean are determined by the messaging type.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="activation-config-property-name"
+                     type="xsd:string">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The activation-config-property-name element contains
+        the name for an activation configuration property of
+        a message-driven bean.
+
+        For JMS message-driven beans, the following property
+        names are recognized: acknowledgeMode,
+        messageSelector, destinationType, subscriptionDurability
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+        <xsd:element name="activation-config-property-value"
+                     type="xsd:string">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The activation-config-property-value element
+        contains the value for an activation configuration
+        property of a message-driven bean.
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="activation-configType">
+<xsd:annotation>
+<xsd:documentation>
+
+The activation-configType defines information about the
+expected configuration properties of the message-driven bean
+in its operational environment. This may include information
+about message acknowledgement, message selector, expected
+destination type, etc.
+
+The configuration information is expressed in terms of
+name/value configuration properties.
+
+The properties that are recognized for a particular
+message-driven bean are determined by the messaging type.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="description"
+                     type="j2ee:descriptionType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="activation-config-property"
+                     type="j2ee:activation-config-propertyType"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="deployment-extension"
+                     type="j2ee:deployment-extensionType"
+                     minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="assembly-descriptorType">
+<xsd:annotation>
+<xsd:documentation>
+
+The assembly-descriptorType defines
+application-assembly information.
+
+The application-assembly information consists of the
+following parts: the definition of security roles, the
+definition of method permissions, the definition of
+transaction attributes for enterprise beans with
+container-managed transaction demarcation and a list of
+methods to be excluded from being invoked.
+
+All the parts are optional in the sense that they are
+omitted if the lists represented by them are empty.
+
+Providing an assembly-descriptor in the deployment
+descriptor is optional for the ejb-jar file producer.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="security-role"
+                     type="j2ee:security-roleType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="method-permission"
+                     type="j2ee:method-permissionType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="container-transaction"
+                     type="j2ee:container-transactionType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="message-destination"
+                     type="j2ee:message-destinationType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="exclude-list"
+                     type="j2ee:exclude-listType"
+                     minOccurs="0"/>
+        <xsd:element name="deployment-extension"
+                     type="j2ee:deployment-extensionType"
+                     minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="cmp-fieldType">
+<xsd:annotation>
+<xsd:documentation>
+
+The cmp-fieldType describes a container-managed field. The
+cmp-fieldType contains an optional description of the field,
+and the name of the field.
+
+</xsd:documentation>
+</xsd:annotation>
+    <xsd:sequence>
+        <xsd:element name="description"
+                     type="j2ee:descriptionType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="field-name"
+                     type="j2ee:java-identifierType">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The field-name element specifies the name of a
+        container managed field.
+
+        The name of the cmp-field of an entity bean with
+        cmp-version 2.x must begin with a lowercase
+        letter. This field is accessed by methods whose
+        names consists of the name of the field specified by
+        field-name in which the first letter is uppercased,
+        prefixed by "get" or "set".
+
+        The name of the cmp-field of an entity bean with
+        cmp-version 1.x must denote a public field of the
+        enterprise bean class or one of its superclasses.
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+        <xsd:element name="deployment-extension"
+                     type="j2ee:deployment-extensionType"
+                     minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:simpleType name="cmp-versionType">
+<xsd:annotation>
+<xsd:documentation>
+
+The cmp-versionType specifies the version of an entity bean
+with container-managed persistence. It is used by
+cmp-version elements.
+
+The value must be one of the two following:
+
+    1.x
+    2.x
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:restriction base="j2ee:string">
+        <xsd:enumeration value="1.x"/>
+        <xsd:enumeration value="2.x"/>
+    </xsd:restriction>
+
+</xsd:simpleType>
+
+<!-- **************************************************** -->
+
+<xsd:simpleType name="cmr-field-typeType">
+<xsd:annotation>
+<xsd:documentation>
+
+The cmr-field-type element specifies the class of a
+collection-valued logical relationship field in the entity
+bean class. The value of an element using cmr-field-typeType
+must be either: java.util.Collection or java.util.Set.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:restriction base="j2ee:string">
+        <xsd:enumeration value="java.util.Collection"/>
+        <xsd:enumeration value="java.util.Set"/>
+    </xsd:restriction>
+
+</xsd:simpleType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="cmr-fieldType">
+<xsd:annotation>
+<xsd:documentation>
+
+The cmr-fieldType describes the bean provider's view of
+a relationship. It consists of an optional description, and
+the name and the class type of a field in the source of a
+role of a relationship. The cmr-field-name element
+corresponds to the name used for the get and set accessor
+methods for the relationship. The cmr-field-type element is
+used only for collection-valued cmr-fields. It specifies the
+type of the collection that is used.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="description"
+                     type="j2ee:descriptionType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="cmr-field-name"
+                     type="j2ee:string">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The cmr-field-name element specifies the name of a
+        logical relationship field in the entity bean
+        class. The name of the cmr-field must begin with a
+        lowercase letter. This field is accessed by methods
+        whose names consist of the name of the field
+        specified by cmr-field-name in which the first
+        letter is uppercased, prefixed by "get" or "set".
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+        <xsd:element name="cmr-field-type"
+                     type="j2ee:cmr-field-typeType"
+                     minOccurs="0"/>
+        <xsd:element name="deployment-extension"
+                     type="j2ee:deployment-extensionType"
+                     minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="container-transactionType">
+<xsd:annotation>
+<xsd:documentation>
+
+The container-transactionType specifies how the container
+must manage transaction scopes for the enterprise bean's
+method invocations. It defines an optional description, a
+list of method elements, and a transaction attribute. The
+transaction attribute is to be applied to all the specified
+methods.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="description"
+                     type="j2ee:descriptionType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="method"
+                     type="j2ee:methodType"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="trans-attribute"
+                     type="j2ee:trans-attributeType"/>
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:simpleType name="ejb-classType">
+<xsd:annotation>
+<xsd:documentation>
+
+The ejb-classType contains the fully-qualified name of the
+enterprise bean's class. It is used by ejb-class elements.
+
+Example:
+
+    <ejb-class>com.wombat.empl.EmployeeServiceBean</ejb-class>
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:restriction base="j2ee:fully-qualified-classType"/>
+
+</xsd:simpleType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="ejb-jarType">
+<xsd:annotation>
+<xsd:documentation>
+
+The ejb-jarType defines the root element of the EJB
+deployment descriptor. It contains
+
+    - an optional description of the ejb-jar file
+    - an optional display name
+    - an optional icon that contains a small and a large
+      icon file name
+    - mandatory structural information about all included
+      enterprise beans
+    - a descriptor for container managed relationships,
+      if any
+    - an optional application-assembly descriptor
+    - an optional name of an ejb-client-jar file for the
+      ejb-jar.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="description"
+                     type="j2ee:descriptionType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="display-name"
+                     type="j2ee:display-nameType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="icon"
+                     type="j2ee:iconType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="enterprise-beans"
+                     type="j2ee:enterprise-beansType"/>
+        <xsd:element name="relationships"
+                     type="j2ee:relationshipsType"
+                     minOccurs="0">
+        <xsd:unique name="relationship-name-uniqueness">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The ejb-relation-name contains the name of a
+        relation. The name must be unique within
+        relationships.
+
+        </xsd:documentation>
+        </xsd:annotation>
+            <xsd:selector xpath="j2ee:ejb-relation"/>
+            <xsd:field    xpath="j2ee:ejb-relation-name"/>
+        </xsd:unique>
+        </xsd:element>
+        <xsd:element name="assembly-descriptor"
+                     type="j2ee:assembly-descriptorType"
+                     minOccurs="0">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        Providing an assembly-descriptor in the deployment
+        descriptor is optional for the ejb-jar file
+        producer.
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+        <xsd:element name="ejb-client-jar"
+                     type="j2ee:pathType"
+                     minOccurs="0">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The optional ejb-client-jar element specifies a JAR
+        file that contains the class files necessary for a
+        client program to access the
+        enterprise beans in the ejb-jar file.
+
+        Example:
+
+            <ejb-client-jar>employee_service_client.jar
+            </ejb-client-jar>
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+        <xsd:element name="deployment-extension"
+                     type="j2ee:deployment-extensionType"
+                     minOccurs="0" maxOccurs="unbounded"/>
+
+    </xsd:sequence>
+    <xsd:attribute name="version"
+                   type="j2ee:dewey-versionType"
+                   fixed="2.1"
+                   use="required">
+    <xsd:annotation>
+    <xsd:documentation>
+
+    The version specifies the version of the
+    EJB specification that the instance document must
+    comply with. This information enables deployment tools
+    to validate a particular EJB Deployment
+    Descriptor with respect to a specific version of the EJB
+    schema.
+
+    </xsd:documentation>
+    </xsd:annotation>
+    </xsd:attribute>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:simpleType name="ejb-nameType">
+<xsd:annotation>
+<xsd:documentation>
+
+The ejb-nameType specifies an enterprise bean's name. It is
+used by ejb-name elements. This name is assigned by the
+ejb-jar file producer to name the enterprise bean in the
+ejb-jar file's deployment descriptor. The name must be
+unique among the names of the enterprise beans in the same
+ejb-jar file.
+
+There is no architected relationship between the used
+ejb-name in the deployment descriptor and the JNDI name that
+the Deployer will assign to the enterprise bean's home.
+
+The name for an entity bean must conform to the lexical
+rules for an NMTOKEN.
+
+Example:
+
+<ejb-name>EmployeeService</ejb-name>
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:restriction base="xsd:NMTOKEN">
+        <xsd:whiteSpace value="collapse"/>
+    </xsd:restriction>
+
+</xsd:simpleType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="ejb-relationType">
+<xsd:annotation>
+<xsd:documentation>
+
+The ejb-relationType describes a relationship between two
+entity beans with container-managed persistence.  It is used
+by ejb-relation elements. It contains a description; an
+optional ejb-relation-name element; and exactly two
+relationship role declarations, defined by the
+ejb-relationship-role elements. The name of the
+relationship, if specified, is unique within the ejb-jar
+file.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="description"
+                     type="j2ee:descriptionType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="ejb-relation-name"
+                     type="j2ee:string"
+                     minOccurs="0">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The ejb-relation-name element provides a unique name
+        within the ejb-jar file for a relationship.
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+        <xsd:element name="ejb-relationship-role"
+                     type="j2ee:ejb-relationship-roleType"/>
+        <xsd:element name="ejb-relationship-role"
+                     type="j2ee:ejb-relationship-roleType"/>
+        <xsd:element name="deployment-extension"
+                     type="j2ee:deployment-extensionType"
+                     minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="ejb-relationship-roleType">
+<xsd:annotation>
+<xsd:documentation>
+
+The ejb-relationship-roleType describes a role within a
+relationship. There are two roles in each relationship.
+
+The ejb-relationship-roleType contains an optional
+description; an optional name for the relationship role; a
+specification of the multiplicity of the role; an optional
+specification of cascade-delete functionality for the role;
+the role source; and a declaration of the cmr-field, if any,
+by means of which the other side of the relationship is
+accessed from the perspective of the role source.
+
+The multiplicity and role-source element are mandatory.
+
+The relationship-role-source element designates an entity
+bean by means of an ejb-name element. For bidirectional
+relationships, both roles of a relationship must declare a
+relationship-role-source element that specifies a cmr-field
+in terms of which the relationship is accessed. The lack of
+a cmr-field element in an ejb-relationship-role specifies
+that the relationship is unidirectional in navigability and
+the entity bean that participates in the relationship is
+"not aware" of the relationship.
+
+Example:
+
+<ejb-relation>
+    <ejb-relation-name>Product-LineItem</ejb-relation-name>
+    <ejb-relationship-role>
+        <ejb-relationship-role-name>product-has-lineitems
+        </ejb-relationship-role-name>
+        <multiplicity>One</multiplicity>
+        <relationship-role-source>
+        <ejb-name>ProductEJB</ejb-name>
+        </relationship-role-source>
+     </ejb-relationship-role>
+</ejb-relation>
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="description"
+                     type="j2ee:descriptionType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="ejb-relationship-role-name"
+                     type="j2ee:string"
+                     minOccurs="0">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The ejb-relationship-role-name element defines a
+        name for a role that is unique within an
+        ejb-relation. Different relationships can use the
+        same name for a role.
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+        <xsd:element name="multiplicity"
+                     type="j2ee:multiplicityType"/>
+        <xsd:element name="cascade-delete"
+                     type="j2ee:emptyType"
+                     minOccurs="0">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The cascade-delete element specifies that, within a
+        particular relationship, the lifetime of one or more
+        entity beans is dependent upon the lifetime of
+        another entity bean. The cascade-delete element can
+        only be specified for an ejb-relationship-role
+        element contained in an ejb-relation element in
+        which the other ejb-relationship-role
+        element specifies a multiplicity of One.
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+        <xsd:element name="relationship-role-source"
+                     type="j2ee:relationship-role-sourceType"/>
+        <xsd:element name="cmr-field"
+                     type="j2ee:cmr-fieldType"
+                     minOccurs="0"/>
+        <xsd:element name="deployment-extension"
+                     type="j2ee:deployment-extensionType"
+                     minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="enterprise-beansType">
+<xsd:annotation>
+<xsd:documentation>
+
+The enterprise-beansType declares one or more enterprise
+beans. Each bean can be a session, entity or message-driven
+bean.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:choice maxOccurs="unbounded">
+        <xsd:element name="session"
+                     type="j2ee:session-beanType">
+        <xsd:unique name="session-ejb-local-ref-name-uniqueness">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The ejb-ref-name element contains the name of
+        an EJB reference. The EJB reference is an entry in
+        the component's environment and is relative to the
+        java:comp/env context.  The name must be unique within
+        the component.
+
+        It is recommended that name be prefixed with "ejb/".
+
+        </xsd:documentation>
+        </xsd:annotation>
+            <xsd:selector xpath="j2ee:ejb-local-ref"/>
+            <xsd:field    xpath="j2ee:ejb-ref-name"/>
+        </xsd:unique>
+
+        <xsd:unique name="session-ejb-ref-name-uniqueness">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The ejb-ref-name element contains the name of an EJB
+        reference. The EJB reference is an entry in the
+        component's environment and is relative to the
+        java:comp/env context. The name must be unique
+        within the component.
+
+        It is recommended that name is prefixed with "ejb/".
+
+        </xsd:documentation>
+        </xsd:annotation>
+            <xsd:selector xpath="j2ee:ejb-ref"/>
+            <xsd:field    xpath="j2ee:ejb-ref-name"/>
+        </xsd:unique>
+
+        <xsd:unique name="session-resource-env-ref-uniqueness">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The resource-env-ref-name element specifies the name
+        of a resource environment reference; its value is
+        the environment entry name used in the component
+        code. The name is a JNDI name relative to the
+        java:comp/env context and must be unique within an
+        component.
+
+        </xsd:documentation>
+        </xsd:annotation>
+            <xsd:selector xpath="j2ee:resource-env-ref"/>
+            <xsd:field    xpath="j2ee:resource-env-ref-name"/>
+        </xsd:unique>
+
+        <xsd:unique name="session-message-destination-ref-uniqueness">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The message-destination-ref-name element specifies the name
+        of a message destination reference; its value is
+        the message destination reference name used in the component
+        code. The name is a JNDI name relative to the
+        java:comp/env context and must be unique within an
+        component.
+
+        </xsd:documentation>
+        </xsd:annotation>
+            <xsd:selector xpath="j2ee:message-destination-ref"/>
+            <xsd:field    xpath="j2ee:message-destination-ref-name"/>
+        </xsd:unique>
+
+        <xsd:unique name="session-res-ref-name-uniqueness">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The res-ref-name element specifies the name of a
+        resource manager connection factory reference.  The name
+        is a JNDI name relative to the java:comp/env context.
+        The name must be unique within an component.
+
+        </xsd:documentation>
+        </xsd:annotation>
+            <xsd:selector xpath="j2ee:resource-ref"/>
+            <xsd:field    xpath="j2ee:res-ref-name"/>
+        </xsd:unique>
+
+        <xsd:unique name="session-env-entry-name-uniqueness">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The env-entry-name element contains the name of a
+        component's environment entry.  The name is a JNDI
+        name relative to the java:comp/env context.  The
+        name must be unique within an component.
+
+        </xsd:documentation>
+        </xsd:annotation>
+            <xsd:selector xpath="j2ee:env-entry"/>
+            <xsd:field    xpath="j2ee:env-entry-name"/>
+        </xsd:unique>
+        </xsd:element>
+
+        <xsd:element name="entity"
+                     type="j2ee:entity-beanType">
+        <xsd:unique name="entity-ejb-local-ref-name-uniqueness">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The ejb-ref-name element contains the name of
+        an EJB reference. The EJB reference is an entry in
+        the component's environment and is relative to the
+        java:comp/env context.  The name must be unique within
+        the component.
+
+        It is recommended that name be prefixed with "ejb/".
+
+        </xsd:documentation>
+        </xsd:annotation>
+            <xsd:selector xpath="j2ee:ejb-local-ref"/>
+            <xsd:field    xpath="j2ee:ejb-ref-name"/>
+        </xsd:unique>
+
+        <xsd:unique name="entity-ejb-ref-name-uniqueness">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The ejb-ref-name element contains the name of an EJB
+        reference. The EJB reference is an entry in the
+        component's environment and is relative to the
+        java:comp/env context. The name must be unique
+        within the component.
+
+        It is recommended that name is prefixed with "ejb/".
+
+        </xsd:documentation>
+        </xsd:annotation>
+            <xsd:selector xpath="j2ee:ejb-ref"/>
+            <xsd:field    xpath="j2ee:ejb-ref-name"/>
+        </xsd:unique>
+
+        <xsd:unique name="entity-resource-env-ref-uniqueness">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The resource-env-ref-name element specifies the name
+        of a resource environment reference; its value is
+        the environment entry name used in the component
+        code. The name is a JNDI name relative to the
+        java:comp/env context and must be unique within an
+        component.
+
+        </xsd:documentation>
+        </xsd:annotation>
+            <xsd:selector xpath="j2ee:resource-env-ref"/>
+            <xsd:field    xpath="j2ee:resource-env-ref-name"/>
+        </xsd:unique>
+
+        <xsd:unique name="entity-message-destination-ref-uniqueness">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The message-destination-ref-name element specifies the name
+        of a message destination reference; its value is
+        the message destination reference name used in the component
+        code. The name is a JNDI name relative to the
+        java:comp/env context and must be unique within an
+        component.
+
+        </xsd:documentation>
+        </xsd:annotation>
+            <xsd:selector xpath="j2ee:message-destination-ref"/>
+            <xsd:field    xpath="j2ee:message-destination-ref-name"/>
+        </xsd:unique>
+
+        <xsd:unique name="entity-res-ref-name-uniqueness">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The res-ref-name element specifies the name of a
+        resource manager connection factory reference.  The name
+        is a JNDI name relative to the java:comp/env context.
+        The name must be unique within an component.
+
+        </xsd:documentation>
+        </xsd:annotation>
+            <xsd:selector xpath="j2ee:resource-ref"/>
+            <xsd:field    xpath="j2ee:res-ref-name"/>
+        </xsd:unique>
+
+        <xsd:unique name="entity-env-entry-name-uniqueness">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The env-entry-name element contains the name of a
+        component's environment entry.  The name is a JNDI
+        name relative to the java:comp/env context.  The
+        name must be unique within an component.
+
+        </xsd:documentation>
+        </xsd:annotation>
+            <xsd:selector xpath="j2ee:env-entry"/>
+            <xsd:field    xpath="j2ee:env-entry-name"/>
+        </xsd:unique>
+        </xsd:element>
+
+        <xsd:element name="message-driven"
+                     type="j2ee:message-driven-beanType">
+        <xsd:unique name="messaged-ejb-local-ref-name-uniqueness">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The ejb-ref-name element contains the name of
+        an EJB reference. The EJB reference is an entry in
+        the component's environment and is relative to the
+        java:comp/env context.  The name must be unique within
+        the component.
+
+        It is recommended that name be prefixed with "ejb/".
+
+        </xsd:documentation>
+        </xsd:annotation>
+            <xsd:selector xpath="j2ee:ejb-local-ref"/>
+            <xsd:field    xpath="j2ee:ejb-ref-name"/>
+        </xsd:unique>
+
+        <xsd:unique name="messaged-ejb-ref-name-uniqueness">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The ejb-ref-name element contains the name of an EJB
+        reference. The EJB reference is an entry in the
+        component's environment and is relative to the
+        java:comp/env context. The name must be unique
+        within the component.
+
+        It is recommended that name is prefixed with "ejb/".
+
+        </xsd:documentation>
+        </xsd:annotation>
+            <xsd:selector xpath="j2ee:ejb-ref"/>
+            <xsd:field    xpath="j2ee:ejb-ref-name"/>
+        </xsd:unique>
+
+        <xsd:unique name="messaged-resource-env-ref-uniqueness">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The resource-env-ref-name element specifies the name
+        of a resource environment reference; its value is
+        the environment entry name used in the component
+        code. The name is a JNDI name relative to the
+        java:comp/env context and must be unique within an
+        component.
+
+        </xsd:documentation>
+        </xsd:annotation>
+            <xsd:selector xpath="j2ee:resource-env-ref"/>
+            <xsd:field    xpath="j2ee:resource-env-ref-name"/>
+        </xsd:unique>
+
+        <xsd:unique name="messaged-message-destination-ref-uniqueness">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The message-destination-ref-name element specifies the name
+        of a message destination reference; its value is
+        the message destination reference name used in the component
+        code. The name is a JNDI name relative to the
+        java:comp/env context and must be unique within an
+        component.
+
+        </xsd:documentation>
+        </xsd:annotation>
+            <xsd:selector xpath="j2ee:message-destination-ref"/>
+            <xsd:field    xpath="j2ee:message-destination-ref-name"/>
+        </xsd:unique>
+
+        <xsd:unique name="messaged-res-ref-name-uniqueness">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The res-ref-name element specifies the name of a
+        resource manager connection factory reference.  The name
+        is a JNDI name relative to the java:comp/env context.
+        The name must be unique within an component.
+
+        </xsd:documentation>
+        </xsd:annotation>
+            <xsd:selector xpath="j2ee:resource-ref"/>
+            <xsd:field    xpath="j2ee:res-ref-name"/>
+        </xsd:unique>
+
+        <xsd:unique name="messaged-env-entry-name-uniqueness">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The env-entry-name element contains the name of a
+        component's environment entry.  The name is a JNDI
+        name relative to the java:comp/env context.  The
+        name must be unique within an component.
+
+        </xsd:documentation>
+        </xsd:annotation>
+            <xsd:selector xpath="j2ee:env-entry"/>
+            <xsd:field    xpath="j2ee:env-entry-name"/>
+        </xsd:unique>
+        </xsd:element>
+
+    </xsd:choice>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="entity-beanType">
+<xsd:annotation>
+<xsd:documentation>
+
+The entity-beanType declares an entity bean. The declaration
+consists of:
+
+    - an optional description
+    - an optional display name
+    - an optional icon element that contains a small and a large
+      icon file name
+    - a unique name assigned to the enterprise bean
+      in the deployment descriptor
+    - the names of the entity bean's remote home
+      and remote interfaces, if any
+    - the names of the entity bean's local home and local
+      interfaces, if any
+    - the entity bean's implementation class
+    - the entity bean's persistence management type
+    - the entity bean's primary key class name
+    - an indication of the entity bean's reentrancy
+    - an optional specification of the
+      entity bean's cmp-version
+    - an optional specification of the entity bean's
+      abstract schema name
+    - an optional list of container-managed fields
+    - an optional specification of the primary key
+      field
+    - an optional declaration of the bean's environment
+      entries
+    - an optional declaration of the bean's EJB
+      references
+    - an optional declaration of the bean's local
+      EJB references
+    - an optional declaration of the bean's web
+      service references
+    - an optional declaration of the security role
+      references
+    - an optional declaration of the security identity
+      to be used for the execution of the bean's methods
+    - an optional declaration of the bean's
+      resource manager connection factory references
+    - an optional declaration of the bean's
+      resource environment references
+    - an optional declaration of the bean's message
+      destination references
+    - an optional set of query declarations
+      for finder and select methods for an entity
+      bean with cmp-version 2.x.
+    - an optional set of deployment-extension
+      declarations.
+
+The optional abstract-schema-name element must be specified
+for an entity bean with container-managed persistence and
+cmp-version 2.x.
+
+The optional primkey-field may be present in the descriptor
+if the entity's persistence-type is Container.
+
+The optional cmp-version element may be present in the
+descriptor if the entity's persistence-type is Container. If
+the persistence-type is Container and the cmp-version
+element is not specified, its value defaults to 2.x.
+
+The optional home and remote elements must be specified if
+the entity bean cmp-version is 1.x.
+
+The optional home and remote elements must be specified if
+the entity bean has a remote home and remote interface.
+
+The optional local-home and local elements must be specified
+if the entity bean has a local home and local interface.
+
+Either both the local-home and the local elements or both
+the home and the remote elements must be specified.
+
+The optional query elements must be present if the
+persistence-type is Container and the cmp-version is 2.x and
+query methods other than findByPrimaryKey have been defined
+for the entity bean.
+
+The other elements that are optional are "optional" in the
+sense that they are omitted if the lists represented by them
+are empty.
+
+At least one cmp-field element must be present in the
+descriptor if the entity's persistence-type is Container and
+the cmp-version is 1.x, and none must not be present if the
+entity's persistence-type is Bean.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="description"
+                     type="j2ee:descriptionType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="display-name"
+                     type="j2ee:display-nameType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="icon"
+                     type="j2ee:iconType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="ejb-name"
+                     type="j2ee:ejb-nameType"/>
+        <xsd:element name="home"
+                     type="j2ee:homeType"
+                     minOccurs="0"/>
+        <xsd:element name="remote"
+                     type="j2ee:remoteType"
+                     minOccurs="0"/>
+        <xsd:element name="local-home"
+                     type="j2ee:local-homeType"
+                     minOccurs="0"/>
+        <xsd:element name="local"
+                     type="j2ee:localType"
+                     minOccurs="0"/>
+        <xsd:element name="ejb-class"
+                     type="j2ee:ejb-classType"/>
+        <xsd:element name="persistence-type"
+                     type="j2ee:persistence-typeType"/>
+        <xsd:element name="prim-key-class"
+                     type="j2ee:fully-qualified-classType">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The prim-key-class element contains the
+        fully-qualified name of an
+        entity bean's primary key class.
+
+        If the definition of the primary key class is
+        deferred to deployment time, the prim-key-class
+        element should specify java.lang.Object.
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+        <xsd:element name="reentrant"
+                     type="j2ee:true-falseType">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The reentrant element specifies whether an entity
+        bean is reentrant or not.
+
+        The reentrant element must be one of the two
+        following: true or false
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+        <xsd:element name="cmp-version"
+                     type="j2ee:cmp-versionType"
+                     minOccurs="0"/>
+        <xsd:element name="abstract-schema-name"
+                     type="j2ee:java-identifierType"
+                     minOccurs="0">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The abstract-schema-name element specifies the name
+        of the abstract schema type of an entity bean with
+        cmp-version 2.x. It is used in EJB QL queries.
+
+        For example, the abstract-schema-name for an entity
+        bean whose local interface is
+        com.acme.commerce.Order might be Order.
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+        <xsd:element name="cmp-field"
+                     type="j2ee:cmp-fieldType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="primkey-field"
+                     type="j2ee:string"
+                     minOccurs="0">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The primkey-field element is used to specify the
+        name of the primary key field for an entity with
+        container-managed persistence.
+
+        The primkey-field must be one of the fields declared
+        in the cmp-field element, and the type of the field
+        must be the same as the primary key type.
+
+        The primkey-field element is not used if the primary
+        key maps to multiple container-managed fields
+        (i.e. the key is a compound key). In this case, the
+        fields of the primary key class must be public, and
+        their names must correspond to the field names of
+        the entity bean class that comprise the key.
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+        <xsd:element name="env-entry"
+                     type="j2ee:env-entryType"
+                     minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="ejb-ref"
+                     type="j2ee:ejb-refType"
+                     minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="ejb-local-ref"
+                     type="j2ee:ejb-local-refType"
+                     minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="service-ref"
+                     type="j2ee:service-refType"
+                     minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="security-role-ref"
+                     type="j2ee:security-role-refType"
+                     minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="security-identity"
+                     type="j2ee:security-identityType"
+                     minOccurs="0"/>
+        <xsd:element name="resource-ref"
+                     type="j2ee:resource-refType"
+                     minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="resource-env-ref"
+                     type="j2ee:resource-env-refType"
+                     minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="message-destination-ref"
+                     type="j2ee:message-destination-refType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="query"
+                     type="j2ee:queryType"
+                     minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="deployment-extension"
+                     type="j2ee:deployment-extensionType"
+                     minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="exclude-listType">
+<xsd:annotation>
+<xsd:documentation>
+
+The exclude-listType specifies one or more methods which
+the Assembler marks to be uncallable.
+
+If the method permission relation contains methods that are
+in the exclude list, the Deployer should consider those
+methods to be uncallable.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="description"
+                     type="j2ee:descriptionType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="method"
+                     type="j2ee:methodType"
+                     maxOccurs="unbounded"/>
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:simpleType name="java-typeType">
+<xsd:annotation>
+<xsd:documentation>
+
+This is a generic type that designates a Java primitive
+type or a fully qualified name of a Java interface/type.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:restriction base="j2ee:string">
+        <xsd:pattern value="[^\p{Z}]*"/>
+    </xsd:restriction>
+</xsd:simpleType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="message-driven-beanType">
+<xsd:annotation>
+<xsd:documentation>
+
+The message-driven element declares a message-driven
+bean. The declaration consists of:
+
+    - an optional description
+    - an optional display name
+    - an optional icon element that contains a small and a large
+      icon file name.
+    - a name assigned to the enterprise bean in
+      the deployment descriptor
+    - the message-driven bean's implementation class
+    - an optional declaration of the bean's messaging
+      type
+    - the message-driven bean's transaction management type
+    - an optional declaration of the bean's
+      message-destination-type
+    - an optional declaration of the bean's
+      message-destination-link
+    - an optional declaration of the message-driven bean's
+      activation configuration properties
+    - an optional declaration of the bean's environment
+      entries
+    - an optional declaration of the bean's EJB references
+    - an optional declaration of the bean's local EJB
+      references
+    - an optional declaration of the bean's web service
+      references
+    - an optional declaration of the security
+      identity to be used for the execution of the bean's
+      methods
+    - an optional declaration of the bean's
+      resource manager connection factory
+      references
+    - an optional declaration of the bean's resource
+      environment references.
+    - an optional declaration of the bean's message
+      destination references
+    - an optional declaration of deployment extensions
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="description"
+                     type="j2ee:descriptionType"
+                     minOccurs="0"/>
+        <xsd:element name="display-name"
+                     type="j2ee:display-nameType"
+                     minOccurs="0"/>
+        <xsd:element name="icon"
+                     type="j2ee:iconType"
+                     minOccurs="0"/>
+        <xsd:element name="ejb-name"
+                     type="j2ee:ejb-nameType"/>
+        <xsd:element name="ejb-class"
+                     type="j2ee:ejb-classType"/>
+        <xsd:element name="messaging-type"
+                     type="j2ee:fully-qualified-classType"
+                     minOccurs="0">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The messaging-type element specifies the message
+        listener interface of the message-driven bean. If
+        the messaging-type element is not specified, it is
+        assumed to be javax.jms.MessageListener.
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+        <xsd:element name="transaction-type"
+                     type="j2ee:transaction-typeType"/>
+        <xsd:element name="message-destination-type"
+                     type="j2ee:message-destination-typeType"
+                     minOccurs="0"/>
+        <xsd:element name="message-destination-link"
+                     type="j2ee:message-destination-linkType"
+                     minOccurs="0"/>
+        <xsd:element name="activation-config"
+                     type="j2ee:activation-configType"
+                     minOccurs="0"/>
+        <xsd:element name="env-entry"
+                     type="j2ee:env-entryType"
+                     minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="ejb-ref"
+                     type="j2ee:ejb-refType"
+                     minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="ejb-local-ref"
+                     type="j2ee:ejb-local-refType"
+                     minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="service-ref"
+                     type="j2ee:service-refType"
+                     minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="security-identity"
+                     type="j2ee:security-identityType"
+                     minOccurs="0"/>
+        <xsd:element name="resource-ref"
+                     type="j2ee:resource-refType"
+                     minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="resource-env-ref"
+                     type="j2ee:resource-env-refType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="message-destination-ref"
+                     type="j2ee:message-destination-refType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="deployment-extension"
+                     type="j2ee:deployment-extensionType"
+                     minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:simpleType name="method-intfType">
+
+<xsd:annotation>
+<xsd:documentation>
+
+The method-intf element allows a method element to
+differentiate between the methods with the same name and
+signature that are multiply defined across the home and
+component interfaces (e.g, in both an enterprise bean's
+remote and local interfaces or in both an enterprise bean's
+home and remote interfaces, etc.); the component and web
+service endpoint interfaces, and so on.
+
+The method-intf element must be one of the following:
+
+    Home
+    Remote
+    LocalHome
+    Local
+    ServiceEndpoint
+
+</xsd:documentation>
+</xsd:annotation>
+
+  <xsd:restriction base="j2ee:string">
+    <xsd:enumeration value="Home"/>
+    <xsd:enumeration value="Remote"/>
+    <xsd:enumeration value="LocalHome"/>
+    <xsd:enumeration value="Local"/>
+    <xsd:enumeration value="ServiceEndpoint"/>
+  </xsd:restriction>
+
+</xsd:simpleType>
+
+<!-- **************************************************** -->
+
+<xsd:simpleType name="method-nameType">
+<xsd:annotation>
+<xsd:documentation>
+
+The method-nameType contains a name of an enterprise
+bean method or the asterisk (*) character. The asterisk is
+used when the element denotes all the methods of an
+enterprise bean's client view interfaces.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:restriction base="j2ee:string"/>
+
+</xsd:simpleType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="method-paramsType">
+<xsd:annotation>
+<xsd:documentation>
+
+The method-paramsType defines a list of the
+fully-qualified Java type names of the method parameters.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="method-param"
+                     type="j2ee:java-typeType"
+                     minOccurs="0"
+                     maxOccurs="unbounded">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The method-param element contains a primitive
+        or a fully-qualified Java type name of a method
+        parameter.
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="method-permissionType">
+<xsd:annotation>
+<xsd:documentation>
+
+The method-permissionType specifies that one or more
+security roles are allowed to invoke one or more enterprise
+bean methods. The method-permissionType consists of an
+optional description, a list of security role names or an
+indicator to state that the method is unchecked for
+authorization, and a list of method elements.
+
+The security roles used in the method-permissionType
+must be defined in the security-role elements of the
+deployment descriptor, and the methods must be methods
+defined in the enterprise bean's home, component and/or web
+service endpoint interfaces.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="description"
+                     type="j2ee:descriptionType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:choice>
+            <xsd:element name="role-name"
+                         type="j2ee:role-nameType"
+                         maxOccurs="unbounded"/>
+            <xsd:element name="unchecked"
+                         type="j2ee:emptyType">
+            <xsd:annotation>
+            <xsd:documentation>
+
+            The unchecked element specifies that a method is
+            not checked for authorization by the container
+            prior to invocation of the method.
+
+            </xsd:documentation>
+            </xsd:annotation>
+            </xsd:element>
+        </xsd:choice>
+        <xsd:element name="method"
+                     type="j2ee:methodType"
+                     maxOccurs="unbounded"/>
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="methodType">
+<xsd:annotation>
+<xsd:documentation>
+
+The methodType is used to denote a method of an enterprise
+bean's home, component, and/or web service endpoint
+interface, or, in the case of a message-driven bean, the
+bean's message listener method, or a set of such
+methods. The ejb-name element must be the name of one of the
+enterprise beans declared in the deployment descriptor; the
+optional method-intf element allows to distinguish between a
+method with the same signature that is multiply defined
+across the home, component, and/or web service endpoint
+interfaces; the method-name element specifies the method
+name; and the optional method-params elements identify a
+single method among multiple methods with an overloaded
+method name.
+
+There are three possible styles of using methodType element
+within a method element:
+
+1.
+<method>
+    <ejb-name>EJBNAME</ejb-name>
+    <method-name>*</method-name>
+</method>
+
+   This style is used to refer to all the methods of the
+   specified enterprise bean's home, component, and/or web
+   service endpoint interfaces.
+
+2.
+<method>
+    <ejb-name>EJBNAME</ejb-name>
+    <method-name>METHOD</method-name>
+</method>>
+
+   This style is used to refer to the specified method of
+   the specified enterprise bean. If there are multiple
+   methods with the same overloaded name, the element of
+   this style refers to all the methods with the overloaded
+   name.
+
+3.
+<method>
+    <ejb-name>EJBNAME</ejb-name>
+    <method-name>METHOD</method-name>
+    <method-params>
+        <method-param>PARAM-1</method-param>
+        <method-param>PARAM-2</method-param>
+        ...
+        <method-param>PARAM-n</method-param>
+    </method-params>
+</method>
+
+   This style is used to refer to a single method within a
+   set of methods with an overloaded name. PARAM-1 through
+   PARAM-n are the fully-qualified Java types of the
+   method's input parameters (if the method has no input
+   arguments, the method-params element contains no
+   method-param elements). Arrays are specified by the
+   array element's type, followed by one or more pair of
+   square brackets (e.g. int[][]). If there are multiple
+   methods with the same overloaded name, this style refers
+   to all of the overloaded methods.
+
+Examples:
+
+Style 1: The following method element refers to all the
+methods of the EmployeeService bean's home, component,
+and/or web service endpoint interfaces:
+
+<method>
+    <ejb-name>EmployeeService</ejb-name>
+    <method-name>*</method-name>
+</method>
+
+Style 2: The following method element refers to all the
+create methods of the EmployeeService bean's home
+interface(s).
+
+<method>
+    <ejb-name>EmployeeService</ejb-name>
+    <method-name>create</method-name>
+</method>
+
+Style 3: The following method element refers to the
+create(String firstName, String LastName) method of the
+EmployeeService bean's home interface(s).
+
+<method>
+    <ejb-name>EmployeeService</ejb-name>
+    <method-name>create</method-name>
+    <method-params>
+        <method-param>java.lang.String</method-param>
+        <method-param>java.lang.String</method-param>
+    </method-params>
+</method>
+
+The following example illustrates a Style 3 element with
+more complex parameter types. The method
+foobar(char s, int i, int[] iar, mypackage.MyClass mycl,
+mypackage.MyClass[][] myclaar) would be specified as:
+
+<method>
+    <ejb-name>EmployeeService</ejb-name>
+    <method-name>foobar</method-name>
+    <method-params>
+        <method-param>char</method-param>
+        <method-param>int</method-param>
+        <method-param>int[]</method-param>
+        <method-param>mypackage.MyClass</method-param>
+        <method-param>mypackage.MyClass[][]</method-param>
+    </method-params>
+</method>
+
+The optional method-intf element can be used when it becomes
+necessary to differentiate between a method that is multiply
+defined across the enterprise bean's home, component, and/or
+web service endpoint interfaces with the same name and
+signature.
+
+For example, the method element
+
+<method>
+    <ejb-name>EmployeeService</ejb-name>
+    <method-intf>Remote</method-intf>
+    <method-name>create</method-name>
+    <method-params>
+        <method-param>java.lang.String</method-param>
+        <method-param>java.lang.String</method-param>
+    </method-params>
+</method>
+
+can be used to differentiate the create(String, String)
+method defined in the remote interface from the
+create(String, String) method defined in the remote home
+interface, which would be defined as
+
+<method>
+    <ejb-name>EmployeeService</ejb-name>
+    <method-intf>Home</method-intf>
+    <method-name>create</method-name>
+    <method-params>
+        <method-param>java.lang.String</method-param>
+        <method-param>java.lang.String</method-param>
+    </method-params>
+</method>
+
+and the create method that is defined in the local home
+interface which would be defined as
+
+<method>
+    <ejb-name>EmployeeService</ejb-name>
+    <method-intf>LocalHome</method-intf>
+    <method-name>create</method-name>
+    <method-params>
+        <method-param>java.lang.String</method-param>
+        <method-param>java.lang.String</method-param>
+    </method-params>
+</method>
+
+The method-intf element can be used with all th ree Styles
+of the method element usage. For example, the following
+method element example could be used to refer to all the
+methods of the EmployeeService bean's remote home interface.
+
+<method>
+    <ejb-name>EmployeeService</ejb-name>
+    <method-intf>Home</method-intf>
+    <method-name>*</method-name>
+</method>
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="description"
+                     type="j2ee:descriptionType"
+                     minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="ejb-name"
+                     type="j2ee:ejb-nameType"/>
+        <xsd:element name="method-intf"
+                     type="j2ee:method-intfType"
+                     minOccurs="0">
+        </xsd:element>
+        <xsd:element name="method-name"
+                     type="j2ee:method-nameType"/>
+        <xsd:element name="method-params"
+                     type="j2ee:method-paramsType"
+                     minOccurs="0"/>
+    </xsd:sequence>
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:simpleType name="multiplicityType">
+<xsd:annotation>
+<xsd:documentation>
+
+The multiplicityType describes the multiplicity of the
+role that participates in a relation.
+
+The value must be one of the two following:
+
+    One
+    Many
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:restriction base="j2ee:string">
+        <xsd:enumeration value="One"/>
+        <xsd:enumeration value="Many"/>
+    </xsd:restriction>
+
+</xsd:simpleType>
+
+<!-- **************************************************** -->
+
+<xsd:simpleType name="persistence-typeType">
+<xsd:annotation>
+<xsd:documentation>
+
+The persistence-typeType specifies an entity bean's persistence
+management type.
+
+The persistence-type element must be one of the two following:
+
+    Bean
+    Container
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:restriction base="j2ee:string">
+        <xsd:enumeration value="Bean"/>
+        <xsd:enumeration value="Container"/>
+    </xsd:restriction>
+
+</xsd:simpleType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="query-methodType">
+<xsd:annotation>
+<xsd:documentation>
+
+The query-method specifies the method for a finder or select
+query.
+
+The method-name element specifies the name of a finder or select
+method in the entity bean's implementation class.
+
+Each method-param must be defined for a query-method using the
+method-params element.
+
+It is used by the query-method element.
+
+Example:
+
+<query>
+    <description>Method finds large orders</description>
+    <query-method>
+        <method-name>findLargeOrders</method-name>
+        <method-params></method-params>
+    </query-method>
+    <ejb-ql>SELECT OBJECT(o) FROM Order o WHERE o.amount &gt; 1000</ejb-ql>
+</query>
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="method-name"
+                     type="j2ee:method-nameType"/>
+        <xsd:element name="method-params"
+                     type="j2ee:method-paramsType"/>
+        <xsd:element name="deployment-extension"
+                     type="j2ee:deployment-extensionType"
+                     minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="queryType">
+<xsd:annotation>
+<xsd:documentation>
+
+The queryType defines a finder or select
+query. It contains
+    - an optional description of the query
+    - the specification of the finder or select
+      method it is used by
+        - an optional specification of the result type
+          mapping, if the query is for a select method
+          and entity objects are returned.
+        - the EJB QL query string that defines the query.
+    - an optional declaration of deployment extensions
+
+Queries that are expressible in EJB QL must use the ejb-ql
+element to specify the query. If a query is not expressible
+in EJB QL, the description element should be used to
+describe the semantics of the query and the ejb-ql element
+should be empty.
+
+The result-type-mapping is an optional element. It can only
+be present if the query-method specifies a select method
+that returns entity objects.  The default value for the
+result-type-mapping element is "Local".
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="description"
+                     type="j2ee:descriptionType" minOccurs="0"/>
+        <xsd:element name="query-method"
+                     type="j2ee:query-methodType"/>
+        <xsd:element name="result-type-mapping"
+                     type="j2ee:result-type-mappingType"
+                     minOccurs="0"/>
+        <xsd:element name="ejb-ql"
+                     type="xsd:string"/>
+        <xsd:element name="deployment-extension"
+                     type="j2ee:deployment-extensionType"
+                     minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="relationship-role-sourceType">
+<xsd:annotation>
+<xsd:documentation>
+
+The relationship-role-sourceType designates the source of a
+role that participates in a relationship. A
+relationship-role-sourceType is used by
+relationship-role-source elements to uniquely identify an
+entity bean.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="description"
+                     type="j2ee:descriptionType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="ejb-name"
+                     type="j2ee:ejb-nameType"/>
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="relationshipsType">
+<xsd:annotation>
+<xsd:documentation>
+
+The relationshipsType describes the relationships in
+which entity beans with container-managed persistence
+participate. The relationshipsType contains an optional
+description; and a list of ejb-relation elements, which
+specify the container managed relationships.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="description"
+                     type="j2ee:descriptionType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="ejb-relation"
+                     type="j2ee:ejb-relationType"
+                     maxOccurs="unbounded">
+
+        <xsd:unique name="role-name-uniqueness">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The ejb-relationship-role-name contains the name of a
+        relationship role. The name must be unique within
+        a relationship, but can be reused in different
+        relationships.
+
+        </xsd:documentation>
+        </xsd:annotation>
+            <xsd:selector
+                xpath=".//j2ee:ejb-relationship-role-name"/>
+            <xsd:field
+                xpath="."/>
+        </xsd:unique>
+        </xsd:element>
+        <xsd:element name="deployment-extension"
+                     type="j2ee:deployment-extensionType"
+                     minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:simpleType name="result-type-mappingType">
+<xsd:annotation>
+<xsd:documentation>
+
+The result-type-mappingType is used in the query element to
+specify whether an abstract schema type returned by a query
+for a select method is to be mapped to an EJBLocalObject or
+EJBObject type.
+
+The value must be one of the following:
+
+    Local
+    Remote
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:restriction base="j2ee:string">
+        <xsd:enumeration value="Local"/>
+        <xsd:enumeration value="Remote"/>
+    </xsd:restriction>
+
+</xsd:simpleType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="security-identityType">
+<xsd:annotation>
+<xsd:documentation>
+
+The security-identityType specifies whether the caller's
+security identity is to be used for the execution of the
+methods of the enterprise bean or whether a specific run-as
+identity is to be used. It contains an optional description
+and a specification of the security identity to be used.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="description"
+                     type="j2ee:descriptionType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:choice>
+            <xsd:element name="use-caller-identity"
+                         type="j2ee:emptyType">
+            <xsd:annotation>
+            <xsd:documentation>
+
+            The use-caller-identity element specifies that
+            the caller's security identity be used as the
+            security identity for the execution of the
+            enterprise bean's methods.
+
+            </xsd:documentation>
+            </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="run-as"
+                         type="j2ee:run-asType"/>
+        </xsd:choice>
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="service-refType">
+<xsd:annotation>
+<xsd:documentation>
+
+THIS IS A PLACEHOLDER TYPE which will
+be REPLACED. It will be defined based on
+definition to be supplied by JSR109.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:simpleContent>
+        <xsd:extension base="xsd:string">
+        </xsd:extension>
+    </xsd:simpleContent>
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="session-beanType">
+<xsd:annotation>
+<xsd:documentation>
+
+The session-beanType declares an session bean. The
+declaration consists of:
+
+    - an optional description
+    - an optional display name
+    - an optional icon element that contains a small and a large
+      icon file name
+    - a name assigned to the enterprise bean
+      in the deployment description
+    - the names of the session bean's remote home and
+      remote interfaces, if any
+    - the names of the session bean's local home and
+      local interfaces, if any
+    - the name of the session bean's web service endpoint
+      interface, if any
+    - the session bean's implementation class
+    - the session bean's state management type
+    - the session bean's transaction management type
+    - an optional declaration of the bean's
+      environment entries
+    - an optional declaration of the bean's EJB references
+    - an optional declaration of the bean's local
+      EJB references
+    - an optional declaration of the bean's web
+      service references
+    - an optional declaration of the security role
+      references
+    - an optional declaration of the security identity
+      to be used for the execution of the bean's methods
+    - an optional declaration of the bean's resource
+      manager connection factory references
+    - an optional declaration of the bean's resource
+      environment references.
+    - an optional declaration of the bean's message
+      destination references
+    - an optional declaration deployment extensions
+
+The elements that are optional are "optional" in the sense
+that they are omitted when if lists represented by them are
+empty.
+
+Either both the local-home and the local elements or both
+the home and the remote elements must be specified for the
+session bean.
+
+The service-endpoint element may only be specified if the
+bean is a stateless session bean.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="description"
+                     type="j2ee:descriptionType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="display-name"
+                     type="j2ee:display-nameType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="icon"
+                     type="j2ee:iconType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="ejb-name"
+                     type="j2ee:ejb-nameType"/>
+        <xsd:element name="home"
+                     type="j2ee:homeType"
+                     minOccurs="0"/>
+        <xsd:element name="remote"
+                     type="j2ee:remoteType"
+                     minOccurs="0"/>
+        <xsd:element name="local-home"
+                     type="j2ee:local-homeType"
+                     minOccurs="0"/>
+        <xsd:element name="local"
+                     type="j2ee:localType"
+                     minOccurs="0"/>
+        <xsd:element name="service-endpoint"
+                     type="j2ee:fully-qualified-classType"
+                     minOccurs="0">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The service-endpoint element contains the
+        fully-qualified name of the enterprise bean's web
+        service endpoint interface. The service-endpoint
+        element may only be specified for a stateless
+        session bean. The specified interface must be a
+        valid JAX-RPC service endpoint interface.
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+        <xsd:element name="ejb-class"
+                     type="j2ee:ejb-classType"/>
+        <xsd:element name="session-type"
+                     type="j2ee:session-typeType"/>
+        <xsd:element name="transaction-type"
+                     type="j2ee:transaction-typeType"/>
+        <xsd:element name="env-entry"
+                     type="j2ee:env-entryType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="ejb-ref"
+                     type="j2ee:ejb-refType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="ejb-local-ref"
+                     type="j2ee:ejb-local-refType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="service-ref"
+                     type="j2ee:service-refType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="security-role-ref"
+                     type="j2ee:security-role-refType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="security-identity"
+                     type="j2ee:security-identityType"
+                     minOccurs="0"/>
+        <xsd:element name="resource-ref"
+                     type="j2ee:resource-refType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="resource-env-ref"
+                     type="j2ee:resource-env-refType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="message-destination-ref"
+                     type="j2ee:message-destination-refType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="deployment-extension"
+                     type="j2ee:deployment-extensionType"
+                     minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:simpleType name="session-typeType">
+<xsd:annotation>
+<xsd:documentation>
+
+The session-typeType describes whether the session bean is a
+stateful session or stateless session. It is used by
+session-type elements.
+
+The value must be one of the two following:
+
+    Stateful
+    Stateless
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:restriction base="j2ee:string">
+        <xsd:enumeration value="Stateful"/>
+        <xsd:enumeration value="Stateless"/>
+    </xsd:restriction>
+
+</xsd:simpleType>
+
+<!-- **************************************************** -->
+
+<xsd:simpleType name="trans-attributeType">
+<xsd:annotation>
+<xsd:documentation>
+
+The trans-attributeType specifies how the container must
+manage the transaction boundaries when delegating a method
+invocation to an enterprise bean's business method.
+
+The value must be one of the following:
+
+    NotSupported
+    Supports
+    Required
+    RequiresNew
+    Mandatory
+    Never
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:restriction base="j2ee:string">
+        <xsd:enumeration value="NotSupported"/>
+        <xsd:enumeration value="Supports"/>
+        <xsd:enumeration value="Required"/>
+        <xsd:enumeration value="RequiresNew"/>
+        <xsd:enumeration value="Mandatory"/>
+        <xsd:enumeration value="Never"/>
+    </xsd:restriction>
+
+</xsd:simpleType>
+
+<!-- **************************************************** -->
+
+<xsd:simpleType name="transaction-typeType">
+<xsd:annotation>
+<xsd:documentation>
+
+The transaction-typeType specifies an enterprise bean's
+transaction management type.
+
+The transaction-type must be one of the two following:
+
+    Bean
+    Container
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:restriction base="j2ee:string">
+        <xsd:enumeration value="Bean"/>
+        <xsd:enumeration value="Container"/>
+    </xsd:restriction>
+
+</xsd:simpleType>
+
+</xsd:schema>
+

Modified: xmlbeans/trunk/test/cases/xbean/compile/scomp/j2ee/j2ee_1_4.xsd
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/compile/scomp/j2ee/j2ee_1_4.xsd?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/compile/scomp/j2ee/j2ee_1_4.xsd&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/compile/scomp/j2ee/j2ee_1_4.xsd&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/compile/scomp/j2ee/j2ee_1_4.xsd	(original)
+++ xmlbeans/trunk/test/cases/xbean/compile/scomp/j2ee/j2ee_1_4.xsd	Wed Dec  8 08:54:26 2004
@@ -1,1406 +1,1406 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--Generated by Umit Yalcinalp March 2002-->
-<xsd:schema
-     targetNamespace="http://java.sun.com/xml/ns/j2ee"
-     xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
-     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-     elementFormDefault="qualified"
-     attributeFormDefault="unqualified"
-     version="1.4">
-<xsd:annotation>
-<xsd:documentation>
-@(#)j2ee_1_4.xsds	1.20 02/07/12
-</xsd:documentation>
-</xsd:annotation>
-
-<xsd:annotation>
-<xsd:documentation>
-
-Copyright 2002 Sun Microsystems, Inc., 901 San Antonio
-Road, Palo Alto, California 94303, U.S.A. All rights
-reserved.
-
-Sun Microsystems, Inc. has intellectual property rights
-relating to technology described in this document. In
-particular, and without limitation, these intellectual
-property rights may include one or more of the U.S. patents
-listed at http://www.sun.com/patents and one or more
-additional patents or pending patent applications in the
-U.S. and other countries.
-
-This document and the technology which it describes are
-distributed under licenses restricting their use, copying,
-distribution, and decompilation. No part of this document
-may be reproduced in any form by any means without prior
-written authorization of Sun and its licensors, if any.
-
-Third-party software, including font technology, is
-copyrighted and licensed from Sun suppliers.
-
-Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
-JavaServer Pages, Enterprise JavaBeans and the Java Coffee
-Cup logo are trademarks or registered trademarks of Sun
-Microsystems, Inc. in the U.S. and other countries.
-
-Federal Acquisitions: Commercial Software - Government Users
-Subject to Standard License Terms and Conditions.
-
-</xsd:documentation>
-</xsd:annotation>
-
-<xsd:annotation>
-<xsd:documentation>
-
-The following definitions that appear in the common
-shareable schema(s) of J2EE deployment descriptors should be
-interpreted with respect to the context they are included:
-
-Deployment Component may indicate one of the following:
-    j2ee application;
-    application client;
-    web application;
-    enterprise bean;
-    resource adapter;
-
-Deployment File may indicate one of the following:
-    ear file;
-    war file;
-    jar file;
-    rar file;
-
-</xsd:documentation>
-</xsd:annotation>
-
-<xsd:import namespace="http://www.w3.org/XML/1998/namespace"
-            schemaLocation="http://www.w3.org/2001/xml.xsd"/>
-
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="deployment-extensionType">
-<xsd:annotation>
-<xsd:documentation>
-
-The deployment-extensionType is used to indicate
-extensions to the specific Deployment Component.
-
-It is used by deployment-extension elements to designate an
-extension block that is targeted to a specific extension
-designated by a set of extension elements that are declared
-by a namespace. The namespace identifies the extension to
-the deployment tool that processes the extension.
-
-The mustUnderstand attribute is provided by the Application
-Assembler to indicate whether the extension described is an
-essential extension that must exist in the container. If
-mustUnderstand is "true", the deployment tool must indicate
-an error when processing a deployment-extension element with
-a namespace it does not understand.  Extensions that are not
-essential are declared by default as optional extensions
-that need not be provided by a container.  Applications that
-use such extensions are portable to other containers because
-deployment tools will ignore extensions that they don't
-support.
-
-The type of the extension-element is abstract. Therefore, a
-concrete type must be specified by the deployment descriptor
-using xsi:type attribute for each extension-element.
-
-The value of the mustUnderstand attribute is "false"
-by default.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-    <xsd:element name="extension-element"
-                 type="j2ee:extensibleType"
-                 maxOccurs="unbounded"/>
-    </xsd:sequence>
-
-    <xsd:attribute name="namespace"
-                   use="required"
-                   type="xsd:anyURI"/>
-    <xsd:attribute name="mustUnderstand"
-                   type="xsd:boolean"/>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="descriptionType">
-<xsd:annotation>
-<xsd:documentation>
-
-The description type is used by a description element to
-provide text describing the parent element.  The elements
-that use this type should include any information that the
-Deployment Component's Deployment File file producer wants
-to provide to the consumer of the Deployment Component's
-Deployment File (i.e., to the Deployer). Typically, the
-tools used by such a Deployment File consumer will display
-the description when processing the parent element that
-contains the description.
-
-The lang attribute defines the language that the
-description is provided in. The default value is "en" (English).
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:simpleContent>
-        <xsd:extension base="xsd:string">
-        <xsd:attribute ref="xml:lang"/>
-        </xsd:extension>
-    </xsd:simpleContent>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:simpleType name="dewey-versionType">
-<xsd:annotation>
-<xsd:documentation>
-
-This type defines a dewey decimal which is used
-to describe versions of documents.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:restriction base="xsd:decimal">
-        <xsd:whiteSpace value="collapse"/>
-    </xsd:restriction>
-
-</xsd:simpleType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="display-nameType">
-<xsd:annotation>
-<xsd:documentation>
-
-The display-name type contains a short name that is intended
-to be displayed by tools. It is used by display-name
-elements.  The display name need not be unique.
-
-Example:
-
-...
-   <display-name xml:lang="en">Employee Self Service</display-name>
-
-The value of the xml:lang attribute is "en" (English) by default.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:simpleContent>
-        <xsd:extension base="j2ee:string">
-        <xsd:attribute ref="xml:lang"/>
-        </xsd:extension>
-    </xsd:simpleContent>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:simpleType name="ejb-linkType">
-<xsd:annotation>
-<xsd:documentation>
-
-The ejb-linkType is used by ejb-link
-elements in the ejb-ref or ejb-local-ref elements to specify
-that an EJB reference is linked to enterprise bean.
-
-The value of the ejb-link element must be the ejb-name of an
-enterprise bean in the same ejb-jar file or in another ejb-jar
-file in the same J2EE application unit.
-
-Alternatively, the name in the ejb-link element may be composed of a
-path name specifying the ejb-jar containing the referenced enterprise
-bean with the ejb-name of the target bean appended and separated from
-the path name by "#".  The path name is relative to the Deployment File
-containing Deployment Component that is referencing the enterprise bean.
-This allows multiple enterprise beans with the same ejb-name to be
-uniquely identified.
-
-Examples:
-
-    <ejb-link>EmployeeRecord</ejb-link>
-
-    <ejb-link>../products/product.jar#ProductEJB</ejb-link>
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:restriction base="j2ee:string"/>
-
-</xsd:simpleType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="ejb-local-refType">
-<xsd:annotation>
-<xsd:documentation>
-
-The ejb-local-refType is used by ejb-local-ref elements for
-the declaration of a reference to an enterprise bean's local
-home. The declaration consists of:
-
-    - an optional description
-    - the EJB reference name used in the code of the Deployment
-      Component that's referencing the enterprise bean
-    - the expected type of the referenced enterprise bean
-    - the expected local home and local interfaces of the
-      referenced enterprise bean
-    - optional ejb-link information, used to specify the
-      referenced enterprise bean
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="description"
-                     type="j2ee:descriptionType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="ejb-ref-name"
-                     type="j2ee:ejb-ref-nameType"/>
-        <xsd:element name="ejb-ref-type"
-                     type="j2ee:ejb-ref-typeType"/>
-        <xsd:element name="local-home"
-                     type="j2ee:local-homeType"/>
-        <xsd:element name="local"
-                     type="j2ee:localType"/>
-        <xsd:element name="ejb-link"
-                     type="j2ee:ejb-linkType"
-                     minOccurs="0"/>
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:simpleType name="ejb-ref-nameType">
-<xsd:annotation>
-<xsd:documentation>
-
-The ejb-ref-name element contains the name of an EJB
-reference. The EJB reference is an entry in the
-Deployment Component's environment and is relative to the
-java:comp/env context.  The name must be unique within the
-Deployment Component.
-
-It is recommended that name is prefixed with "ejb/".
-
-Example:
-
-<ejb-ref-name>ejb/Payroll</ejb-ref-name>
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:restriction base="j2ee:jndi-nameType"/>
-
-</xsd:simpleType>
-
-<!-- **************************************************** -->
-
-<xsd:simpleType name="ejb-ref-typeType">
-<xsd:annotation>
-<xsd:documentation>
-
-The ejb-ref-typeType contains the expected type of the
-referenced enterprise bean.
-
-The ejb-ref-type designates a value
-that must be one of the following:
-
-    Entity
-    Session
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:restriction base="j2ee:string">
-        <xsd:enumeration value="Entity"/>
-        <xsd:enumeration value="Session"/>
-    </xsd:restriction>
-
-</xsd:simpleType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="ejb-refType">
-<xsd:annotation>
-<xsd:documentation>
-
-The ejb-refType is used by ejb-ref elements for the
-declaration of a reference to an enterprise bean's home. The
-declaration consists of:
-
-    - an optional description
-    - the EJB reference name used in the code of
-      the Deployment Component that's referencing the enterprise
-      bean
-    - the expected type of the referenced enterprise bean
-    - the expected home and remote interfaces of the referenced
-      enterprise bean
-    - optional ejb-link information, used to specify the
-      referenced enterprise bean
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="description"
-                     type="j2ee:descriptionType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="ejb-ref-name"
-                     type="j2ee:ejb-ref-nameType"/>
-        <xsd:element name="ejb-ref-type"
-                     type="j2ee:ejb-ref-typeType"/>
-
-        <xsd:element name="home"
-                     type="j2ee:homeType"/>
-        <xsd:element name="remote"
-                     type="j2ee:remoteType"/>
-        <xsd:element name="ejb-link"
-                     type="j2ee:ejb-linkType"
-                     minOccurs="0"/>
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="emptyType">
-<xsd:annotation>
-<xsd:documentation>
-
-This type is used to designate an empty
-element when used.
-
-</xsd:documentation>
-</xsd:annotation>
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:simpleType name="env-entry-type-valuesType">
-<xsd:annotation>
-<xsd:documentation>
-
-This type contains the fully-qualified Java type of the
-environment entry value that is expected by the
-application's code.
-
-The following are the legal values of env-entry-type-valuesType:
-
-    java.lang.Boolean
-    java.lang.Byte
-    java.lang.Character
-    java.lang.String
-    java.lang.Short
-    java.lang.Integer
-    java.lang.Long
-    java.lang.Float
-    java.lang.Double
-
-Example:
-
-<env-entry-type>java.lang.Boolean</env-entry-type>
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:restriction base="j2ee:string">
-        <xsd:enumeration value="java.lang.Boolean"/>
-        <xsd:enumeration value="java.lang.Byte"/>
-        <xsd:enumeration value="java.lang.Character"/>
-        <xsd:enumeration value="java.lang.String"/>
-        <xsd:enumeration value="java.lang.Short"/>
-        <xsd:enumeration value="java.lang.Integer"/>
-        <xsd:enumeration value="java.lang.Long"/>
-        <xsd:enumeration value="java.lang.Float"/>
-        <xsd:enumeration value="java.lang.Double"/>
-    </xsd:restriction>
-
-</xsd:simpleType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="env-entryType">
-<xsd:annotation>
-<xsd:documentation>
-
-The env-entryType is used to declare an application's
-environment entry. The declaration consists of an optional
-description, the name of the environment entry, and an
-optional value.  If a value is not specified, one must be
-supplied during deployment.
-
-It is used by env-entry elements.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="description"
-                     type="j2ee:descriptionType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="env-entry-name"
-                     type="j2ee:jndi-nameType">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The env-entry-name element contains the name of a
-        Deployment Component's environment entry.  The name
-        is a JNDI name relative to the java:comp/env
-        context.  The name must be unique within a
-        Deployment Component. The uniqueness
-        constraints must be defined within the declared
-        context.
-
-        Example:
-
-        <env-entry-name>minAmount</env-entry-name>
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-
-        <xsd:element name="env-entry-type"
-                     type="j2ee:env-entry-type-valuesType"/>
-
-        <xsd:element name="env-entry-value"
-                     type="xsd:string"
-                     minOccurs="0">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The env-entry-value designates the value of a
-        Deployment Component's environment entry. The value
-        must be a String that is valid for the
-        constructor of the specified type that takes a
-        single String parameter, or for java.lang.Character,
-        a single character.
-
-        Example:
-
-        <env-entry-value>100.00</env-entry-value>
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-
-    </xsd:sequence>
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="extensibleType" abstract="true">
-<xsd:annotation>
-<xsd:documentation>
-
-The extensibleType is an abstract base type which is used to
-define the type of extension-elements. Instance documents
-must substitute a known type to define the extension by
-using xsi:type attribute to define the actual type of
-extension-elements.
-
-</xsd:documentation>
-</xsd:annotation>
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:simpleType name="fully-qualified-classType">
-<xsd:annotation>
-<xsd:documentation>
-
-The elements that use this type designate the name of a
-Java class or interface.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:restriction base="j2ee:string"/>
-
-</xsd:simpleType>
-
-<!-- **************************************************** -->
-
-<xsd:simpleType name="generic-booleanType">
-<xsd:annotation>
-<xsd:documentation>
-
-This type defines four different values which can designate
-boolean values. This includes values yes and no which are
-not designated by xsd:boolean
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:restriction base="j2ee:string">
-        <xsd:enumeration value="true"/>
-        <xsd:enumeration value="false"/>
-        <xsd:enumeration value="yes"/>
-        <xsd:enumeration value="no"/>
-    </xsd:restriction>
-
-</xsd:simpleType>
-
-<!-- **************************************************** -->
-
-<xsd:simpleType name="homeType">
-<xsd:annotation>
-<xsd:documentation>
-
-The homeType defines the fully-qualified name of
-an enterprise bean's home interface.
-
-Example:
-
-    <home>com.aardvark.payroll.PayrollHome</home>
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:restriction base="j2ee:fully-qualified-classType"/>
-
-</xsd:simpleType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="iconType">
-<xsd:annotation>
-<xsd:documentation>
-
-The icon type contains small-icon and large-icon elements
-that specify the file names for small and large GIF or
-JPEG icon images used to represent the parent element in a
-GUI tool.
-
-The xml:lang attribute defines the language that the
-icon file names are provided in. Its value is "en" (English)
-by default.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="small-icon" type="j2ee:pathType"
-             minOccurs="0">
-        <xsd:annotation>
-        <xsd:documentation>
-        The small-icon element contains the name of a file
-        containing a small (16 x 16) icon image. The file
-        name is a relative path within the Deployment
-        Component's Deployment File.
-
-        The image may be either in the JPEG or GIF format.
-        The icon can be used by tools.
-
-        Example:
-
-        <small-icon>employee-service-icon16x16.jpg</small-icon>
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="large-icon" type="j2ee:pathType"
-             minOccurs="0">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The large-icon element contains the name of a file
-        containing a large
-        (32 x 32) icon image. The file name is a relative
-        path within the Deployment Component's Deployment
-        File.
-
-        The image may be either in the JPEG or GIF format.
-        The icon can be used by tools.
-
-        Example:
-
-        <large-icon>employee-service-icon32x32.jpg</large-icon>
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-
-    </xsd:sequence>
-
-    <xsd:attribute ref="xml:lang"/>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:simpleType name="java-identifierType">
-<xsd:annotation>
-<xsd:documentation>
-
-The java-identifierType defines a Java identifier.
-The users of this type should further verify that
-the content does not contain Java reserved keywords.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:restriction base="j2ee:string">
-        <xsd:pattern value="($|_|\p{L})(\p{L}|\p{Nd}|_|$)*"/>
-    </xsd:restriction>
-
-</xsd:simpleType>
-
-<!-- **************************************************** -->
-
-<xsd:simpleType name="jndi-nameType">
-<xsd:annotation>
-<xsd:documentation>
-
-The jndi-nameType type designates a JNDI name in the
-Deployment Component's environment and is relative to the
-java:comp/env context.  A JNDI name must be unique within the
-Deployment Component.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:restriction base="j2ee:string"/>
-
-</xsd:simpleType>
-
-<!-- **************************************************** -->
-
-<xsd:simpleType name="local-homeType">
-<xsd:annotation>
-<xsd:documentation>
-
-The local-homeType defines the fully-qualified
-name of an enterprise bean's local home interface.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:restriction base="j2ee:fully-qualified-classType"/>
-
-</xsd:simpleType>
-
-<!-- **************************************************** -->
-
-<xsd:simpleType name="localType">
-<xsd:annotation>
-<xsd:documentation>
-
-The localType defines the fully-qualified name of an
-enterprise bean's local interface.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:restriction base="j2ee:fully-qualified-classType"/>
-
-</xsd:simpleType>
-
-<!-- **************************************************** -->
-
-<xsd:simpleType name="message-destination-linkType">
-<xsd:annotation>
-<xsd:documentation>
-
-The message-destination-linkType is used to link a message
-destination reference or message-driven bean to a message
-destination.
-
-The Assembler sets the value to reflect the flow of messages
-between producers and consumers in the application.
-
-The value must be the message-destination-name of a message
-destination in the same Deployment File or in another
-Deployment File in the same J2EE application unit.
-
-Alternatively, the value may be composed of a path name
-specifying a Deployment File containing the referenced
-message destination with the message-destination-name of the
-destination appended and separated from the path name by
-"#". The path name is relative to the Deployment File
-containing Deployment Component that is referencing the
-message destination.  This allows multiple message
-destinations with the same name to be uniquely identified.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:restriction base="j2ee:fully-qualified-classType"/>
-
-</xsd:simpleType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="message-destination-refType">
-<xsd:annotation>
-<xsd:documentation>
-
-The message-destination-ref element contains a declaration
-of Deployment Component's reference to a message destination
-associated with a resource in Deployment Component's
-environment. It consists of:
-
-        - an optional description
-        - the message destination reference name
-        - the message destination type
-        - a specification as to whether the
-          destination is used for
-          consuming or producing messages, or both
-        - a link to the message destination
-
-Examples:
-
-<message-destination-ref>
-        <message-destination-ref-name>jms/StockQueue
-        </message-destination-ref-name>
-        <message-destination-type>javax.jms.Queue
-        </message-destination-type>
-        <message-destination-usage>Consumes
-        </message-destination-usage>
-        <message-destination-link>CorporateStocks
-        </message-destination-link>
-</message-destination-ref>
-
-</xsd:documentation>
-</xsd:annotation>
-    <xsd:sequence>
-        <xsd:element name="description"
-                     type="j2ee:descriptionType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="message-destination-ref-name"
-                     type="j2ee:jndi-nameType">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The message-destination-ref-name element specifies
-        the name of a message destination reference; its
-        value is the environment entry name used in
-        Deployment Component code.  The name is a JNDI name
-        relative to the java:comp/env context and must be
-        unique within an ejb-jar (for enterprise beans) or a
-        Deployment File (for others).
-        %%%
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="message-destination-type"
-                     type="j2ee:message-destination-typeType"/>
-        <xsd:element name="message-destination-usage"
-                     type="j2ee:message-destination-usageType"/>
-        <xsd:element name="message-destination-link"
-                     type="j2ee:message-destination-linkType"
-                     minOccurs="0"/>
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:simpleType name="message-destination-typeType">
-<xsd:annotation>
-<xsd:documentation>
-
-The message-destination-typeType specifies the type of
-the destination. The type is specified by the Java interface
-expected to be implemented by the destination.
-
-Example:
-
- <message-destination-type>javax.jms.Queue
- </message-destination-type>
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:restriction base="j2ee:fully-qualified-classType"/>
-
-</xsd:simpleType>
-
-<!-- **************************************************** -->
-
-<xsd:simpleType name="message-destination-usageType">
-<xsd:annotation>
-<xsd:documentation>
-
-The message-destination-usageType specifies the use of the
-message destination indicated by the reference.  The value
-indicates whether messages are consumed from the message
-destination, produced for the destination, or both.  The
-Assembler makes use of this information in linking producers
-of a destination with its consumers.
-
-The value of the message-destination-usage element must be
-one of the following:
-    Consumes
-    Produces
-    ConsumesProduces
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:restriction base="j2ee:string">
-        <xsd:enumeration value="Consumes"/>
-        <xsd:enumeration value="Produces"/>
-        <xsd:enumeration value="ConsumesProduces"/>
-    </xsd:restriction>
-
-</xsd:simpleType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="message-destinationType">
-<xsd:annotation>
-<xsd:documentation>
-
-The message-destinationType specifies a message
-destination. The logical destination described by this
-element is mapped to a physical destination by the Deployer.
-
-The message destination element contains:
-
-        - an optional description
-        - an optional display-name
-        - an optional icon
-        - a message destination name which must be unique
-          among message destination names within the same
-          Deployment File.
-
-Example:
-
-<message-destination>
-        <message-destination-name>CorporateStocks
-        </message-destination-name>
-</message-destination>
-
-</xsd:documentation>
-</xsd:annotation>
-    <xsd:sequence>
-        <xsd:element name="description"
-                     type="j2ee:descriptionType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="display-name"
-                     type="j2ee:display-nameType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="icon"
-                     type="j2ee:iconType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="message-destination-name"
-                     type="j2ee:string">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The message-destination-name element specifies a
-        name for a message destination.  This name must be
-        unique among the names of message destinations
-        within the Deployment File.
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-
-    </xsd:sequence>
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="param-valueType">
-<xsd:annotation>
-<xsd:documentation>
-
-This type is a general type that can be used to declare
-parameter/value lists.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="description"
-             type="j2ee:descriptionType"
-             minOccurs="0"
-             maxOccurs="unbounded"/>
-        <xsd:element name="param-name"
-             type="j2ee:string">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The param-name element contains the name of a
-        parameter.
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-
-        <xsd:element name="param-value"
-             type="xsd:string">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The param-value element contains the value of a
-        parameter.
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:simpleType name="pathType">
-<xsd:annotation>
-<xsd:documentation>
-
-The elements that use this type designate either a relative
-path or an absolute path starting with a "/".
-
-In elements that specify a pathname to a file within the
-same Deployment File, relative filenames (i.e., those not
-starting with "/") are considered relative to the root of
-the Deployment File's namespace.  Absolute filenames (i.e.,
-those starting with "/") also specify names in the root of
-the Deployment File's namespace.  In general, relative names
-are preferred.  The exception is .war files where absolute
-names are preferred for consistency with the Servlet API.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:restriction base="j2ee:string"/>
-
-</xsd:simpleType>
-
-<!-- **************************************************** -->
-
-<xsd:simpleType name="remoteType">
-<xsd:annotation>
-<xsd:documentation>
-
-The remote element contains the fully-qualified name
-of the enterprise bean's remote interface.
-
-Example:
-
-    <remote>com.wombat.empl.EmployeeService</remote>
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:restriction base="j2ee:fully-qualified-classType"/>
-
-</xsd:simpleType>
-
-<!-- **************************************************** -->
-
-<xsd:simpleType name="res-authType">
-<xsd:annotation>
-<xsd:documentation>
-
-The res-authType specifies whether the Deployment Component
-code signs on programmatically to the resource manager, or
-whether the Container will sign on to the resource manager
-on behalf of the Deployment Component. In the latter case,
-the Container uses information that is supplied by the
-Deployer.
-
-The value must be one of the two following:
-
-    Application
-    Container
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:restriction base="j2ee:string">
-        <xsd:enumeration value="Application"/>
-        <xsd:enumeration value="Container"/>
-    </xsd:restriction>
-
-</xsd:simpleType>
-
-<!-- **************************************************** -->
-
-<xsd:simpleType name="res-sharing-scopeType">
-<xsd:annotation>
-<xsd:documentation>
-
-The res-sharing-scope type specifies whether connections
-obtained through the given resource manager connection
-factory reference can be shared. The value, if specified,
-must be one of the two following:
-
-    Shareable
-    Unshareable
-
-The default value is Shareable.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:restriction base="j2ee:string">
-        <xsd:enumeration value="Shareable"/>
-        <xsd:enumeration value="Unshareable"/>
-    </xsd:restriction>
-
-</xsd:simpleType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="resource-env-refType">
-<xsd:annotation>
-<xsd:documentation>
-
-The resource-env-refType is used to define
-resource-env-type elements.  It contains a declaration of a
-Deployment Component's reference to an administered object
-associated with a resource in the Deployment Component's
-environment.  It consists of an optional description, the
-resource environment reference name, and an indication of
-the resource environment reference type expected by the
-Deployment Component code.
-
-Example:
-
-<resource-env-ref>
-    <resource-env-ref-name>jms/StockQueue
-    </resource-env-ref-name>
-    <resource-env-ref-type>javax.jms.Queue
-    </resource-env-ref-type>
-</resource-env-ref>
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="description"
-                     type="j2ee:descriptionType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="resource-env-ref-name"
-                     type="j2ee:jndi-nameType">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The resource-env-ref-name element specifies the name
-        of a resource environment reference; its value is
-        the environment entry name used in
-        the Deployment Component code.  The name is a JNDI
-        name relative to the java:comp/env context and must
-        be unique within a Deployment Component.
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-
-        <xsd:element name="resource-env-ref-type"
-                     type="j2ee:fully-qualified-classType">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The resource-env-ref-type element specifies the type
-        of a resource environment reference.  It is the
-        fully qualified name of a Java language class or
-        interface.
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="resource-refType">
-<xsd:annotation>
-<xsd:documentation>
-
-The resource-refType contains a declaration of a
-Deployment Component's reference to an external resource. It
-consists of an optional description, the resource manager
-connection factory reference name, the indication of the
-resource manager connection factory type expected by the
-Deployment Component code, the type of authentication
-(Application or Container), and an optional specification of
-the shareability of connections obtained from the resource
-(Shareable or Unshareable).
-
-Example:
-
-<resource-ref>
-    <res-ref-name>jdbc/EmployeeAppDB</res-ref-name>
-    <res-type>javax.sql.DataSource</res-type>
-    <res-auth>Container</res-auth>
-    <res-sharing-scope>Shareable</res-sharing-scope>
-</resource-ref>
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="description"
-                     type="j2ee:descriptionType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="res-ref-name"
-                     type="j2ee:jndi-nameType">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The res-ref-name element specifies the name of a
-        resource manager connection factory reference.
-        The name is a JNDI name relative to the
-        java:comp/env context.
-        The name must be unique within a Deployment File.
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-
-        <xsd:element name="res-type"
-                     type="j2ee:fully-qualified-classType">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The res-type element specifies the type of the data
-        source. The type is specified by the fully qualified
-        Java language class or interface
-        expected to be implemented by the data source.
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-
-        <xsd:element name="res-auth"
-                     type="j2ee:res-authType"/>
-
-        <xsd:element name="res-sharing-scope"
-                     type="j2ee:res-sharing-scopeType"
-                     minOccurs="0"/>
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:simpleType name="role-nameType">
-<xsd:annotation>
-<xsd:documentation>
-
-The role-nameType designates the name of a security role.
-
-The name must conform to the lexical rules for an NMTOKEN.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:restriction base="xsd:NMTOKEN"/>
-
-</xsd:simpleType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="run-asType">
-<xsd:annotation>
-<xsd:documentation>
-
-The run-asType specifies the run-as identity to be
-used for the execution of a component. It contains an
-optional description, and the name of a security role.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="description"
-                     type="j2ee:descriptionType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="role-name"
-                     type="j2ee:role-nameType"/>
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="security-role-refType">
-<xsd:annotation>
-<xsd:documentation>
-
-The security-role-refType contains the declaration of a
-security role reference in a component's or a
-Deployment Component's code. The declaration consists of an
-optional description, the security role name used in the
-code, and an optional link to a security role. If the
-security role is not specified, the Deployer must choose an
-appropriate security role.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="description"
-                     type="j2ee:descriptionType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="role-name"
-                     type="j2ee:role-nameType">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The value of the role-name element must be the String used
-        as the parameter to the
-        EJBContext.isCallerInRole(String roleName) method or the
-        HttpServletRequest.isUserInRole(String role) method.
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-
-        <xsd:element name="role-link"
-                     type="j2ee:role-nameType"
-                     minOccurs="0">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The role-link element is a reference to a defined
-        security role. The role-link element must contain
-        the name of one of the security roles defined in the
-        security-role elements.
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="security-roleType">
-<xsd:annotation>
-<xsd:documentation>
-
-The security-roleType contains the definition of a security
-role. The definition consists of an optional description of the
-security role, and the security role name.
-
-Example:
-
-    <security-role>
-    <description>
-        This role includes all employees who are authorized
-        to access the employee service application.
-    </description>
-    <role-name>employee</role-name>
-    </security-role>
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="description"
-                     type="j2ee:descriptionType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="role-name"
-                     type="j2ee:role-nameType"/>
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:simpleType name="string">
-<xsd:annotation>
-<xsd:documentation>
-
-This is a special string datatype that is defined by J2EE as
-a base type for defining collapsed strings. When schemas
-require trailing/leading space elimination as well as
-collapsing the existing whitespace, this base type may be
-used.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:restriction base="xsd:string">
-        <xsd:whiteSpace value="collapse"/>
-    </xsd:restriction>
-
-</xsd:simpleType>
-
-<!-- **************************************************** -->
-
-<xsd:simpleType name="true-falseType">
-<xsd:annotation>
-<xsd:documentation>
-
-This simple type designates a boolean with only two
-permissible values
-
-- true
-- false
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:restriction base="xsd:boolean">
-        <xsd:pattern value="(true|false)"/>
-    </xsd:restriction>
-</xsd:simpleType>
-
-<!-- **************************************************** -->
-
-<xsd:simpleType name="url-patternType">
-<xsd:annotation>
-<xsd:documentation>
-
-The url-patternType contains the url pattern of the mapping. It must
-follow the rules specified in Section 11.2 of the Servlet API
-Specification.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:restriction base="j2ee:string"/>
-
-</xsd:simpleType>
-
-<!-- **************************************************** -->
-
-<xsd:simpleType name="war-pathType">
-<xsd:annotation>
-<xsd:documentation>
-
-The elements that use this type designate a path starting
-with a "/" and interpreted relative to the root of a WAR
-file.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:restriction base="j2ee:string">
-        <xsd:pattern value="/.*"/>
-    </xsd:restriction>
-
-</xsd:simpleType>
-
-</xsd:schema>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Generated by Umit Yalcinalp March 2002-->
+<xsd:schema
+     targetNamespace="http://java.sun.com/xml/ns/j2ee"
+     xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
+     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+     elementFormDefault="qualified"
+     attributeFormDefault="unqualified"
+     version="1.4">
+<xsd:annotation>
+<xsd:documentation>
+@(#)j2ee_1_4.xsds	1.20 02/07/12
+</xsd:documentation>
+</xsd:annotation>
+
+<xsd:annotation>
+<xsd:documentation>
+
+Copyright 2002 Sun Microsystems, Inc., 901 San Antonio
+Road, Palo Alto, California 94303, U.S.A. All rights
+reserved.
+
+Sun Microsystems, Inc. has intellectual property rights
+relating to technology described in this document. In
+particular, and without limitation, these intellectual
+property rights may include one or more of the U.S. patents
+listed at http://www.sun.com/patents and one or more
+additional patents or pending patent applications in the
+U.S. and other countries.
+
+This document and the technology which it describes are
+distributed under licenses restricting their use, copying,
+distribution, and decompilation. No part of this document
+may be reproduced in any form by any means without prior
+written authorization of Sun and its licensors, if any.
+
+Third-party software, including font technology, is
+copyrighted and licensed from Sun suppliers.
+
+Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
+JavaServer Pages, Enterprise JavaBeans and the Java Coffee
+Cup logo are trademarks or registered trademarks of Sun
+Microsystems, Inc. in the U.S. and other countries.
+
+Federal Acquisitions: Commercial Software - Government Users
+Subject to Standard License Terms and Conditions.
+
+</xsd:documentation>
+</xsd:annotation>
+
+<xsd:annotation>
+<xsd:documentation>
+
+The following definitions that appear in the common
+shareable schema(s) of J2EE deployment descriptors should be
+interpreted with respect to the context they are included:
+
+Deployment Component may indicate one of the following:
+    j2ee application;
+    application client;
+    web application;
+    enterprise bean;
+    resource adapter;
+
+Deployment File may indicate one of the following:
+    ear file;
+    war file;
+    jar file;
+    rar file;
+
+</xsd:documentation>
+</xsd:annotation>
+
+<xsd:import namespace="http://www.w3.org/XML/1998/namespace"
+            schemaLocation="http://www.w3.org/2001/xml.xsd"/>
+
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="deployment-extensionType">
+<xsd:annotation>
+<xsd:documentation>
+
+The deployment-extensionType is used to indicate
+extensions to the specific Deployment Component.
+
+It is used by deployment-extension elements to designate an
+extension block that is targeted to a specific extension
+designated by a set of extension elements that are declared
+by a namespace. The namespace identifies the extension to
+the deployment tool that processes the extension.
+
+The mustUnderstand attribute is provided by the Application
+Assembler to indicate whether the extension described is an
+essential extension that must exist in the container. If
+mustUnderstand is "true", the deployment tool must indicate
+an error when processing a deployment-extension element with
+a namespace it does not understand.  Extensions that are not
+essential are declared by default as optional extensions
+that need not be provided by a container.  Applications that
+use such extensions are portable to other containers because
+deployment tools will ignore extensions that they don't
+support.
+
+The type of the extension-element is abstract. Therefore, a
+concrete type must be specified by the deployment descriptor
+using xsi:type attribute for each extension-element.
+
+The value of the mustUnderstand attribute is "false"
+by default.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+    <xsd:element name="extension-element"
+                 type="j2ee:extensibleType"
+                 maxOccurs="unbounded"/>
+    </xsd:sequence>
+
+    <xsd:attribute name="namespace"
+                   use="required"
+                   type="xsd:anyURI"/>
+    <xsd:attribute name="mustUnderstand"
+                   type="xsd:boolean"/>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="descriptionType">
+<xsd:annotation>
+<xsd:documentation>
+
+The description type is used by a description element to
+provide text describing the parent element.  The elements
+that use this type should include any information that the
+Deployment Component's Deployment File file producer wants
+to provide to the consumer of the Deployment Component's
+Deployment File (i.e., to the Deployer). Typically, the
+tools used by such a Deployment File consumer will display
+the description when processing the parent element that
+contains the description.
+
+The lang attribute defines the language that the
+description is provided in. The default value is "en" (English).
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:simpleContent>
+        <xsd:extension base="xsd:string">
+        <xsd:attribute ref="xml:lang"/>
+        </xsd:extension>
+    </xsd:simpleContent>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:simpleType name="dewey-versionType">
+<xsd:annotation>
+<xsd:documentation>
+
+This type defines a dewey decimal which is used
+to describe versions of documents.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:restriction base="xsd:decimal">
+        <xsd:whiteSpace value="collapse"/>
+    </xsd:restriction>
+
+</xsd:simpleType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="display-nameType">
+<xsd:annotation>
+<xsd:documentation>
+
+The display-name type contains a short name that is intended
+to be displayed by tools. It is used by display-name
+elements.  The display name need not be unique.
+
+Example:
+
+...
+   <display-name xml:lang="en">Employee Self Service</display-name>
+
+The value of the xml:lang attribute is "en" (English) by default.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:simpleContent>
+        <xsd:extension base="j2ee:string">
+        <xsd:attribute ref="xml:lang"/>
+        </xsd:extension>
+    </xsd:simpleContent>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:simpleType name="ejb-linkType">
+<xsd:annotation>
+<xsd:documentation>
+
+The ejb-linkType is used by ejb-link
+elements in the ejb-ref or ejb-local-ref elements to specify
+that an EJB reference is linked to enterprise bean.
+
+The value of the ejb-link element must be the ejb-name of an
+enterprise bean in the same ejb-jar file or in another ejb-jar
+file in the same J2EE application unit.
+
+Alternatively, the name in the ejb-link element may be composed of a
+path name specifying the ejb-jar containing the referenced enterprise
+bean with the ejb-name of the target bean appended and separated from
+the path name by "#".  The path name is relative to the Deployment File
+containing Deployment Component that is referencing the enterprise bean.
+This allows multiple enterprise beans with the same ejb-name to be
+uniquely identified.
+
+Examples:
+
+    <ejb-link>EmployeeRecord</ejb-link>
+
+    <ejb-link>../products/product.jar#ProductEJB</ejb-link>
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:restriction base="j2ee:string"/>
+
+</xsd:simpleType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="ejb-local-refType">
+<xsd:annotation>
+<xsd:documentation>
+
+The ejb-local-refType is used by ejb-local-ref elements for
+the declaration of a reference to an enterprise bean's local
+home. The declaration consists of:
+
+    - an optional description
+    - the EJB reference name used in the code of the Deployment
+      Component that's referencing the enterprise bean
+    - the expected type of the referenced enterprise bean
+    - the expected local home and local interfaces of the
+      referenced enterprise bean
+    - optional ejb-link information, used to specify the
+      referenced enterprise bean
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="description"
+                     type="j2ee:descriptionType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="ejb-ref-name"
+                     type="j2ee:ejb-ref-nameType"/>
+        <xsd:element name="ejb-ref-type"
+                     type="j2ee:ejb-ref-typeType"/>
+        <xsd:element name="local-home"
+                     type="j2ee:local-homeType"/>
+        <xsd:element name="local"
+                     type="j2ee:localType"/>
+        <xsd:element name="ejb-link"
+                     type="j2ee:ejb-linkType"
+                     minOccurs="0"/>
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:simpleType name="ejb-ref-nameType">
+<xsd:annotation>
+<xsd:documentation>
+
+The ejb-ref-name element contains the name of an EJB
+reference. The EJB reference is an entry in the
+Deployment Component's environment and is relative to the
+java:comp/env context.  The name must be unique within the
+Deployment Component.
+
+It is recommended that name is prefixed with "ejb/".
+
+Example:
+
+<ejb-ref-name>ejb/Payroll</ejb-ref-name>
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:restriction base="j2ee:jndi-nameType"/>
+
+</xsd:simpleType>
+
+<!-- **************************************************** -->
+
+<xsd:simpleType name="ejb-ref-typeType">
+<xsd:annotation>
+<xsd:documentation>
+
+The ejb-ref-typeType contains the expected type of the
+referenced enterprise bean.
+
+The ejb-ref-type designates a value
+that must be one of the following:
+
+    Entity
+    Session
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:restriction base="j2ee:string">
+        <xsd:enumeration value="Entity"/>
+        <xsd:enumeration value="Session"/>
+    </xsd:restriction>
+
+</xsd:simpleType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="ejb-refType">
+<xsd:annotation>
+<xsd:documentation>
+
+The ejb-refType is used by ejb-ref elements for the
+declaration of a reference to an enterprise bean's home. The
+declaration consists of:
+
+    - an optional description
+    - the EJB reference name used in the code of
+      the Deployment Component that's referencing the enterprise
+      bean
+    - the expected type of the referenced enterprise bean
+    - the expected home and remote interfaces of the referenced
+      enterprise bean
+    - optional ejb-link information, used to specify the
+      referenced enterprise bean
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="description"
+                     type="j2ee:descriptionType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="ejb-ref-name"
+                     type="j2ee:ejb-ref-nameType"/>
+        <xsd:element name="ejb-ref-type"
+                     type="j2ee:ejb-ref-typeType"/>
+
+        <xsd:element name="home"
+                     type="j2ee:homeType"/>
+        <xsd:element name="remote"
+                     type="j2ee:remoteType"/>
+        <xsd:element name="ejb-link"
+                     type="j2ee:ejb-linkType"
+                     minOccurs="0"/>
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="emptyType">
+<xsd:annotation>
+<xsd:documentation>
+
+This type is used to designate an empty
+element when used.
+
+</xsd:documentation>
+</xsd:annotation>
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:simpleType name="env-entry-type-valuesType">
+<xsd:annotation>
+<xsd:documentation>
+
+This type contains the fully-qualified Java type of the
+environment entry value that is expected by the
+application's code.
+
+The following are the legal values of env-entry-type-valuesType:
+
+    java.lang.Boolean
+    java.lang.Byte
+    java.lang.Character
+    java.lang.String
+    java.lang.Short
+    java.lang.Integer
+    java.lang.Long
+    java.lang.Float
+    java.lang.Double
+
+Example:
+
+<env-entry-type>java.lang.Boolean</env-entry-type>
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:restriction base="j2ee:string">
+        <xsd:enumeration value="java.lang.Boolean"/>
+        <xsd:enumeration value="java.lang.Byte"/>
+        <xsd:enumeration value="java.lang.Character"/>
+        <xsd:enumeration value="java.lang.String"/>
+        <xsd:enumeration value="java.lang.Short"/>
+        <xsd:enumeration value="java.lang.Integer"/>
+        <xsd:enumeration value="java.lang.Long"/>
+        <xsd:enumeration value="java.lang.Float"/>
+        <xsd:enumeration value="java.lang.Double"/>
+    </xsd:restriction>
+
+</xsd:simpleType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="env-entryType">
+<xsd:annotation>
+<xsd:documentation>
+
+The env-entryType is used to declare an application's
+environment entry. The declaration consists of an optional
+description, the name of the environment entry, and an
+optional value.  If a value is not specified, one must be
+supplied during deployment.
+
+It is used by env-entry elements.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="description"
+                     type="j2ee:descriptionType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="env-entry-name"
+                     type="j2ee:jndi-nameType">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The env-entry-name element contains the name of a
+        Deployment Component's environment entry.  The name
+        is a JNDI name relative to the java:comp/env
+        context.  The name must be unique within a
+        Deployment Component. The uniqueness
+        constraints must be defined within the declared
+        context.
+
+        Example:
+
+        <env-entry-name>minAmount</env-entry-name>
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+
+        <xsd:element name="env-entry-type"
+                     type="j2ee:env-entry-type-valuesType"/>
+
+        <xsd:element name="env-entry-value"
+                     type="xsd:string"
+                     minOccurs="0">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The env-entry-value designates the value of a
+        Deployment Component's environment entry. The value
+        must be a String that is valid for the
+        constructor of the specified type that takes a
+        single String parameter, or for java.lang.Character,
+        a single character.
+
+        Example:
+
+        <env-entry-value>100.00</env-entry-value>
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+
+    </xsd:sequence>
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="extensibleType" abstract="true">
+<xsd:annotation>
+<xsd:documentation>
+
+The extensibleType is an abstract base type which is used to
+define the type of extension-elements. Instance documents
+must substitute a known type to define the extension by
+using xsi:type attribute to define the actual type of
+extension-elements.
+
+</xsd:documentation>
+</xsd:annotation>
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:simpleType name="fully-qualified-classType">
+<xsd:annotation>
+<xsd:documentation>
+
+The elements that use this type designate the name of a
+Java class or interface.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:restriction base="j2ee:string"/>
+
+</xsd:simpleType>
+
+<!-- **************************************************** -->
+
+<xsd:simpleType name="generic-booleanType">
+<xsd:annotation>
+<xsd:documentation>
+
+This type defines four different values which can designate
+boolean values. This includes values yes and no which are
+not designated by xsd:boolean
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:restriction base="j2ee:string">
+        <xsd:enumeration value="true"/>
+        <xsd:enumeration value="false"/>
+        <xsd:enumeration value="yes"/>
+        <xsd:enumeration value="no"/>
+    </xsd:restriction>
+
+</xsd:simpleType>
+
+<!-- **************************************************** -->
+
+<xsd:simpleType name="homeType">
+<xsd:annotation>
+<xsd:documentation>
+
+The homeType defines the fully-qualified name of
+an enterprise bean's home interface.
+
+Example:
+
+    <home>com.aardvark.payroll.PayrollHome</home>
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:restriction base="j2ee:fully-qualified-classType"/>
+
+</xsd:simpleType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="iconType">
+<xsd:annotation>
+<xsd:documentation>
+
+The icon type contains small-icon and large-icon elements
+that specify the file names for small and large GIF or
+JPEG icon images used to represent the parent element in a
+GUI tool.
+
+The xml:lang attribute defines the language that the
+icon file names are provided in. Its value is "en" (English)
+by default.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="small-icon" type="j2ee:pathType"
+             minOccurs="0">
+        <xsd:annotation>
+        <xsd:documentation>
+        The small-icon element contains the name of a file
+        containing a small (16 x 16) icon image. The file
+        name is a relative path within the Deployment
+        Component's Deployment File.
+
+        The image may be either in the JPEG or GIF format.
+        The icon can be used by tools.
+
+        Example:
+
+        <small-icon>employee-service-icon16x16.jpg</small-icon>
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+        <xsd:element name="large-icon" type="j2ee:pathType"
+             minOccurs="0">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The large-icon element contains the name of a file
+        containing a large
+        (32 x 32) icon image. The file name is a relative
+        path within the Deployment Component's Deployment
+        File.
+
+        The image may be either in the JPEG or GIF format.
+        The icon can be used by tools.
+
+        Example:
+
+        <large-icon>employee-service-icon32x32.jpg</large-icon>
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+
+    </xsd:sequence>
+
+    <xsd:attribute ref="xml:lang"/>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:simpleType name="java-identifierType">
+<xsd:annotation>
+<xsd:documentation>
+
+The java-identifierType defines a Java identifier.
+The users of this type should further verify that
+the content does not contain Java reserved keywords.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:restriction base="j2ee:string">
+        <xsd:pattern value="($|_|\p{L})(\p{L}|\p{Nd}|_|$)*"/>
+    </xsd:restriction>
+
+</xsd:simpleType>
+
+<!-- **************************************************** -->
+
+<xsd:simpleType name="jndi-nameType">
+<xsd:annotation>
+<xsd:documentation>
+
+The jndi-nameType type designates a JNDI name in the
+Deployment Component's environment and is relative to the
+java:comp/env context.  A JNDI name must be unique within the
+Deployment Component.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:restriction base="j2ee:string"/>
+
+</xsd:simpleType>
+
+<!-- **************************************************** -->
+
+<xsd:simpleType name="local-homeType">
+<xsd:annotation>
+<xsd:documentation>
+
+The local-homeType defines the fully-qualified
+name of an enterprise bean's local home interface.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:restriction base="j2ee:fully-qualified-classType"/>
+
+</xsd:simpleType>
+
+<!-- **************************************************** -->
+
+<xsd:simpleType name="localType">
+<xsd:annotation>
+<xsd:documentation>
+
+The localType defines the fully-qualified name of an
+enterprise bean's local interface.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:restriction base="j2ee:fully-qualified-classType"/>
+
+</xsd:simpleType>
+
+<!-- **************************************************** -->
+
+<xsd:simpleType name="message-destination-linkType">
+<xsd:annotation>
+<xsd:documentation>
+
+The message-destination-linkType is used to link a message
+destination reference or message-driven bean to a message
+destination.
+
+The Assembler sets the value to reflect the flow of messages
+between producers and consumers in the application.
+
+The value must be the message-destination-name of a message
+destination in the same Deployment File or in another
+Deployment File in the same J2EE application unit.
+
+Alternatively, the value may be composed of a path name
+specifying a Deployment File containing the referenced
+message destination with the message-destination-name of the
+destination appended and separated from the path name by
+"#". The path name is relative to the Deployment File
+containing Deployment Component that is referencing the
+message destination.  This allows multiple message
+destinations with the same name to be uniquely identified.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:restriction base="j2ee:fully-qualified-classType"/>
+
+</xsd:simpleType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="message-destination-refType">
+<xsd:annotation>
+<xsd:documentation>
+
+The message-destination-ref element contains a declaration
+of Deployment Component's reference to a message destination
+associated with a resource in Deployment Component's
+environment. It consists of:
+
+        - an optional description
+        - the message destination reference name
+        - the message destination type
+        - a specification as to whether the
+          destination is used for
+          consuming or producing messages, or both
+        - a link to the message destination
+
+Examples:
+
+<message-destination-ref>
+        <message-destination-ref-name>jms/StockQueue
+        </message-destination-ref-name>
+        <message-destination-type>javax.jms.Queue
+        </message-destination-type>
+        <message-destination-usage>Consumes
+        </message-destination-usage>
+        <message-destination-link>CorporateStocks
+        </message-destination-link>
+</message-destination-ref>
+
+</xsd:documentation>
+</xsd:annotation>
+    <xsd:sequence>
+        <xsd:element name="description"
+                     type="j2ee:descriptionType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="message-destination-ref-name"
+                     type="j2ee:jndi-nameType">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The message-destination-ref-name element specifies
+        the name of a message destination reference; its
+        value is the environment entry name used in
+        Deployment Component code.  The name is a JNDI name
+        relative to the java:comp/env context and must be
+        unique within an ejb-jar (for enterprise beans) or a
+        Deployment File (for others).
+        %%%
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+        <xsd:element name="message-destination-type"
+                     type="j2ee:message-destination-typeType"/>
+        <xsd:element name="message-destination-usage"
+                     type="j2ee:message-destination-usageType"/>
+        <xsd:element name="message-destination-link"
+                     type="j2ee:message-destination-linkType"
+                     minOccurs="0"/>
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:simpleType name="message-destination-typeType">
+<xsd:annotation>
+<xsd:documentation>
+
+The message-destination-typeType specifies the type of
+the destination. The type is specified by the Java interface
+expected to be implemented by the destination.
+
+Example:
+
+ <message-destination-type>javax.jms.Queue
+ </message-destination-type>
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:restriction base="j2ee:fully-qualified-classType"/>
+
+</xsd:simpleType>
+
+<!-- **************************************************** -->
+
+<xsd:simpleType name="message-destination-usageType">
+<xsd:annotation>
+<xsd:documentation>
+
+The message-destination-usageType specifies the use of the
+message destination indicated by the reference.  The value
+indicates whether messages are consumed from the message
+destination, produced for the destination, or both.  The
+Assembler makes use of this information in linking producers
+of a destination with its consumers.
+
+The value of the message-destination-usage element must be
+one of the following:
+    Consumes
+    Produces
+    ConsumesProduces
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:restriction base="j2ee:string">
+        <xsd:enumeration value="Consumes"/>
+        <xsd:enumeration value="Produces"/>
+        <xsd:enumeration value="ConsumesProduces"/>
+    </xsd:restriction>
+
+</xsd:simpleType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="message-destinationType">
+<xsd:annotation>
+<xsd:documentation>
+
+The message-destinationType specifies a message
+destination. The logical destination described by this
+element is mapped to a physical destination by the Deployer.
+
+The message destination element contains:
+
+        - an optional description
+        - an optional display-name
+        - an optional icon
+        - a message destination name which must be unique
+          among message destination names within the same
+          Deployment File.
+
+Example:
+
+<message-destination>
+        <message-destination-name>CorporateStocks
+        </message-destination-name>
+</message-destination>
+
+</xsd:documentation>
+</xsd:annotation>
+    <xsd:sequence>
+        <xsd:element name="description"
+                     type="j2ee:descriptionType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="display-name"
+                     type="j2ee:display-nameType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="icon"
+                     type="j2ee:iconType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="message-destination-name"
+                     type="j2ee:string">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The message-destination-name element specifies a
+        name for a message destination.  This name must be
+        unique among the names of message destinations
+        within the Deployment File.
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+
+    </xsd:sequence>
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="param-valueType">
+<xsd:annotation>
+<xsd:documentation>
+
+This type is a general type that can be used to declare
+parameter/value lists.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="description"
+             type="j2ee:descriptionType"
+             minOccurs="0"
+             maxOccurs="unbounded"/>
+        <xsd:element name="param-name"
+             type="j2ee:string">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The param-name element contains the name of a
+        parameter.
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+
+        <xsd:element name="param-value"
+             type="xsd:string">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The param-value element contains the value of a
+        parameter.
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:simpleType name="pathType">
+<xsd:annotation>
+<xsd:documentation>
+
+The elements that use this type designate either a relative
+path or an absolute path starting with a "/".
+
+In elements that specify a pathname to a file within the
+same Deployment File, relative filenames (i.e., those not
+starting with "/") are considered relative to the root of
+the Deployment File's namespace.  Absolute filenames (i.e.,
+those starting with "/") also specify names in the root of
+the Deployment File's namespace.  In general, relative names
+are preferred.  The exception is .war files where absolute
+names are preferred for consistency with the Servlet API.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:restriction base="j2ee:string"/>
+
+</xsd:simpleType>
+
+<!-- **************************************************** -->
+
+<xsd:simpleType name="remoteType">
+<xsd:annotation>
+<xsd:documentation>
+
+The remote element contains the fully-qualified name
+of the enterprise bean's remote interface.
+
+Example:
+
+    <remote>com.wombat.empl.EmployeeService</remote>
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:restriction base="j2ee:fully-qualified-classType"/>
+
+</xsd:simpleType>
+
+<!-- **************************************************** -->
+
+<xsd:simpleType name="res-authType">
+<xsd:annotation>
+<xsd:documentation>
+
+The res-authType specifies whether the Deployment Component
+code signs on programmatically to the resource manager, or
+whether the Container will sign on to the resource manager
+on behalf of the Deployment Component. In the latter case,
+the Container uses information that is supplied by the
+Deployer.
+
+The value must be one of the two following:
+
+    Application
+    Container
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:restriction base="j2ee:string">
+        <xsd:enumeration value="Application"/>
+        <xsd:enumeration value="Container"/>
+    </xsd:restriction>
+
+</xsd:simpleType>
+
+<!-- **************************************************** -->
+
+<xsd:simpleType name="res-sharing-scopeType">
+<xsd:annotation>
+<xsd:documentation>
+
+The res-sharing-scope type specifies whether connections
+obtained through the given resource manager connection
+factory reference can be shared. The value, if specified,
+must be one of the two following:
+
+    Shareable
+    Unshareable
+
+The default value is Shareable.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:restriction base="j2ee:string">
+        <xsd:enumeration value="Shareable"/>
+        <xsd:enumeration value="Unshareable"/>
+    </xsd:restriction>
+
+</xsd:simpleType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="resource-env-refType">
+<xsd:annotation>
+<xsd:documentation>
+
+The resource-env-refType is used to define
+resource-env-type elements.  It contains a declaration of a
+Deployment Component's reference to an administered object
+associated with a resource in the Deployment Component's
+environment.  It consists of an optional description, the
+resource environment reference name, and an indication of
+the resource environment reference type expected by the
+Deployment Component code.
+
+Example:
+
+<resource-env-ref>
+    <resource-env-ref-name>jms/StockQueue
+    </resource-env-ref-name>
+    <resource-env-ref-type>javax.jms.Queue
+    </resource-env-ref-type>
+</resource-env-ref>
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="description"
+                     type="j2ee:descriptionType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="resource-env-ref-name"
+                     type="j2ee:jndi-nameType">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The resource-env-ref-name element specifies the name
+        of a resource environment reference; its value is
+        the environment entry name used in
+        the Deployment Component code.  The name is a JNDI
+        name relative to the java:comp/env context and must
+        be unique within a Deployment Component.
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+
+        <xsd:element name="resource-env-ref-type"
+                     type="j2ee:fully-qualified-classType">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The resource-env-ref-type element specifies the type
+        of a resource environment reference.  It is the
+        fully qualified name of a Java language class or
+        interface.
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="resource-refType">
+<xsd:annotation>
+<xsd:documentation>
+
+The resource-refType contains a declaration of a
+Deployment Component's reference to an external resource. It
+consists of an optional description, the resource manager
+connection factory reference name, the indication of the
+resource manager connection factory type expected by the
+Deployment Component code, the type of authentication
+(Application or Container), and an optional specification of
+the shareability of connections obtained from the resource
+(Shareable or Unshareable).
+
+Example:
+
+<resource-ref>
+    <res-ref-name>jdbc/EmployeeAppDB</res-ref-name>
+    <res-type>javax.sql.DataSource</res-type>
+    <res-auth>Container</res-auth>
+    <res-sharing-scope>Shareable</res-sharing-scope>
+</resource-ref>
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="description"
+                     type="j2ee:descriptionType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="res-ref-name"
+                     type="j2ee:jndi-nameType">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The res-ref-name element specifies the name of a
+        resource manager connection factory reference.
+        The name is a JNDI name relative to the
+        java:comp/env context.
+        The name must be unique within a Deployment File.
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+
+        <xsd:element name="res-type"
+                     type="j2ee:fully-qualified-classType">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The res-type element specifies the type of the data
+        source. The type is specified by the fully qualified
+        Java language class or interface
+        expected to be implemented by the data source.
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+
+        <xsd:element name="res-auth"
+                     type="j2ee:res-authType"/>
+
+        <xsd:element name="res-sharing-scope"
+                     type="j2ee:res-sharing-scopeType"
+                     minOccurs="0"/>
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:simpleType name="role-nameType">
+<xsd:annotation>
+<xsd:documentation>
+
+The role-nameType designates the name of a security role.
+
+The name must conform to the lexical rules for an NMTOKEN.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:restriction base="xsd:NMTOKEN"/>
+
+</xsd:simpleType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="run-asType">
+<xsd:annotation>
+<xsd:documentation>
+
+The run-asType specifies the run-as identity to be
+used for the execution of a component. It contains an
+optional description, and the name of a security role.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="description"
+                     type="j2ee:descriptionType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="role-name"
+                     type="j2ee:role-nameType"/>
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="security-role-refType">
+<xsd:annotation>
+<xsd:documentation>
+
+The security-role-refType contains the declaration of a
+security role reference in a component's or a
+Deployment Component's code. The declaration consists of an
+optional description, the security role name used in the
+code, and an optional link to a security role. If the
+security role is not specified, the Deployer must choose an
+appropriate security role.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="description"
+                     type="j2ee:descriptionType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="role-name"
+                     type="j2ee:role-nameType">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The value of the role-name element must be the String used
+        as the parameter to the
+        EJBContext.isCallerInRole(String roleName) method or the
+        HttpServletRequest.isUserInRole(String role) method.
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+
+        <xsd:element name="role-link"
+                     type="j2ee:role-nameType"
+                     minOccurs="0">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The role-link element is a reference to a defined
+        security role. The role-link element must contain
+        the name of one of the security roles defined in the
+        security-role elements.
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="security-roleType">
+<xsd:annotation>
+<xsd:documentation>
+
+The security-roleType contains the definition of a security
+role. The definition consists of an optional description of the
+security role, and the security role name.
+
+Example:
+
+    <security-role>
+    <description>
+        This role includes all employees who are authorized
+        to access the employee service application.
+    </description>
+    <role-name>employee</role-name>
+    </security-role>
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="description"
+                     type="j2ee:descriptionType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="role-name"
+                     type="j2ee:role-nameType"/>
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:simpleType name="string">
+<xsd:annotation>
+<xsd:documentation>
+
+This is a special string datatype that is defined by J2EE as
+a base type for defining collapsed strings. When schemas
+require trailing/leading space elimination as well as
+collapsing the existing whitespace, this base type may be
+used.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:restriction base="xsd:string">
+        <xsd:whiteSpace value="collapse"/>
+    </xsd:restriction>
+
+</xsd:simpleType>
+
+<!-- **************************************************** -->
+
+<xsd:simpleType name="true-falseType">
+<xsd:annotation>
+<xsd:documentation>
+
+This simple type designates a boolean with only two
+permissible values
+
+- true
+- false
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:restriction base="xsd:boolean">
+        <xsd:pattern value="(true|false)"/>
+    </xsd:restriction>
+</xsd:simpleType>
+
+<!-- **************************************************** -->
+
+<xsd:simpleType name="url-patternType">
+<xsd:annotation>
+<xsd:documentation>
+
+The url-patternType contains the url pattern of the mapping. It must
+follow the rules specified in Section 11.2 of the Servlet API
+Specification.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:restriction base="j2ee:string"/>
+
+</xsd:simpleType>
+
+<!-- **************************************************** -->
+
+<xsd:simpleType name="war-pathType">
+<xsd:annotation>
+<xsd:documentation>
+
+The elements that use this type designate a path starting
+with a "/" and interpreted relative to the root of a WAR
+file.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:restriction base="j2ee:string">
+        <xsd:pattern value="/.*"/>
+    </xsd:restriction>
+
+</xsd:simpleType>
+
+</xsd:schema>
+

Modified: xmlbeans/trunk/test/cases/xbean/compile/scomp/j2ee/jsp_2_0.xsd
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/compile/scomp/j2ee/jsp_2_0.xsd?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/compile/scomp/j2ee/jsp_2_0.xsd&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/compile/scomp/j2ee/jsp_2_0.xsd&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/compile/scomp/j2ee/jsp_2_0.xsd	(original)
+++ xmlbeans/trunk/test/cases/xbean/compile/scomp/j2ee/jsp_2_0.xsd	Wed Dec  8 08:54:26 2004
@@ -1,304 +1,304 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
-     targetNamespace="http://java.sun.com/xml/ns/j2ee"
-     xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
-     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-     elementFormDefault="qualified"
-     attributeFormDefault="unqualified"
-     version="2.0">
-<xsd:annotation>
-<xsd:documentation>
-@(#)jsp_2_0.xsds	1.10 08/20/02
-</xsd:documentation>
-</xsd:annotation>
-
-<xsd:annotation>
-<xsd:documentation>
-
-Copyright 2002 Sun Microsystems, Inc., 901 San Antonio
-Road, Palo Alto, California 94303, U.S.A. All rights
-reserved.
-
-Sun Microsystems, Inc. has intellectual property rights
-relating to technology described in this document. In
-particular, and without limitation, these intellectual
-property rights may include one or more of the U.S. patents
-listed at http://www.sun.com/patents and one or more
-additional patents or pending patent applications in the
-U.S. and other countries.
-
-This document and the technology which it describes are
-distributed under licenses restricting their use, copying,
-distribution, and decompilation. No part of this document
-may be reproduced in any form by any means without prior
-written authorization of Sun and its licensors, if any.
-
-Third-party software, including font technology, is
-copyrighted and licensed from Sun suppliers.
-
-Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
-JavaServer Pages, Enterprise JavaBeans and the Java Coffee
-Cup logo are trademarks or registered trademarks of Sun
-Microsystems, Inc. in the U.S. and other countries.
-
-Federal Acquisitions: Commercial Software - Government Users
-Subject to Standard License Terms and Conditions.
-
-</xsd:documentation>
-</xsd:annotation>
-
-<xsd:annotation>
-<xsd:documentation>
-
-This is the XML Schema for the JSP 2.0 deployment descriptor
-types.  The JSP 2.0 schema contains all the special
-structures and datatypes that are necessary to use JSP files
-from a web application.
-
-The contents of this schema is used by the web-app_2_4.xsd
-file to define JSP specific content.
-
-</xsd:documentation>
-</xsd:annotation>
-
-<xsd:annotation>
-<xsd:documentation>
-
-The following conventions apply to all J2EE
-deployment descriptor elements unless indicated otherwise.
-
-- In elements that specify a pathname to a file within the
-  same JAR file, relative filenames (i.e., those not
-  starting with "/") are considered relative to the root of
-  the JAR file's namespace.  Absolute filenames (i.e., those
-  starting with "/") also specify names in the root of the
-  JAR file's namespace.  In general, relative names are
-  preferred.  The exception is .war files where absolute
-  names are preferred for consistency with the Servlet API.
-
-</xsd:documentation>
-</xsd:annotation>
-
-<xsd:include schemaLocation="j2ee_1_4.xsd"/>
-
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="jsp-configType">
-<xsd:annotation>
-<xsd:documentation>
-
-The jsp-configType is used to provide global configuration
-information for the JSP files in a web application. It has
-two subelements, taglib and jsp-property-group.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="taglib"
-                     type="j2ee:taglibType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="jsp-property-group"
-                     type="j2ee:jsp-property-groupType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:simpleType name="jsp-fileType">
-<xsd:annotation>
-<xsd:documentation>
-
-The jsp-file element contains the full path to a JSP file
-within the web application beginning with a `/'.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:restriction base="j2ee:pathType"/>
-
-</xsd:simpleType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="jsp-property-groupType">
-<xsd:annotation>
-<xsd:documentation>
-
-The jsp-property-groupType is used to group a number of
-files so they can be given global property information.
-All files so described are deemed to be JSP files.  The
-following additional properties can be described:
-
-    - Control enabling of EL evaluation.
-    - Control enabling of Scripting elements.
-    - Indicate pageEncoding information.
-    - Indicating that a resource is a JSP document
-    - Prelude and Coda automatic includes.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-	<xsd:element name="description"
-		     type="j2ee:descriptionType"
-		     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="display-name"
-		     type="j2ee:display-nameType"
-		     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="url-pattern"
-                     type="j2ee:url-patternType"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="el-enabled"
-                     type="j2ee:true-falseType"
-                     minOccurs="0">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        Can be used to easily set the isELEnabled
-        property of a group of JSP pages.  By default, the
-        EL evaluation is enabled for Web Applications using
-        a Servlet 2.4 or greater web.xml.
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="page-encoding"
-                     type="j2ee:string"
-                     minOccurs="0">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The valid values of page-encoding are those of the
-        pageEncoding page directive. It is a
-        translation-time error to define the pageEncoding
-        of a JSP page through one value in the JSP
-        configuration element and then give it a different
-        value in a pageEncoding directive, but it is legal
-        to give it the same value.
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="scripting-enabled"
-                     type="j2ee:true-falseType"
-                     minOccurs="0">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        Can be used to easily set the isScriptingEnabled
-        property of a group of JSP pages.  By default,
-        scripting is enabled.
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-	<xsd:element name="is-xml"
-		     type="j2ee:true-falseType"
-		     minOccurs="0">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        If true, denotes that the group of resources
-	that match the URL pattern are JSP documents,
-	and thus must be interpreted as XML documents.
-	If false, the resources are assumed to not
-	be JSP documents, unless there is another
-	property group that indicates otherwise.
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="include-prelude"
-                     type="j2ee:pathType"
-                     minOccurs="0"
-                     maxOccurs="unbounded">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The include-prelude element is a context-relative
-        path that must correspond to an element in the
-        Web Application.  When the element is present,
-        the given path will be automatically included (as
-        in an include directive) at the beginning of each
-        JSP page in this jsp-property-group.
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="include-coda"
-                     type="j2ee:pathType"
-                     minOccurs="0"
-                     maxOccurs="unbounded">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The include-coda element is a context-relative
-        path that must correspond to an element in the
-        Web Application.  When the element is present,
-        the given path will be automatically included (as
-        in an include directive) at the end of each
-        JSP page in this jsp-property-group.
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="taglibType">
-<xsd:annotation>
-<xsd:documentation>
-
-A taglib can be used to provide information on a tag
-library that is used by a JSP page within the Web
-Application.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="taglib-uri"
-                     type="j2ee:string">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        A taglib-uri element describes a URI identifying a
-        tag library used in the web application.  The body
-        of the taglib-uri element may be either an
-        absolute URI specification, or a relative URI.
-        There should be no entries in web.xml with the
-        same taglib-uri value.
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-
-        <xsd:element name="taglib-location"
-                     type="j2ee:pathType">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        the taglib-location element contains the location
-        (as a resource relative to the root of the web
-        application) where to find the Tag Library
-        Description file for the tag library.
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-
-    </xsd:sequence>
-
-</xsd:complexType>
-
-</xsd:schema>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
+     targetNamespace="http://java.sun.com/xml/ns/j2ee"
+     xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
+     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+     elementFormDefault="qualified"
+     attributeFormDefault="unqualified"
+     version="2.0">
+<xsd:annotation>
+<xsd:documentation>
+@(#)jsp_2_0.xsds	1.10 08/20/02
+</xsd:documentation>
+</xsd:annotation>
+
+<xsd:annotation>
+<xsd:documentation>
+
+Copyright 2002 Sun Microsystems, Inc., 901 San Antonio
+Road, Palo Alto, California 94303, U.S.A. All rights
+reserved.
+
+Sun Microsystems, Inc. has intellectual property rights
+relating to technology described in this document. In
+particular, and without limitation, these intellectual
+property rights may include one or more of the U.S. patents
+listed at http://www.sun.com/patents and one or more
+additional patents or pending patent applications in the
+U.S. and other countries.
+
+This document and the technology which it describes are
+distributed under licenses restricting their use, copying,
+distribution, and decompilation. No part of this document
+may be reproduced in any form by any means without prior
+written authorization of Sun and its licensors, if any.
+
+Third-party software, including font technology, is
+copyrighted and licensed from Sun suppliers.
+
+Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
+JavaServer Pages, Enterprise JavaBeans and the Java Coffee
+Cup logo are trademarks or registered trademarks of Sun
+Microsystems, Inc. in the U.S. and other countries.
+
+Federal Acquisitions: Commercial Software - Government Users
+Subject to Standard License Terms and Conditions.
+
+</xsd:documentation>
+</xsd:annotation>
+
+<xsd:annotation>
+<xsd:documentation>
+
+This is the XML Schema for the JSP 2.0 deployment descriptor
+types.  The JSP 2.0 schema contains all the special
+structures and datatypes that are necessary to use JSP files
+from a web application.
+
+The contents of this schema is used by the web-app_2_4.xsd
+file to define JSP specific content.
+
+</xsd:documentation>
+</xsd:annotation>
+
+<xsd:annotation>
+<xsd:documentation>
+
+The following conventions apply to all J2EE
+deployment descriptor elements unless indicated otherwise.
+
+- In elements that specify a pathname to a file within the
+  same JAR file, relative filenames (i.e., those not
+  starting with "/") are considered relative to the root of
+  the JAR file's namespace.  Absolute filenames (i.e., those
+  starting with "/") also specify names in the root of the
+  JAR file's namespace.  In general, relative names are
+  preferred.  The exception is .war files where absolute
+  names are preferred for consistency with the Servlet API.
+
+</xsd:documentation>
+</xsd:annotation>
+
+<xsd:include schemaLocation="j2ee_1_4.xsd"/>
+
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="jsp-configType">
+<xsd:annotation>
+<xsd:documentation>
+
+The jsp-configType is used to provide global configuration
+information for the JSP files in a web application. It has
+two subelements, taglib and jsp-property-group.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="taglib"
+                     type="j2ee:taglibType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="jsp-property-group"
+                     type="j2ee:jsp-property-groupType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:simpleType name="jsp-fileType">
+<xsd:annotation>
+<xsd:documentation>
+
+The jsp-file element contains the full path to a JSP file
+within the web application beginning with a `/'.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:restriction base="j2ee:pathType"/>
+
+</xsd:simpleType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="jsp-property-groupType">
+<xsd:annotation>
+<xsd:documentation>
+
+The jsp-property-groupType is used to group a number of
+files so they can be given global property information.
+All files so described are deemed to be JSP files.  The
+following additional properties can be described:
+
+    - Control enabling of EL evaluation.
+    - Control enabling of Scripting elements.
+    - Indicate pageEncoding information.
+    - Indicating that a resource is a JSP document
+    - Prelude and Coda automatic includes.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+	<xsd:element name="description"
+		     type="j2ee:descriptionType"
+		     minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="display-name"
+		     type="j2ee:display-nameType"
+		     minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="url-pattern"
+                     type="j2ee:url-patternType"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="el-enabled"
+                     type="j2ee:true-falseType"
+                     minOccurs="0">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        Can be used to easily set the isELEnabled
+        property of a group of JSP pages.  By default, the
+        EL evaluation is enabled for Web Applications using
+        a Servlet 2.4 or greater web.xml.
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+        <xsd:element name="page-encoding"
+                     type="j2ee:string"
+                     minOccurs="0">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The valid values of page-encoding are those of the
+        pageEncoding page directive. It is a
+        translation-time error to define the pageEncoding
+        of a JSP page through one value in the JSP
+        configuration element and then give it a different
+        value in a pageEncoding directive, but it is legal
+        to give it the same value.
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+        <xsd:element name="scripting-enabled"
+                     type="j2ee:true-falseType"
+                     minOccurs="0">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        Can be used to easily set the isScriptingEnabled
+        property of a group of JSP pages.  By default,
+        scripting is enabled.
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+	<xsd:element name="is-xml"
+		     type="j2ee:true-falseType"
+		     minOccurs="0">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        If true, denotes that the group of resources
+	that match the URL pattern are JSP documents,
+	and thus must be interpreted as XML documents.
+	If false, the resources are assumed to not
+	be JSP documents, unless there is another
+	property group that indicates otherwise.
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+        <xsd:element name="include-prelude"
+                     type="j2ee:pathType"
+                     minOccurs="0"
+                     maxOccurs="unbounded">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The include-prelude element is a context-relative
+        path that must correspond to an element in the
+        Web Application.  When the element is present,
+        the given path will be automatically included (as
+        in an include directive) at the beginning of each
+        JSP page in this jsp-property-group.
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+        <xsd:element name="include-coda"
+                     type="j2ee:pathType"
+                     minOccurs="0"
+                     maxOccurs="unbounded">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The include-coda element is a context-relative
+        path that must correspond to an element in the
+        Web Application.  When the element is present,
+        the given path will be automatically included (as
+        in an include directive) at the end of each
+        JSP page in this jsp-property-group.
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="taglibType">
+<xsd:annotation>
+<xsd:documentation>
+
+A taglib can be used to provide information on a tag
+library that is used by a JSP page within the Web
+Application.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="taglib-uri"
+                     type="j2ee:string">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        A taglib-uri element describes a URI identifying a
+        tag library used in the web application.  The body
+        of the taglib-uri element may be either an
+        absolute URI specification, or a relative URI.
+        There should be no entries in web.xml with the
+        same taglib-uri value.
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+
+        <xsd:element name="taglib-location"
+                     type="j2ee:pathType">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        the taglib-location element contains the location
+        (as a resource relative to the root of the web
+        application) where to find the Tag Library
+        Description file for the tag library.
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+
+    </xsd:sequence>
+
+</xsd:complexType>
+
+</xsd:schema>
+

Modified: xmlbeans/trunk/test/cases/xbean/compile/scomp/j2ee/web-app_2_4.xsd
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/compile/scomp/j2ee/web-app_2_4.xsd?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/compile/scomp/j2ee/web-app_2_4.xsd&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/compile/scomp/j2ee/web-app_2_4.xsd&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/compile/scomp/j2ee/web-app_2_4.xsd	(original)
+++ xmlbeans/trunk/test/cases/xbean/compile/scomp/j2ee/web-app_2_4.xsd	Wed Dec  8 08:54:26 2004
@@ -1,1278 +1,1278 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
-     targetNamespace="http://java.sun.com/xml/ns/j2ee"
-     xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
-     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-     elementFormDefault="qualified"
-     attributeFormDefault="unqualified"
-     version="2.4">
-<xsd:annotation>
-<xsd:documentation>
-@(#)web-app_2_4.xsds	1.34 02/08/01
-</xsd:documentation>
-</xsd:annotation>
-
-<xsd:annotation>
-<xsd:documentation>
-
-Copyright 2002 Sun Microsystems, Inc., 901 San Antonio
-Road, Palo Alto, California 94303, U.S.A. All rights
-reserved.
-
-Sun Microsystems, Inc. has intellectual property rights
-relating to technology described in this document. In
-particular, and without limitation, these intellectual
-property rights may include one or more of the U.S. patents
-listed at http://www.sun.com/patents and one or more
-additional patents or pending patent applications in the
-U.S. and other countries.
-
-This document and the technology which it describes are
-distributed under licenses restricting their use, copying,
-distribution, and decompilation. No part of this document
-may be reproduced in any form by any means without prior
-written authorization of Sun and its licensors, if any.
-
-Third-party software, including font technology, is
-copyrighted and licensed from Sun suppliers.
-
-Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
-JavaServer Pages, Enterprise JavaBeans and the Java Coffee
-Cup logo are trademarks or registered trademarks of Sun
-Microsystems, Inc. in the U.S. and other countries.
-
-Federal Acquisitions: Commercial Software - Government Users
-Subject to Standard License Terms and Conditions.
-
-</xsd:documentation>
-</xsd:annotation>
-
-<xsd:annotation>
-<xsd:documentation>
-<![CDATA[
-This is the XML Schema for the Servlet 2.4 deployment
-descriptor.  All Servlet deployment descriptors must
-indicate the web application schema by using the J2EE
-namespace:
-
-http://java.sun.com/xml/ns/j2ee
-
-and by indicating the version of the schema by
-using the version element as shown below:
-
-    <web-app xmlns="http://java.sun.com/xml/ns/j2ee"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="..."
-     version="2.4">
-    ...
-    </web-app>
-
-The instance documents may indicate the published version of
-the schema using the xsi:schemaLocation attribute for J2EE
-namespace with the following location:
-
-http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd
-]]>
-</xsd:documentation>
-</xsd:annotation>
-
-<xsd:annotation>
-<xsd:documentation>
-
-The following conventions apply to all J2EE
-deployment descriptor elements unless indicated otherwise.
-
-- In elements that specify a pathname to a file within the
-  same JAR file, relative filenames (i.e., those not
-  starting with "/") are considered relative to the root of
-  the JAR file's namespace.  Absolute filenames (i.e., those
-  starting with "/") also specify names in the root of the
-  JAR file's namespace.  In general, relative names are
-  preferred.  The exception is .war files where absolute
-  names are preferred for consistency with the Servlet API.
-
-</xsd:documentation>
-</xsd:annotation>
-
-<xsd:include schemaLocation="j2ee_1_4.xsd"/>
-<xsd:include schemaLocation="jsp_2_0.xsd"/>
-
-
-<!-- **************************************************** -->
-
-
-<xsd:element name="web-app" type="j2ee:web-appType">
-    <xsd:annotation>
-    <xsd:documentation>
-
-    The web-app element is the root of the deployment
-    descriptor for a web application.
-
-    </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:unique name="servlet-name-uniqueness">
-    <xsd:annotation>
-    <xsd:documentation>
-
-    The servlet element contains the name of a servlet.
-    The name must be unique within the web application.
-
-    </xsd:documentation>
-    </xsd:annotation>
-        <xsd:selector xpath="j2ee:servlet"/>
-        <xsd:field    xpath="j2ee:servlet-name"/>
-    </xsd:unique>
-
-    <xsd:unique name="filter-name-uniqueness">
-    <xsd:annotation>
-    <xsd:documentation>
-
-    The filter element contains the name of a filter.
-    The name must be unique within the web application.
-
-    </xsd:documentation>
-    </xsd:annotation>
-        <xsd:selector xpath="j2ee:filter"/>
-        <xsd:field    xpath="j2ee:filter-name"/>
-    </xsd:unique>
-
-    <xsd:unique name="ejb-local-ref-name-uniqueness">
-    <xsd:annotation>
-    <xsd:documentation>
-
-    The ejb-local-ref-name element contains the name of an EJB
-    reference. The EJB reference is an entry in the web
-    application's environment and is relative to the
-    java:comp/env context.  The name must be unique within
-    the web application.
-
-    It is recommended that name is prefixed with "ejb/".
-
-    </xsd:documentation>
-    </xsd:annotation>
-        <xsd:selector xpath="j2ee:ejb-local-ref"/>
-        <xsd:field    xpath="j2ee:ejb-ref-name"/>
-    </xsd:unique>
-
-    <xsd:unique name="ejb-ref-name-uniqueness">
-    <xsd:annotation>
-    <xsd:documentation>
-
-    The ejb-ref-name element contains the name of an EJB
-    reference. The EJB reference is an entry in the web
-    application's environment and is relative to the
-    java:comp/env context.  The name must be unique within
-    the web application.
-
-    It is recommended that name is prefixed with "ejb/".
-
-    </xsd:documentation>
-    </xsd:annotation>
-        <xsd:selector xpath="j2ee:ejb-ref"/>
-        <xsd:field    xpath="j2ee:ejb-ref-name"/>
-    </xsd:unique>
-
-    <xsd:unique name="resource-env-ref-uniqueness">
-    <xsd:annotation>
-    <xsd:documentation>
-
-    The resource-env-ref-name element specifies the name of
-    a resource environment reference; its value is the
-    environment entry name used in the web application code.
-    The name is a JNDI name relative to the java:comp/env
-    context and must be unique within a web application.
-
-    </xsd:documentation>
-    </xsd:annotation>
-        <xsd:selector xpath="j2ee:resource-env-ref"/>
-        <xsd:field    xpath="j2ee:resource-env-ref-name"/>
-    </xsd:unique>
-
-    <xsd:unique name="message-destination-ref-uniqueness">
-    <xsd:annotation>
-    <xsd:documentation>
-
-    The message-destination-ref-name element specifies the name of
-    a message destination reference; its value is the
-    environment entry name used in the web application code.
-    The name is a JNDI name relative to the java:comp/env
-    context and must be unique within a web application.
-
-    </xsd:documentation>
-    </xsd:annotation>
-        <xsd:selector xpath="j2ee:message-destination-ref"/>
-        <xsd:field    xpath="j2ee:message-destination-ref-name"/>
-    </xsd:unique>
-
-    <xsd:unique name="res-ref-name-uniqueness">
-    <xsd:annotation>
-    <xsd:documentation>
-
-    The res-ref-name element specifies the name of a
-    resource manager connection factory reference.  The name
-    is a JNDI name relative to the java:comp/env context.
-    The name must be unique within a web application.
-
-    </xsd:documentation>
-    </xsd:annotation>
-        <xsd:selector xpath="j2ee:resource-ref"/>
-        <xsd:field    xpath="j2ee:res-ref-name"/>
-    </xsd:unique>
-
-    <xsd:unique name="env-entry-name-uniqueness">
-    <xsd:annotation>
-    <xsd:documentation>
-
-    The env-entry-name element contains the name of a web
-    application's environment entry.  The name is a JNDI
-    name relative to the java:comp/env context.  The name
-    must be unique within a web application.
-
-    </xsd:documentation>
-    </xsd:annotation>
-
-        <xsd:selector xpath="j2ee:env-entry"/>
-        <xsd:field    xpath="j2ee:env-entry-name"/>
-        </xsd:unique>
-
-    <xsd:key name="role-name-key">
-    <xsd:annotation>
-    <xsd:documentation>
-
-    A role-name-key is specified to allow the references
-    from the security-role-refs.
-
-    </xsd:documentation>
-    </xsd:annotation>
-        <xsd:selector xpath="j2ee:security-role"/>
-        <xsd:field    xpath="j2ee:role-name"/>
-    </xsd:key>
-
-    <xsd:keyref name="role-name-references"
-            refer="j2ee:role-name-key">
-    <xsd:annotation>
-    <xsd:documentation>
-
-    The keyref indicates the references from
-    security-role-ref to a specified role-name.
-
-    </xsd:documentation>
-    </xsd:annotation>
-        <xsd:selector xpath="j2ee:servlet/j2ee:security-role-ref"/>
-        <xsd:field    xpath="j2ee:role-link"/>
-    </xsd:keyref>
-
-</xsd:element>
-
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="auth-constraintType">
-<xsd:annotation>
-<xsd:documentation>
-
-The auth-constraintType indicates the user roles that
-should be permitted access to this resource
-collection. The role-name used here must either correspond
-to the role-name of one of the security-role elements
-defined for this web application, or be the specially
-reserved role-name "*" that is a compact syntax for
-indicating all roles in the web application. If both "*"
-and rolenames appear, the container interprets this as all
-roles.  If no roles are defined, no user is allowed access
-to the portion of the web application described by the
-containing security-constraint.  The container matches
-role names case sensitively when determining access.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="description"
-                 type="j2ee:descriptionType"
-                 minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="role-name"
-                 type="j2ee:role-nameType"
-                 minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:simpleType name="auth-methodType">
-<xsd:annotation>
-<xsd:documentation>
-
-The auth-methodType is used to configure the authentication
-mechanism for the web application. As a prerequisite to
-gaining access to any web resources which are protected by
-an authorization constraint, a user must have authenticated
-using the configured mechanism. Legal values are "BASIC",
-"DIGEST", "FORM", or "CLIENT-CERT".
-
-Used in: login-config
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:restriction base="j2ee:string">
-        <xsd:enumeration value="BASIC"/>
-        <xsd:enumeration value="DIGEST"/>
-        <xsd:enumeration value="FORM"/>
-        <xsd:enumeration value="CLIENT-CERT"/>
-    </xsd:restriction>
-
-</xsd:simpleType>
-
-<!-- **************************************************** -->
-
-<xsd:simpleType name="dispatcherType">
-<xsd:annotation>
-<xsd:documentation>
-
-The dispatcher has three legal values, FORWARD and REQUEST
-and INCLUDE. A value of FORWARD means the Filter
-will be applied under RequestDispatcher.forward() calls.
-A value of REQUEST means the Filter will be applied
-under ordinary client calls to the path or servlet. A value of
-INCLUDE means the Filter will be applied under
-RequestDispatcher.include() calls.
-The absence of any dispatcher elements in a
-filter-mapping indicates a default of applying
-filters only under ordinary client calls to the path or servlet.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:restriction base="j2ee:string">
-        <xsd:enumeration value="FORWARD"/>
-    <xsd:enumeration value="INCLUDE"/>
-    <xsd:enumeration value="REQUEST"/>
-
-    </xsd:restriction>
-
-</xsd:simpleType>
-
-<!-- **************************************************** -->
-
-<xsd:simpleType name="error-codeType">
-<xsd:annotation>
-<xsd:documentation>
-
-The error-code contains an HTTP error code, ex: 404
-
-Used in: error-page
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:restriction base="positiveInteger"/>
-
-</xsd:simpleType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="error-pageType">
-<xsd:annotation>
-<xsd:documentation>
-
-The error-pageType contains a mapping between an error code
-or exception type to the path of a resource in the web
-application.
-
-Used in: web-app
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <choice>
-        <xsd:element name="error-code"
-                     type="j2ee:error-codeType"/>
-
-        <xsd:element name="exception-type"
-                     type="j2ee:fully-qualified-classType">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The exception-type contains a fully qualified class
-        name of a Java exception type.
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-        </choice>
-
-        <xsd:element name="location"
-                     type="j2ee:pathType">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The location element contains the location of the
-        resource in the web application relative to the root of
-        the web application. The value of the location must have
-        a leading `/'.
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="filter-mappingType">
-<xsd:annotation>
-<xsd:documentation>
-
-Declaration of the filter mappings in this web
-application is done by using filter-mappingType.
-The container uses the filter-mapping
-declarations to decide which filters to apply to a request,
-and in what order. The container matches the request URI to
-a Servlet in the normal way. To determine which filters to
-apply it matches filter-mapping declarations either on
-servlet-name, or on url-pattern for each filter-mapping
-element, depending on which style is used. The order in
-which filters are invoked is the order in which
-filter-mapping declarations that match a request URI for a
-servlet appear in the list of filter-mapping elements.The
-filter-name value must be the value of the filter-name
-sub-elements of one of the filter declarations in the
-deployment descriptor.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="filter-name"
-                 type="j2ee:filter-nameType"/>
-        <choice>
-            <xsd:element name="url-pattern"
-                     type="j2ee:url-patternType"/>
-            <xsd:element name="servlet-name"
-                     type="j2ee:servlet-nameType"/>
-        </choice>
-        <xsd:element name="dispatcher"
-                     type="j2ee:dispatcherType"
-                     minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:simpleType name="filter-nameType">
-<xsd:annotation>
-<xsd:documentation>
-
-The logical name of the filter is declare
-by using filter-nameType. This name is used to map the
-filter.  Each filter name is unique within the web
-application.
-
-Used in: filter, filter-mapping
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:restriction base="j2ee:string"/>
-
-</xsd:simpleType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="filterType">
-<xsd:annotation>
-<xsd:documentation>
-
-The filterType is used to declare a filter in the web
-application. The filter is mapped to either a servlet or a
-URL pattern in the filter-mapping element, using the
-filter-name value to reference. Filters can access the
-initialization parameters declared in the deployment
-descriptor at runtime via the FilterConfig interface.
-
-Used in: web-app
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="description"
-                     type="j2ee:descriptionType"
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="display-name"
-                     type="j2ee:display-nameType"
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="icon"
-                     type="j2ee:iconType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="filter-name"
-                     type="j2ee:filter-nameType"/>
-        <xsd:element name="filter-class"
-                     type="j2ee:fully-qualified-classType">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The fully qualified classname of the filter.
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-
-        <xsd:element name="init-param"
-                     type="j2ee:param-valueType"
-                     minOccurs="0" maxOccurs="unbounded">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The init-param element contains a name/value pair as
-        an initialization param of a servlet filter
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="form-login-configType">
-<xsd:annotation>
-<xsd:documentation>
-
-The form-login-configType specifies the login and error
-pages that should be used in form based login. If form based
-authentication is not used, these elements are ignored.
-
-Used in: login-config
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-
-        <xsd:element name="form-login-page"
-                 type="j2ee:war-pathType">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The form-login-page element defines the location in the web app
-        where the page that can be used for login can be found.
-        The path begins with a leading / and is
-        interpreted relative to the root of the WAR.
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-
-        <xsd:element name="form-error-page"
-                 type="j2ee:war-pathType">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The form-error-page element defines the location in
-        the web app where the error page that is displayed
-        when login is not successful can be found.
-        The path begins with a leading / and is interpreted
-        relative to the root of the WAR.
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:simpleType name="http-methodType">
-<xsd:annotation>
-
-<xsd:documentation>
-The http-method contains an HTTP method recognized by the web-app, i.e.
-(GET | POST |...).
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:restriction base="j2ee:string">
-        <xsd:enumeration value="GET"/>
-        <xsd:enumeration value="POST"/>
-        <xsd:enumeration value="PUT"/>
-        <xsd:enumeration value="DELETE"/>
-        <xsd:enumeration value="HEAD"/>
-        <xsd:enumeration value="OPTIONS"/>
-        <xsd:enumeration value="TRACE"/>
-    </xsd:restriction>
-
-</xsd:simpleType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="listenerType">
-<xsd:annotation>
-<xsd:documentation>
-
-The listenerType indicates the deployment properties for a web
-application listener bean.
-
-Used in: web-app:listenerType
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="description"
-                     type="j2ee:descriptionType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="display-name"
-                     type="j2ee:display-nameType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="icon"
-                     type="j2ee:iconType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="listener-class"
-                     type="j2ee:fully-qualified-classType">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The listener-class element declares a class in the
-        application must be registered as a web
-        application listener bean. The value is the fully
-        qualified classname of the listener class.
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="locale-encoding-mapping-listType">
-<xsd:annotation>
-<xsd:documentation>
-
-The locale-encoding-mapping-list contains one or more
-locale-encoding-mapping(s).
-
-</xsd:documentation>
-</xsd:annotation>
-
-<xsd:sequence>
-    <xsd:element name="locale-encoding-mapping"
-        type="j2ee:locale-encoding-mappingType"
-        maxOccurs="unbounded"/>
-</xsd:sequence>
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="locale-encoding-mappingType">
-<xsd:annotation>
-<xsd:documentation>
-
-The locale-encoding-mapping contains locale name and
-encoding name. The locale name must be either "Language-code",
-such as "ja", defined by ISO-639 or "Language-code_Country-code",
-such as "ja_JP".  "Country code" is defined by ISO-3166.
-
-</xsd:documentation>
-</xsd:annotation>
-
-<xsd:sequence>
-    <xsd:element name="locale"
-        type="j2ee:string"/>
-    <xsd:element name="encoding"
-        type="j2ee:string"/>
-</xsd:sequence>
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="login-configType">
-<xsd:annotation>
-<xsd:documentation>
-
-The login-configType is used to configure the authentication
-method that should be used, the realm name that should be
-used for this application, and the attributes that are
-needed by the form login mechanism.
-
-Used in: web-app
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="auth-method"
-                     type="j2ee:auth-methodType"
-                     minOccurs="0"/>
-        <xsd:element name="realm-name"
-                     type="j2ee:string" minOccurs="0">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The realm name element specifies the realm name to
-        use in HTTP Basic authorization.
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="form-login-config"
-                     type="j2ee:form-login-configType"
-                     minOccurs="0"/>
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="mime-mappingType">
-<xsd:annotation>
-<xsd:documentation>
-
-The mime-mappingType defines a mapping between an extension
-and a mime type.
-
-Used in: web-app
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The extension element contains a string describing an
-        extension. example: "txt"
-
-        </xsd:documentation>
-        </xsd:annotation>
-
-        <xsd:element name="extension"
-                     type="j2ee:string"/>
-        <xsd:element name="mime-type"
-                     type="j2ee:mime-typeType"/>
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:simpleType name="mime-typeType">
-<xsd:annotation>
-<xsd:documentation>
-
-The mime-typeType is used to indicate a defined mime type.
-
-Example:
-"text/plain"
-
-Used in: mime-mapping
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:restriction base="j2ee:string">
-        <xsd:pattern value="[\p{L}\-\p{Nd}]+/[\p{L}\-\p{Nd}\.]+"/>
-    </xsd:restriction>
-
-</xsd:simpleType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="security-constraintType">
-<xsd:annotation>
-<xsd:documentation>
-
-The security-constraintType is used to associate
-security constraints with one or more web resource
-collections
-
-Used in: web-app
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="display-name"
-                     type="j2ee:display-nameType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="web-resource-collection"
-                     type="j2ee:web-resource-collectionType"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="auth-constraint"
-                     type="j2ee:auth-constraintType"
-                     minOccurs="0"/>
-        <xsd:element name="user-data-constraint"
-                     type="j2ee:user-data-constraintType"
-                     minOccurs="0"/>
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="servlet-mappingType">
-<xsd:annotation>
-<xsd:documentation>
-
-The servlet-mappingType defines a mapping between a
-servlet and a url pattern.
-
-Used in: web-app
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="servlet-name"
-                     type="j2ee:servlet-nameType"/>
-        <xsd:element name="url-pattern"
-                     type="j2ee:url-patternType"/>
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:simpleType name="servlet-nameType">
-<xsd:annotation>
-<xsd:documentation>
-
-The servlet-name element contains the canonical name of the
-servlet. Each servlet name is unique within the web
-application.
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:restriction base="j2ee:string"/>
-
-</xsd:simpleType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="servletType">
-<xsd:annotation>
-<xsd:documentation>
-
-The servletType is used to declare a servlet.
-It contains the declarative data of a
-servlet. If a jsp-file is specified and the load-on-startup
-element is present, then the JSP should be precompiled and
-loaded.
-
-Used in: web-app
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="description"
-                     type="j2ee:descriptionType"
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="display-name"
-                     type="j2ee:display-nameType"
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="icon"
-                     type="j2ee:iconType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="servlet-name"
-                     type="j2ee:servlet-nameType"/>
-        <choice>
-            <xsd:element name="servlet-class"
-                         type="j2ee:fully-qualified-classType">
-            <xsd:annotation>
-            <xsd:documentation>
-
-            The servlet-class element contains the fully
-            qualified class name of the servlet.
-
-            </xsd:documentation>
-            </xsd:annotation>
-            </xsd:element>
-
-            <xsd:element name="jsp-file"
-                         type="j2ee:jsp-fileType"/>
-
-        </choice>
-
-        <xsd:element name="init-param"
-                     type="j2ee:param-valueType"
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="load-on-startup"
-                     type="xsd:integer"
-                     minOccurs="0">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The load-on-startup element indicates that this
-        servlet should be loaded (instantiated and have
-        its init() called) on the startup of the web
-        application. The optional contents of these
-        element must be an integer indicating the order in
-        which the servlet should be loaded. If the value
-        is a negative integer, or the element is not
-        present, the container is free to load the servlet
-        whenever it chooses. If the value is a positive
-        integer or 0, the container must load and
-        initialize the servlet as the application is
-        deployed. The container must guarantee that
-        servlets marked with lower integers are loaded
-        before servlets marked with higher integers. The
-        container may choose the order of loading of
-        servlets with the same load-on-start-up value.
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="run-as"
-                     type="j2ee:run-asType"
-                     minOccurs="0"/>
-        <xsd:element name="security-role-ref"
-                     type="j2ee:security-role-refType"
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="deployment-extension"
-                     type="j2ee:deployment-extensionType"
-                     minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="session-configType">
-<xsd:annotation>
-<xsd:documentation>
-
-The session-configType defines the session parameters
-for this web application.
-
-Used in: web-app
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="session-timeout"
-                 type="xsd:nonNegativeInteger"
-                 minOccurs="0">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The session-timeout element defines the default
-        session timeout interval for all sessions created
-        in this web application. The specified timeout
-        must be expressed in a whole number of minutes.
-        If the timeout is 0 or less, the container ensures
-        the default behaviour of sessions is never to time
-        out. If this element is not specified, the container
-        must set its default timeout period.
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:simpleType name="transport-guaranteeType">
-<xsd:annotation>
-<xsd:documentation>
-
-The transport-guaranteeType specifies that the communication
-between client and server should be NONE, INTEGRAL, or
-CONFIDENTIAL. NONE means that the application does not
-require any transport guarantees. A value of INTEGRAL means
-that the application requires that the data sent between the
-client and server be sent in such a way that it can't be
-changed in transit. CONFIDENTIAL means that the application
-requires that the data be transmitted in a fashion that
-prevents other entities from observing the contents of the
-transmission. In most cases, the presence of the INTEGRAL or
-CONFIDENTIAL flag will indicate that the use of SSL is
-required.
-
-Used in: user-data-constraint
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:restriction base="j2ee:string">
-        <xsd:enumeration value="NONE"/>
-        <xsd:enumeration value="INTEGRAL"/>
-        <xsd:enumeration value="CONFIDENTIAL"/>
-    </xsd:restriction>
-
-</xsd:simpleType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="user-data-constraintType">
-<xsd:annotation>
-<xsd:documentation>
-
-The user-data-constraintType is used to indicate how
-data communicated between the client and container should be
-protected.
-
-Used in: security-constraint
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="description"
-                     type="j2ee:descriptionType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="transport-guarantee"
-                     type="j2ee:transport-guaranteeType"/>
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:simpleType name="web-app-versionType">
-<xsd:annotation>
-<xsd:documentation>
-
-This type contains the recognized versions of
-web-application supported. It is used to designate the
-version of the web application.
-
-Example:
-
-<web-app>
-    <version>2.4</version>
-...
-</web-app>
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:restriction base="j2ee:string">
-        <xsd:enumeration value="2.4"/>
-    </xsd:restriction>
-
-</xsd:simpleType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="web-appType">
-
-    <xsd:sequence>
-        <xsd:element name="description"
-                     type="j2ee:descriptionType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="display-name"
-                     type="j2ee:display-nameType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="icon"
-                     type="j2ee:iconType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="distributable"
-                     type="j2ee:emptyType"
-                     minOccurs="0"/>
-        <xsd:element name="context-param"
-                     type="j2ee:param-valueType"
-                     minOccurs="0" maxOccurs="unbounded">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The context-param element contains the declaration
-        of a web application's servlet context
-        initialization parameters.
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-
-        <xsd:element name="filter"
-                     type="j2ee:filterType"
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="filter-mapping"
-                     type="j2ee:filter-mappingType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="listener"
-                     type="j2ee:listenerType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="servlet"
-                     type="j2ee:servletType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="servlet-mapping"
-                     type="j2ee:servlet-mappingType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="session-config"
-                     type="j2ee:session-configType"
-                     minOccurs="0"/>
-        <xsd:element name="mime-mapping"
-                     type="j2ee:mime-mappingType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="welcome-file-list"
-                     type="j2ee:welcome-file-listType"
-                     minOccurs="0"/>
-        <xsd:element name="error-page"
-                     type="j2ee:error-pageType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="jsp-config"
-                     type="j2ee:jsp-configType"
-                     minOccurs="0"/>
-        <xsd:element name="resource-env-ref"
-                     type="j2ee:resource-env-refType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="message-destination-ref"
-                     type="j2ee:message-destination-refType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="resource-ref"
-                     type="j2ee:resource-refType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="security-constraint"
-                     type="j2ee:security-constraintType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="login-config"
-                     type="j2ee:login-configType"
-                     minOccurs="0"/>
-        <xsd:element name="security-role"
-                     type="j2ee:security-roleType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="env-entry"
-                     type="j2ee:env-entryType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="ejb-ref"
-                     type="j2ee:ejb-refType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="ejb-local-ref"
-                     type="j2ee:ejb-local-refType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="message-destination"
-                     type="j2ee:message-destinationType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="locale-encoding-mapping-list"
-                     type="j2ee:locale-encoding-mapping-listType"
-                     minOccurs="0"
-                     maxOccurs="1"/>
-        <xsd:element name="deployment-extension"
-                     type="j2ee:deployment-extensionType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-    </xsd:sequence>
-
-    <xsd:attribute name="version"
-                   type="j2ee:web-app-versionType"
-                   use="required"/>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="web-resource-collectionType">
-<xsd:annotation>
-<xsd:documentation>
-
-The web-resource-collectionType is used to identify a subset
-of the resources and HTTP methods on those resources within
-a web application to which a security constraint applies. If
-no HTTP methods are specified, then the security constraint
-applies to all HTTP methods.
-
-Used in: security-constraint
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="web-resource-name"
-                     type="j2ee:string">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The web-resource-name contains the name of this web
-        resource collection.
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="description"
-                     type="j2ee:descriptionType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="url-pattern"
-                     type="j2ee:url-patternType"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="http-method"
-                     type="j2ee:http-methodType"
-                     minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-
-</xsd:complexType>
-
-<!-- **************************************************** -->
-
-<xsd:complexType name="welcome-file-listType">
-<xsd:annotation>
-<xsd:documentation>
-
-The welcome-file-list contains an ordered list of welcome
-files elements.
-
-Used in: web-app
-
-</xsd:documentation>
-</xsd:annotation>
-
-    <xsd:sequence>
-        <xsd:element name="welcome-file"
-                     type="j2ee:string"
-                     maxOccurs="unbounded">
-        <xsd:annotation>
-        <xsd:documentation>
-
-        The welcome-file element contains file name to use
-        as a default welcome file, such as index.html
-
-        </xsd:documentation>
-        </xsd:annotation>
-        </xsd:element>
-    </xsd:sequence>
-
-</xsd:complexType>
-
-</xsd:schema>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
+     targetNamespace="http://java.sun.com/xml/ns/j2ee"
+     xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
+     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+     elementFormDefault="qualified"
+     attributeFormDefault="unqualified"
+     version="2.4">
+<xsd:annotation>
+<xsd:documentation>
+@(#)web-app_2_4.xsds	1.34 02/08/01
+</xsd:documentation>
+</xsd:annotation>
+
+<xsd:annotation>
+<xsd:documentation>
+
+Copyright 2002 Sun Microsystems, Inc., 901 San Antonio
+Road, Palo Alto, California 94303, U.S.A. All rights
+reserved.
+
+Sun Microsystems, Inc. has intellectual property rights
+relating to technology described in this document. In
+particular, and without limitation, these intellectual
+property rights may include one or more of the U.S. patents
+listed at http://www.sun.com/patents and one or more
+additional patents or pending patent applications in the
+U.S. and other countries.
+
+This document and the technology which it describes are
+distributed under licenses restricting their use, copying,
+distribution, and decompilation. No part of this document
+may be reproduced in any form by any means without prior
+written authorization of Sun and its licensors, if any.
+
+Third-party software, including font technology, is
+copyrighted and licensed from Sun suppliers.
+
+Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
+JavaServer Pages, Enterprise JavaBeans and the Java Coffee
+Cup logo are trademarks or registered trademarks of Sun
+Microsystems, Inc. in the U.S. and other countries.
+
+Federal Acquisitions: Commercial Software - Government Users
+Subject to Standard License Terms and Conditions.
+
+</xsd:documentation>
+</xsd:annotation>
+
+<xsd:annotation>
+<xsd:documentation>
+<![CDATA[
+This is the XML Schema for the Servlet 2.4 deployment
+descriptor.  All Servlet deployment descriptors must
+indicate the web application schema by using the J2EE
+namespace:
+
+http://java.sun.com/xml/ns/j2ee
+
+and by indicating the version of the schema by
+using the version element as shown below:
+
+    <web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="..."
+     version="2.4">
+    ...
+    </web-app>
+
+The instance documents may indicate the published version of
+the schema using the xsi:schemaLocation attribute for J2EE
+namespace with the following location:
+
+http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd
+]]>
+</xsd:documentation>
+</xsd:annotation>
+
+<xsd:annotation>
+<xsd:documentation>
+
+The following conventions apply to all J2EE
+deployment descriptor elements unless indicated otherwise.
+
+- In elements that specify a pathname to a file within the
+  same JAR file, relative filenames (i.e., those not
+  starting with "/") are considered relative to the root of
+  the JAR file's namespace.  Absolute filenames (i.e., those
+  starting with "/") also specify names in the root of the
+  JAR file's namespace.  In general, relative names are
+  preferred.  The exception is .war files where absolute
+  names are preferred for consistency with the Servlet API.
+
+</xsd:documentation>
+</xsd:annotation>
+
+<xsd:include schemaLocation="j2ee_1_4.xsd"/>
+<xsd:include schemaLocation="jsp_2_0.xsd"/>
+
+
+<!-- **************************************************** -->
+
+
+<xsd:element name="web-app" type="j2ee:web-appType">
+    <xsd:annotation>
+    <xsd:documentation>
+
+    The web-app element is the root of the deployment
+    descriptor for a web application.
+
+    </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:unique name="servlet-name-uniqueness">
+    <xsd:annotation>
+    <xsd:documentation>
+
+    The servlet element contains the name of a servlet.
+    The name must be unique within the web application.
+
+    </xsd:documentation>
+    </xsd:annotation>
+        <xsd:selector xpath="j2ee:servlet"/>
+        <xsd:field    xpath="j2ee:servlet-name"/>
+    </xsd:unique>
+
+    <xsd:unique name="filter-name-uniqueness">
+    <xsd:annotation>
+    <xsd:documentation>
+
+    The filter element contains the name of a filter.
+    The name must be unique within the web application.
+
+    </xsd:documentation>
+    </xsd:annotation>
+        <xsd:selector xpath="j2ee:filter"/>
+        <xsd:field    xpath="j2ee:filter-name"/>
+    </xsd:unique>
+
+    <xsd:unique name="ejb-local-ref-name-uniqueness">
+    <xsd:annotation>
+    <xsd:documentation>
+
+    The ejb-local-ref-name element contains the name of an EJB
+    reference. The EJB reference is an entry in the web
+    application's environment and is relative to the
+    java:comp/env context.  The name must be unique within
+    the web application.
+
+    It is recommended that name is prefixed with "ejb/".
+
+    </xsd:documentation>
+    </xsd:annotation>
+        <xsd:selector xpath="j2ee:ejb-local-ref"/>
+        <xsd:field    xpath="j2ee:ejb-ref-name"/>
+    </xsd:unique>
+
+    <xsd:unique name="ejb-ref-name-uniqueness">
+    <xsd:annotation>
+    <xsd:documentation>
+
+    The ejb-ref-name element contains the name of an EJB
+    reference. The EJB reference is an entry in the web
+    application's environment and is relative to the
+    java:comp/env context.  The name must be unique within
+    the web application.
+
+    It is recommended that name is prefixed with "ejb/".
+
+    </xsd:documentation>
+    </xsd:annotation>
+        <xsd:selector xpath="j2ee:ejb-ref"/>
+        <xsd:field    xpath="j2ee:ejb-ref-name"/>
+    </xsd:unique>
+
+    <xsd:unique name="resource-env-ref-uniqueness">
+    <xsd:annotation>
+    <xsd:documentation>
+
+    The resource-env-ref-name element specifies the name of
+    a resource environment reference; its value is the
+    environment entry name used in the web application code.
+    The name is a JNDI name relative to the java:comp/env
+    context and must be unique within a web application.
+
+    </xsd:documentation>
+    </xsd:annotation>
+        <xsd:selector xpath="j2ee:resource-env-ref"/>
+        <xsd:field    xpath="j2ee:resource-env-ref-name"/>
+    </xsd:unique>
+
+    <xsd:unique name="message-destination-ref-uniqueness">
+    <xsd:annotation>
+    <xsd:documentation>
+
+    The message-destination-ref-name element specifies the name of
+    a message destination reference; its value is the
+    environment entry name used in the web application code.
+    The name is a JNDI name relative to the java:comp/env
+    context and must be unique within a web application.
+
+    </xsd:documentation>
+    </xsd:annotation>
+        <xsd:selector xpath="j2ee:message-destination-ref"/>
+        <xsd:field    xpath="j2ee:message-destination-ref-name"/>
+    </xsd:unique>
+
+    <xsd:unique name="res-ref-name-uniqueness">
+    <xsd:annotation>
+    <xsd:documentation>
+
+    The res-ref-name element specifies the name of a
+    resource manager connection factory reference.  The name
+    is a JNDI name relative to the java:comp/env context.
+    The name must be unique within a web application.
+
+    </xsd:documentation>
+    </xsd:annotation>
+        <xsd:selector xpath="j2ee:resource-ref"/>
+        <xsd:field    xpath="j2ee:res-ref-name"/>
+    </xsd:unique>
+
+    <xsd:unique name="env-entry-name-uniqueness">
+    <xsd:annotation>
+    <xsd:documentation>
+
+    The env-entry-name element contains the name of a web
+    application's environment entry.  The name is a JNDI
+    name relative to the java:comp/env context.  The name
+    must be unique within a web application.
+
+    </xsd:documentation>
+    </xsd:annotation>
+
+        <xsd:selector xpath="j2ee:env-entry"/>
+        <xsd:field    xpath="j2ee:env-entry-name"/>
+        </xsd:unique>
+
+    <xsd:key name="role-name-key">
+    <xsd:annotation>
+    <xsd:documentation>
+
+    A role-name-key is specified to allow the references
+    from the security-role-refs.
+
+    </xsd:documentation>
+    </xsd:annotation>
+        <xsd:selector xpath="j2ee:security-role"/>
+        <xsd:field    xpath="j2ee:role-name"/>
+    </xsd:key>
+
+    <xsd:keyref name="role-name-references"
+            refer="j2ee:role-name-key">
+    <xsd:annotation>
+    <xsd:documentation>
+
+    The keyref indicates the references from
+    security-role-ref to a specified role-name.
+
+    </xsd:documentation>
+    </xsd:annotation>
+        <xsd:selector xpath="j2ee:servlet/j2ee:security-role-ref"/>
+        <xsd:field    xpath="j2ee:role-link"/>
+    </xsd:keyref>
+
+</xsd:element>
+
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="auth-constraintType">
+<xsd:annotation>
+<xsd:documentation>
+
+The auth-constraintType indicates the user roles that
+should be permitted access to this resource
+collection. The role-name used here must either correspond
+to the role-name of one of the security-role elements
+defined for this web application, or be the specially
+reserved role-name "*" that is a compact syntax for
+indicating all roles in the web application. If both "*"
+and rolenames appear, the container interprets this as all
+roles.  If no roles are defined, no user is allowed access
+to the portion of the web application described by the
+containing security-constraint.  The container matches
+role names case sensitively when determining access.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="description"
+                 type="j2ee:descriptionType"
+                 minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="role-name"
+                 type="j2ee:role-nameType"
+                 minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:simpleType name="auth-methodType">
+<xsd:annotation>
+<xsd:documentation>
+
+The auth-methodType is used to configure the authentication
+mechanism for the web application. As a prerequisite to
+gaining access to any web resources which are protected by
+an authorization constraint, a user must have authenticated
+using the configured mechanism. Legal values are "BASIC",
+"DIGEST", "FORM", or "CLIENT-CERT".
+
+Used in: login-config
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:restriction base="j2ee:string">
+        <xsd:enumeration value="BASIC"/>
+        <xsd:enumeration value="DIGEST"/>
+        <xsd:enumeration value="FORM"/>
+        <xsd:enumeration value="CLIENT-CERT"/>
+    </xsd:restriction>
+
+</xsd:simpleType>
+
+<!-- **************************************************** -->
+
+<xsd:simpleType name="dispatcherType">
+<xsd:annotation>
+<xsd:documentation>
+
+The dispatcher has three legal values, FORWARD and REQUEST
+and INCLUDE. A value of FORWARD means the Filter
+will be applied under RequestDispatcher.forward() calls.
+A value of REQUEST means the Filter will be applied
+under ordinary client calls to the path or servlet. A value of
+INCLUDE means the Filter will be applied under
+RequestDispatcher.include() calls.
+The absence of any dispatcher elements in a
+filter-mapping indicates a default of applying
+filters only under ordinary client calls to the path or servlet.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:restriction base="j2ee:string">
+        <xsd:enumeration value="FORWARD"/>
+    <xsd:enumeration value="INCLUDE"/>
+    <xsd:enumeration value="REQUEST"/>
+
+    </xsd:restriction>
+
+</xsd:simpleType>
+
+<!-- **************************************************** -->
+
+<xsd:simpleType name="error-codeType">
+<xsd:annotation>
+<xsd:documentation>
+
+The error-code contains an HTTP error code, ex: 404
+
+Used in: error-page
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:restriction base="positiveInteger"/>
+
+</xsd:simpleType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="error-pageType">
+<xsd:annotation>
+<xsd:documentation>
+
+The error-pageType contains a mapping between an error code
+or exception type to the path of a resource in the web
+application.
+
+Used in: web-app
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <choice>
+        <xsd:element name="error-code"
+                     type="j2ee:error-codeType"/>
+
+        <xsd:element name="exception-type"
+                     type="j2ee:fully-qualified-classType">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The exception-type contains a fully qualified class
+        name of a Java exception type.
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+        </choice>
+
+        <xsd:element name="location"
+                     type="j2ee:pathType">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The location element contains the location of the
+        resource in the web application relative to the root of
+        the web application. The value of the location must have
+        a leading `/'.
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="filter-mappingType">
+<xsd:annotation>
+<xsd:documentation>
+
+Declaration of the filter mappings in this web
+application is done by using filter-mappingType.
+The container uses the filter-mapping
+declarations to decide which filters to apply to a request,
+and in what order. The container matches the request URI to
+a Servlet in the normal way. To determine which filters to
+apply it matches filter-mapping declarations either on
+servlet-name, or on url-pattern for each filter-mapping
+element, depending on which style is used. The order in
+which filters are invoked is the order in which
+filter-mapping declarations that match a request URI for a
+servlet appear in the list of filter-mapping elements.The
+filter-name value must be the value of the filter-name
+sub-elements of one of the filter declarations in the
+deployment descriptor.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="filter-name"
+                 type="j2ee:filter-nameType"/>
+        <choice>
+            <xsd:element name="url-pattern"
+                     type="j2ee:url-patternType"/>
+            <xsd:element name="servlet-name"
+                     type="j2ee:servlet-nameType"/>
+        </choice>
+        <xsd:element name="dispatcher"
+                     type="j2ee:dispatcherType"
+                     minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:simpleType name="filter-nameType">
+<xsd:annotation>
+<xsd:documentation>
+
+The logical name of the filter is declare
+by using filter-nameType. This name is used to map the
+filter.  Each filter name is unique within the web
+application.
+
+Used in: filter, filter-mapping
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:restriction base="j2ee:string"/>
+
+</xsd:simpleType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="filterType">
+<xsd:annotation>
+<xsd:documentation>
+
+The filterType is used to declare a filter in the web
+application. The filter is mapped to either a servlet or a
+URL pattern in the filter-mapping element, using the
+filter-name value to reference. Filters can access the
+initialization parameters declared in the deployment
+descriptor at runtime via the FilterConfig interface.
+
+Used in: web-app
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="description"
+                     type="j2ee:descriptionType"
+                     minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="display-name"
+                     type="j2ee:display-nameType"
+                     minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="icon"
+                     type="j2ee:iconType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="filter-name"
+                     type="j2ee:filter-nameType"/>
+        <xsd:element name="filter-class"
+                     type="j2ee:fully-qualified-classType">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The fully qualified classname of the filter.
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+
+        <xsd:element name="init-param"
+                     type="j2ee:param-valueType"
+                     minOccurs="0" maxOccurs="unbounded">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The init-param element contains a name/value pair as
+        an initialization param of a servlet filter
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="form-login-configType">
+<xsd:annotation>
+<xsd:documentation>
+
+The form-login-configType specifies the login and error
+pages that should be used in form based login. If form based
+authentication is not used, these elements are ignored.
+
+Used in: login-config
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+
+        <xsd:element name="form-login-page"
+                 type="j2ee:war-pathType">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The form-login-page element defines the location in the web app
+        where the page that can be used for login can be found.
+        The path begins with a leading / and is
+        interpreted relative to the root of the WAR.
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+
+        <xsd:element name="form-error-page"
+                 type="j2ee:war-pathType">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The form-error-page element defines the location in
+        the web app where the error page that is displayed
+        when login is not successful can be found.
+        The path begins with a leading / and is interpreted
+        relative to the root of the WAR.
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:simpleType name="http-methodType">
+<xsd:annotation>
+
+<xsd:documentation>
+The http-method contains an HTTP method recognized by the web-app, i.e.
+(GET | POST |...).
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:restriction base="j2ee:string">
+        <xsd:enumeration value="GET"/>
+        <xsd:enumeration value="POST"/>
+        <xsd:enumeration value="PUT"/>
+        <xsd:enumeration value="DELETE"/>
+        <xsd:enumeration value="HEAD"/>
+        <xsd:enumeration value="OPTIONS"/>
+        <xsd:enumeration value="TRACE"/>
+    </xsd:restriction>
+
+</xsd:simpleType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="listenerType">
+<xsd:annotation>
+<xsd:documentation>
+
+The listenerType indicates the deployment properties for a web
+application listener bean.
+
+Used in: web-app:listenerType
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="description"
+                     type="j2ee:descriptionType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="display-name"
+                     type="j2ee:display-nameType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="icon"
+                     type="j2ee:iconType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="listener-class"
+                     type="j2ee:fully-qualified-classType">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The listener-class element declares a class in the
+        application must be registered as a web
+        application listener bean. The value is the fully
+        qualified classname of the listener class.
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="locale-encoding-mapping-listType">
+<xsd:annotation>
+<xsd:documentation>
+
+The locale-encoding-mapping-list contains one or more
+locale-encoding-mapping(s).
+
+</xsd:documentation>
+</xsd:annotation>
+
+<xsd:sequence>
+    <xsd:element name="locale-encoding-mapping"
+        type="j2ee:locale-encoding-mappingType"
+        maxOccurs="unbounded"/>
+</xsd:sequence>
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="locale-encoding-mappingType">
+<xsd:annotation>
+<xsd:documentation>
+
+The locale-encoding-mapping contains locale name and
+encoding name. The locale name must be either "Language-code",
+such as "ja", defined by ISO-639 or "Language-code_Country-code",
+such as "ja_JP".  "Country code" is defined by ISO-3166.
+
+</xsd:documentation>
+</xsd:annotation>
+
+<xsd:sequence>
+    <xsd:element name="locale"
+        type="j2ee:string"/>
+    <xsd:element name="encoding"
+        type="j2ee:string"/>
+</xsd:sequence>
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="login-configType">
+<xsd:annotation>
+<xsd:documentation>
+
+The login-configType is used to configure the authentication
+method that should be used, the realm name that should be
+used for this application, and the attributes that are
+needed by the form login mechanism.
+
+Used in: web-app
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="auth-method"
+                     type="j2ee:auth-methodType"
+                     minOccurs="0"/>
+        <xsd:element name="realm-name"
+                     type="j2ee:string" minOccurs="0">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The realm name element specifies the realm name to
+        use in HTTP Basic authorization.
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+        <xsd:element name="form-login-config"
+                     type="j2ee:form-login-configType"
+                     minOccurs="0"/>
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="mime-mappingType">
+<xsd:annotation>
+<xsd:documentation>
+
+The mime-mappingType defines a mapping between an extension
+and a mime type.
+
+Used in: web-app
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The extension element contains a string describing an
+        extension. example: "txt"
+
+        </xsd:documentation>
+        </xsd:annotation>
+
+        <xsd:element name="extension"
+                     type="j2ee:string"/>
+        <xsd:element name="mime-type"
+                     type="j2ee:mime-typeType"/>
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:simpleType name="mime-typeType">
+<xsd:annotation>
+<xsd:documentation>
+
+The mime-typeType is used to indicate a defined mime type.
+
+Example:
+"text/plain"
+
+Used in: mime-mapping
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:restriction base="j2ee:string">
+        <xsd:pattern value="[\p{L}\-\p{Nd}]+/[\p{L}\-\p{Nd}\.]+"/>
+    </xsd:restriction>
+
+</xsd:simpleType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="security-constraintType">
+<xsd:annotation>
+<xsd:documentation>
+
+The security-constraintType is used to associate
+security constraints with one or more web resource
+collections
+
+Used in: web-app
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="display-name"
+                     type="j2ee:display-nameType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="web-resource-collection"
+                     type="j2ee:web-resource-collectionType"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="auth-constraint"
+                     type="j2ee:auth-constraintType"
+                     minOccurs="0"/>
+        <xsd:element name="user-data-constraint"
+                     type="j2ee:user-data-constraintType"
+                     minOccurs="0"/>
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="servlet-mappingType">
+<xsd:annotation>
+<xsd:documentation>
+
+The servlet-mappingType defines a mapping between a
+servlet and a url pattern.
+
+Used in: web-app
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="servlet-name"
+                     type="j2ee:servlet-nameType"/>
+        <xsd:element name="url-pattern"
+                     type="j2ee:url-patternType"/>
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:simpleType name="servlet-nameType">
+<xsd:annotation>
+<xsd:documentation>
+
+The servlet-name element contains the canonical name of the
+servlet. Each servlet name is unique within the web
+application.
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:restriction base="j2ee:string"/>
+
+</xsd:simpleType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="servletType">
+<xsd:annotation>
+<xsd:documentation>
+
+The servletType is used to declare a servlet.
+It contains the declarative data of a
+servlet. If a jsp-file is specified and the load-on-startup
+element is present, then the JSP should be precompiled and
+loaded.
+
+Used in: web-app
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="description"
+                     type="j2ee:descriptionType"
+                     minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="display-name"
+                     type="j2ee:display-nameType"
+                     minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="icon"
+                     type="j2ee:iconType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="servlet-name"
+                     type="j2ee:servlet-nameType"/>
+        <choice>
+            <xsd:element name="servlet-class"
+                         type="j2ee:fully-qualified-classType">
+            <xsd:annotation>
+            <xsd:documentation>
+
+            The servlet-class element contains the fully
+            qualified class name of the servlet.
+
+            </xsd:documentation>
+            </xsd:annotation>
+            </xsd:element>
+
+            <xsd:element name="jsp-file"
+                         type="j2ee:jsp-fileType"/>
+
+        </choice>
+
+        <xsd:element name="init-param"
+                     type="j2ee:param-valueType"
+                     minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="load-on-startup"
+                     type="xsd:integer"
+                     minOccurs="0">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The load-on-startup element indicates that this
+        servlet should be loaded (instantiated and have
+        its init() called) on the startup of the web
+        application. The optional contents of these
+        element must be an integer indicating the order in
+        which the servlet should be loaded. If the value
+        is a negative integer, or the element is not
+        present, the container is free to load the servlet
+        whenever it chooses. If the value is a positive
+        integer or 0, the container must load and
+        initialize the servlet as the application is
+        deployed. The container must guarantee that
+        servlets marked with lower integers are loaded
+        before servlets marked with higher integers. The
+        container may choose the order of loading of
+        servlets with the same load-on-start-up value.
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+        <xsd:element name="run-as"
+                     type="j2ee:run-asType"
+                     minOccurs="0"/>
+        <xsd:element name="security-role-ref"
+                     type="j2ee:security-role-refType"
+                     minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="deployment-extension"
+                     type="j2ee:deployment-extensionType"
+                     minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="session-configType">
+<xsd:annotation>
+<xsd:documentation>
+
+The session-configType defines the session parameters
+for this web application.
+
+Used in: web-app
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="session-timeout"
+                 type="xsd:nonNegativeInteger"
+                 minOccurs="0">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The session-timeout element defines the default
+        session timeout interval for all sessions created
+        in this web application. The specified timeout
+        must be expressed in a whole number of minutes.
+        If the timeout is 0 or less, the container ensures
+        the default behaviour of sessions is never to time
+        out. If this element is not specified, the container
+        must set its default timeout period.
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:simpleType name="transport-guaranteeType">
+<xsd:annotation>
+<xsd:documentation>
+
+The transport-guaranteeType specifies that the communication
+between client and server should be NONE, INTEGRAL, or
+CONFIDENTIAL. NONE means that the application does not
+require any transport guarantees. A value of INTEGRAL means
+that the application requires that the data sent between the
+client and server be sent in such a way that it can't be
+changed in transit. CONFIDENTIAL means that the application
+requires that the data be transmitted in a fashion that
+prevents other entities from observing the contents of the
+transmission. In most cases, the presence of the INTEGRAL or
+CONFIDENTIAL flag will indicate that the use of SSL is
+required.
+
+Used in: user-data-constraint
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:restriction base="j2ee:string">
+        <xsd:enumeration value="NONE"/>
+        <xsd:enumeration value="INTEGRAL"/>
+        <xsd:enumeration value="CONFIDENTIAL"/>
+    </xsd:restriction>
+
+</xsd:simpleType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="user-data-constraintType">
+<xsd:annotation>
+<xsd:documentation>
+
+The user-data-constraintType is used to indicate how
+data communicated between the client and container should be
+protected.
+
+Used in: security-constraint
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="description"
+                     type="j2ee:descriptionType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="transport-guarantee"
+                     type="j2ee:transport-guaranteeType"/>
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:simpleType name="web-app-versionType">
+<xsd:annotation>
+<xsd:documentation>
+
+This type contains the recognized versions of
+web-application supported. It is used to designate the
+version of the web application.
+
+Example:
+
+<web-app>
+    <version>2.4</version>
+...
+</web-app>
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:restriction base="j2ee:string">
+        <xsd:enumeration value="2.4"/>
+    </xsd:restriction>
+
+</xsd:simpleType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="web-appType">
+
+    <xsd:sequence>
+        <xsd:element name="description"
+                     type="j2ee:descriptionType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="display-name"
+                     type="j2ee:display-nameType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="icon"
+                     type="j2ee:iconType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="distributable"
+                     type="j2ee:emptyType"
+                     minOccurs="0"/>
+        <xsd:element name="context-param"
+                     type="j2ee:param-valueType"
+                     minOccurs="0" maxOccurs="unbounded">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The context-param element contains the declaration
+        of a web application's servlet context
+        initialization parameters.
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+
+        <xsd:element name="filter"
+                     type="j2ee:filterType"
+                     minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="filter-mapping"
+                     type="j2ee:filter-mappingType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="listener"
+                     type="j2ee:listenerType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="servlet"
+                     type="j2ee:servletType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="servlet-mapping"
+                     type="j2ee:servlet-mappingType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="session-config"
+                     type="j2ee:session-configType"
+                     minOccurs="0"/>
+        <xsd:element name="mime-mapping"
+                     type="j2ee:mime-mappingType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="welcome-file-list"
+                     type="j2ee:welcome-file-listType"
+                     minOccurs="0"/>
+        <xsd:element name="error-page"
+                     type="j2ee:error-pageType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="jsp-config"
+                     type="j2ee:jsp-configType"
+                     minOccurs="0"/>
+        <xsd:element name="resource-env-ref"
+                     type="j2ee:resource-env-refType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="message-destination-ref"
+                     type="j2ee:message-destination-refType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="resource-ref"
+                     type="j2ee:resource-refType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="security-constraint"
+                     type="j2ee:security-constraintType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="login-config"
+                     type="j2ee:login-configType"
+                     minOccurs="0"/>
+        <xsd:element name="security-role"
+                     type="j2ee:security-roleType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="env-entry"
+                     type="j2ee:env-entryType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="ejb-ref"
+                     type="j2ee:ejb-refType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="ejb-local-ref"
+                     type="j2ee:ejb-local-refType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="message-destination"
+                     type="j2ee:message-destinationType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="locale-encoding-mapping-list"
+                     type="j2ee:locale-encoding-mapping-listType"
+                     minOccurs="0"
+                     maxOccurs="1"/>
+        <xsd:element name="deployment-extension"
+                     type="j2ee:deployment-extensionType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+    </xsd:sequence>
+
+    <xsd:attribute name="version"
+                   type="j2ee:web-app-versionType"
+                   use="required"/>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="web-resource-collectionType">
+<xsd:annotation>
+<xsd:documentation>
+
+The web-resource-collectionType is used to identify a subset
+of the resources and HTTP methods on those resources within
+a web application to which a security constraint applies. If
+no HTTP methods are specified, then the security constraint
+applies to all HTTP methods.
+
+Used in: security-constraint
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="web-resource-name"
+                     type="j2ee:string">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The web-resource-name contains the name of this web
+        resource collection.
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+        <xsd:element name="description"
+                     type="j2ee:descriptionType"
+                     minOccurs="0"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="url-pattern"
+                     type="j2ee:url-patternType"
+                     maxOccurs="unbounded"/>
+        <xsd:element name="http-method"
+                     type="j2ee:http-methodType"
+                     minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+
+</xsd:complexType>
+
+<!-- **************************************************** -->
+
+<xsd:complexType name="welcome-file-listType">
+<xsd:annotation>
+<xsd:documentation>
+
+The welcome-file-list contains an ordered list of welcome
+files elements.
+
+Used in: web-app
+
+</xsd:documentation>
+</xsd:annotation>
+
+    <xsd:sequence>
+        <xsd:element name="welcome-file"
+                     type="j2ee:string"
+                     maxOccurs="unbounded">
+        <xsd:annotation>
+        <xsd:documentation>
+
+        The welcome-file element contains file name to use
+        as a default welcome file, such as index.html
+
+        </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+    </xsd:sequence>
+
+</xsd:complexType>
+
+</xsd:schema>
+

Modified: xmlbeans/trunk/test/cases/xbean/compile/scomp/pricequote/PriceQuote.xsd
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/compile/scomp/pricequote/PriceQuote.xsd?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/compile/scomp/pricequote/PriceQuote.xsd&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/compile/scomp/pricequote/PriceQuote.xsd&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/compile/scomp/pricequote/PriceQuote.xsd	(original)
+++ xmlbeans/trunk/test/cases/xbean/compile/scomp/pricequote/PriceQuote.xsd	Wed Dec  8 08:54:26 2004
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-    <xsd:element name="price-quote">
-        <xsd:complexType>
-            <xsd:sequence>
-                <xsd:element ref="stock-symbol" minOccurs="1" maxOccurs="1"/>
-                <xsd:element ref="stock-price" minOccurs="1" maxOccurs="1"/>
-            </xsd:sequence>
-        </xsd:complexType>
-    </xsd:element>
-    <!-- XXXSJM change following to use refined datatypes -->
-    <xsd:element name="stock-symbol" type="xsd:string"/>
-    <xsd:element name="stock-price" type="xsd:string"/>
-</xsd:schema>
-
+<?xml version="1.0"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+    <xsd:element name="price-quote">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element ref="stock-symbol" minOccurs="1" maxOccurs="1"/>
+                <xsd:element ref="stock-price" minOccurs="1" maxOccurs="1"/>
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
+    <!-- XXXSJM change following to use refined datatypes -->
+    <xsd:element name="stock-symbol" type="xsd:string"/>
+    <xsd:element name="stock-price" type="xsd:string"/>
+</xsd:schema>
+

Modified: xmlbeans/trunk/test/cases/xbean/compile/scomp/simple/person.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/compile/scomp/simple/person.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/compile/scomp/simple/person.xml&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/compile/scomp/simple/person.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/compile/scomp/simple/person.xml	(original)
+++ xmlbeans/trunk/test/cases/xbean/compile/scomp/simple/person.xml	Wed Dec  8 08:54:26 2004
@@ -1,16 +1,16 @@
-<customer xmlns="http://openuri.org/mytest"
-  gender="male"
-  hexAtt="474749515457594747"
-  base64Att="        
-	VGhpcyBzdHJpbmcgaXMgYmFzZTY0QmluYXJ5IGVuY29kZWQh
-	  ">
-  <firstname>Howdy</firstname>
-  <number>436</number>
-  <number>123</number>
-  <birthday>1998-08-26Z</birthday>
-  <number>44</number>
-  <number>933</number>
-  <birthday>2000-08-06-08:00</birthday>
-  <hex>454749515457595A4A</hex>
-  <base64>VGhpcyBzdHJpbmcgaXMgYmFzZTY0QmluYXJ5IGVuY29kZWQh</base64>
-</customer>
+<customer xmlns="http://openuri.org/mytest"
+  gender="male"
+  hexAtt="474749515457594747"
+  base64Att="        
+	VGhpcyBzdHJpbmcgaXMgYmFzZTY0QmluYXJ5IGVuY29kZWQh
+	  ">
+  <firstname>Howdy</firstname>
+  <number>436</number>
+  <number>123</number>
+  <birthday>1998-08-26Z</birthday>
+  <number>44</number>
+  <number>933</number>
+  <birthday>2000-08-06-08:00</birthday>
+  <hex>454749515457595A4A</hex>
+  <base64>VGhpcyBzdHJpbmcgaXMgYmFzZTY0QmluYXJ5IGVuY29kZWQh</base64>
+</customer>

Modified: xmlbeans/trunk/test/cases/xbean/compile/scomp/simple/person.xsd
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/compile/scomp/simple/person.xsd?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/compile/scomp/simple/person.xsd&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/compile/scomp/simple/person.xsd&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/compile/scomp/simple/person.xsd	(original)
+++ xmlbeans/trunk/test/cases/xbean/compile/scomp/simple/person.xsd	Wed Dec  8 08:54:26 2004
@@ -1,65 +1,65 @@
-<xs:schema
-   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-   xmlns:mt="http://openuri.org/mytest"
-   targetNamespace="http://openuri.org/mytest"
-   elementFormDefault="qualified"
-   attributeFormDefault="unqualified" >
-
-  <xs:complexType name="person">
-    <xs:sequence>
-      <xs:element name="firstname" type="xs:string"/>
-      <xs:choice maxOccurs="unbounded">
-        <xs:element name="number">
-           <xs:simpleType>
-             <xs:restriction base="xs:integer">
-               <xs:minInclusive value="1"/>
-               <xs:maxInclusive value="1000"/>
-             </xs:restriction>
-           </xs:simpleType>
-        </xs:element>
-        <xs:element name="birthday" type="xs:date"/>
-      </xs:choice>
-      <xs:element name="hex" type="xs:hexBinary"/>
-      <xs:element name="base64" type="xs:base64Binary"/>
-    </xs:sequence>
-    <xs:attribute name="gender">
-      <xs:simpleType>
-        <xs:restriction base="xs:NMTOKEN">
-          <xs:enumeration value="male"/>
-          <xs:enumeration value="female"/>
-        </xs:restriction>
-      </xs:simpleType>
-    </xs:attribute>
-    <xs:attribute name="hexAtt">
-      <xs:simpleType>
-        <xs:restriction base="xs:hexBinary">
-          <xs:pattern value="([45][0-9A-F])*"/>
-       </xs:restriction>
-      </xs:simpleType>
-    </xs:attribute>
-    <xs:attribute name="base64Att">
-      <xs:simpleType>
-        <xs:restriction base="xs:base64Binary">
-          <xs:whiteSpace value="collapse"/>
-          <xs:enumeration value="VGhpcyBzdHJpbmcgaXMgYmFzZTY0QmluYXJ5IGVuY29kZWQh"/>
-       </xs:restriction>
-      </xs:simpleType>
-    </xs:attribute>
-  </xs:complexType>
-
-  <xs:element name="customer" type="mt:person"/>
-
-  <xs:element name="employee">
-    <xs:complexType>
-      <xs:complexContent>
-        <xs:extension base="mt:person">
-          <xs:sequence>
-            <xs:element name="eid" type="xs:int"/>
-          </xs:sequence>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-</xs:schema>
-
+<xs:schema
+   xmlns:xs="http://www.w3.org/2001/XMLSchema"
+   xmlns:mt="http://openuri.org/mytest"
+   targetNamespace="http://openuri.org/mytest"
+   elementFormDefault="qualified"
+   attributeFormDefault="unqualified" >
+
+  <xs:complexType name="person">
+    <xs:sequence>
+      <xs:element name="firstname" type="xs:string"/>
+      <xs:choice maxOccurs="unbounded">
+        <xs:element name="number">
+           <xs:simpleType>
+             <xs:restriction base="xs:integer">
+               <xs:minInclusive value="1"/>
+               <xs:maxInclusive value="1000"/>
+             </xs:restriction>
+           </xs:simpleType>
+        </xs:element>
+        <xs:element name="birthday" type="xs:date"/>
+      </xs:choice>
+      <xs:element name="hex" type="xs:hexBinary"/>
+      <xs:element name="base64" type="xs:base64Binary"/>
+    </xs:sequence>
+    <xs:attribute name="gender">
+      <xs:simpleType>
+        <xs:restriction base="xs:NMTOKEN">
+          <xs:enumeration value="male"/>
+          <xs:enumeration value="female"/>
+        </xs:restriction>
+      </xs:simpleType>
+    </xs:attribute>
+    <xs:attribute name="hexAtt">
+      <xs:simpleType>
+        <xs:restriction base="xs:hexBinary">
+          <xs:pattern value="([45][0-9A-F])*"/>
+       </xs:restriction>
+      </xs:simpleType>
+    </xs:attribute>
+    <xs:attribute name="base64Att">
+      <xs:simpleType>
+        <xs:restriction base="xs:base64Binary">
+          <xs:whiteSpace value="collapse"/>
+          <xs:enumeration value="VGhpcyBzdHJpbmcgaXMgYmFzZTY0QmluYXJ5IGVuY29kZWQh"/>
+       </xs:restriction>
+      </xs:simpleType>
+    </xs:attribute>
+  </xs:complexType>
+
+  <xs:element name="customer" type="mt:person"/>
+
+  <xs:element name="employee">
+    <xs:complexType>
+      <xs:complexContent>
+        <xs:extension base="mt:person">
+          <xs:sequence>
+            <xs:element name="eid" type="xs:int"/>
+          </xs:sequence>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+</xs:schema>
+

Modified: xmlbeans/trunk/test/cases/xbean/compile/scomp/simple/simplec.xsd
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/compile/scomp/simple/simplec.xsd?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/compile/scomp/simple/simplec.xsd&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/compile/scomp/simple/simplec.xsd&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/compile/scomp/simple/simplec.xsd	(original)
+++ xmlbeans/trunk/test/cases/xbean/compile/scomp/simple/simplec.xsd	Wed Dec  8 08:54:26 2004
@@ -1,27 +1,27 @@
-<xs:schema
-   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-   xmlns:mt="http://openuri.org/mytest"
-   targetNamespace="http://openuri.org/mytest"
-   elementFormDefault="qualified"
-   attributeFormDefault="unqualified"
->
-
-  <xs:complexType name="simplicity">
-    <xs:simpleContent>
-     <xs:extension base="mt:thousand">
-       <xs:attribute name="note" type="xs:string"/>
-     </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:simpleType name="thousand">
-   <xs:restriction base="xs:integer">
-     <xs:minInclusive value="1"/>
-     <xs:maxInclusive value="1000"/>
-   </xs:restriction>
-  </xs:simpleType>
-
-  <xs:element name="simple" type="mt:simplicity"/>
-
-</xs:schema>
-
+<xs:schema
+   xmlns:xs="http://www.w3.org/2001/XMLSchema"
+   xmlns:mt="http://openuri.org/mytest"
+   targetNamespace="http://openuri.org/mytest"
+   elementFormDefault="qualified"
+   attributeFormDefault="unqualified"
+>
+
+  <xs:complexType name="simplicity">
+    <xs:simpleContent>
+     <xs:extension base="mt:thousand">
+       <xs:attribute name="note" type="xs:string"/>
+     </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:simpleType name="thousand">
+   <xs:restriction base="xs:integer">
+     <xs:minInclusive value="1"/>
+     <xs:maxInclusive value="1000"/>
+   </xs:restriction>
+  </xs:simpleType>
+
+  <xs:element name="simple" type="mt:simplicity"/>
+
+</xs:schema>
+

Modified: xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/hc_staff.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/hc_staff.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/dom/W3C/level2/core/files/hc_staff.xml&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/hc_staff.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/dom/W3C/level2/core/files/hc_staff.xml	(original)
+++ xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/hc_staff.xml	Wed Dec  8 08:54:26 2004
@@ -1,48 +1,48 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>
-
-<!-- This is comment number 1.-->
-<html xmlns='http://www.w3.org/1999/xhtml'><head><title>hc_staff</title></head><body>
- <p>
-  <em>EMP0001</em>
-  <strong>Margaret Martin</strong>
-  <code>Accountant</code>           
-  <sup>56,000</sup>
-  <var>Female</var>
-  <acronym title="Yes">1230 North Ave. Dallas, Texas 98551</acronym>
- </p>
- <p>
-  <em>EMP0002</em>
-  <strong>Martha RaynoldsThis is a CDATASection with EntityReference number 2 ent2;
-This is an adjacent CDATASection with a reference to a tab tab;</strong>
-  <code>Secretary</code>
-  <sup>35,000</sup>
-  <var>Female</var>
-  <acronym title="Yes" class="Yes"> Dallas, 
- 98554</acronym>
- </p>
- <p>
-  <em>EMP0003</em>
-  <strong>Roger
- Jones</strong>
-  <code>Department Manager</code>
-  <sup>100,000</sup>
-  <var></var>
-  <acronym title="Yes" class="No">PO Box 27 Irving, texas 98553</acronym>
- </p>
- <p>
-  <em>EMP0004</em>
-  <strong>Jeny Oconnor</strong>
-  <code>Personnel Director</code>
-  <sup>95,000</sup>
-  <var>Female</var>
-  <acronym title="Yes" class="Y;">27 South Road. Dallas, Texas 98556</acronym>
- </p>
- <p>
-  <em>EMP0005</em>
-  <strong>Robert Myers</strong>
-  <code>Computer Specialist</code>
-  <sup>90,000</sup>
-  <var>male</var>
-  <acronym title="Yes">1821 Nordic. Road, Irving Texas 98558</acronym>
- </p>
-</body></html>
+<?xml version="1.0"?><?TEST-STYLE PIDATA?>
+
+<!-- This is comment number 1.-->
+<html xmlns='http://www.w3.org/1999/xhtml'><head><title>hc_staff</title></head><body>
+ <p>
+  <em>EMP0001</em>
+  <strong>Margaret Martin</strong>
+  <code>Accountant</code>           
+  <sup>56,000</sup>
+  <var>Female</var>
+  <acronym title="Yes">1230 North Ave. Dallas, Texas 98551</acronym>
+ </p>
+ <p>
+  <em>EMP0002</em>
+  <strong>Martha RaynoldsThis is a CDATASection with EntityReference number 2 ent2;
+This is an adjacent CDATASection with a reference to a tab tab;</strong>
+  <code>Secretary</code>
+  <sup>35,000</sup>
+  <var>Female</var>
+  <acronym title="Yes" class="Yes"> Dallas, 
+ 98554</acronym>
+ </p>
+ <p>
+  <em>EMP0003</em>
+  <strong>Roger
+ Jones</strong>
+  <code>Department Manager</code>
+  <sup>100,000</sup>
+  <var></var>
+  <acronym title="Yes" class="No">PO Box 27 Irving, texas 98553</acronym>
+ </p>
+ <p>
+  <em>EMP0004</em>
+  <strong>Jeny Oconnor</strong>
+  <code>Personnel Director</code>
+  <sup>95,000</sup>
+  <var>Female</var>
+  <acronym title="Yes" class="Y;">27 South Road. Dallas, Texas 98556</acronym>
+ </p>
+ <p>
+  <em>EMP0005</em>
+  <strong>Robert Myers</strong>
+  <code>Computer Specialist</code>
+  <sup>90,000</sup>
+  <var>male</var>
+  <acronym title="Yes">1821 Nordic. Road, Irving Texas 98558</acronym>
+ </p>
+</body></html>

Modified: xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/nodtdstaff.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/nodtdstaff.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/dom/W3C/level2/core/files/nodtdstaff.xml&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/nodtdstaff.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/dom/W3C/level2/core/files/nodtdstaff.xml	(original)
+++ xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/nodtdstaff.xml	Wed Dec  8 08:54:26 2004
@@ -1,11 +1,11 @@
-<?xml version="1.0"?>
-<staff>
- <employee>
-  <employeeId>EMP0001</employeeId>
-  <name>Margaret Martin</name>
-  <position>Accountant</position>           
-  <salary>56,000</salary>
-  <gender>Female</gender>
-  <address domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>
- </employee>
-</staff>
+<?xml version="1.0"?>
+<staff>
+ <employee>
+  <employeeId>EMP0001</employeeId>
+  <name>Margaret Martin</name>
+  <position>Accountant</position>           
+  <salary>56,000</salary>
+  <gender>Female</gender>
+  <address domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>
+ </employee>
+</staff>

Modified: xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/staff.dtd
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/staff.dtd?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/dom/W3C/level2/core/files/staff.dtd&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/staff.dtd&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/dom/W3C/level2/core/files/staff.dtd	(original)
+++ xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/staff.dtd	Wed Dec  8 08:54:26 2004
@@ -1,17 +1,17 @@
-<!ELEMENT employeeId (#PCDATA)>
-<!ELEMENT name (#PCDATA)>
-<!ELEMENT position (#PCDATA)>
-<!ELEMENT salary (#PCDATA)>
-<!ELEMENT address (#PCDATA)>
-<!ELEMENT entElement ( #PCDATA ) >
-<!ELEMENT gender ( #PCDATA | entElement )* >
-<!ELEMENT employee (employeeId, name, position, salary, gender, address) >
-<!ELEMENT staff (employee)+>
-<!ATTLIST entElement 
-          attr1 CDATA "Attr">
-<!ATTLIST address
-          domestic CDATA #IMPLIED 
-          street CDATA "Yes">
-<!ATTLIST entElement 
-          domestic CDATA "MALE" >
-
+<!ELEMENT employeeId (#PCDATA)>
+<!ELEMENT name (#PCDATA)>
+<!ELEMENT position (#PCDATA)>
+<!ELEMENT salary (#PCDATA)>
+<!ELEMENT address (#PCDATA)>
+<!ELEMENT entElement ( #PCDATA ) >
+<!ELEMENT gender ( #PCDATA | entElement )* >
+<!ELEMENT employee (employeeId, name, position, salary, gender, address) >
+<!ELEMENT staff (employee)+>
+<!ATTLIST entElement 
+          attr1 CDATA "Attr">
+<!ATTLIST address
+          domestic CDATA #IMPLIED 
+          street CDATA "Yes">
+<!ATTLIST entElement 
+          domestic CDATA "MALE" >
+

Modified: xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/staff.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/staff.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/dom/W3C/level2/core/files/staff.xml&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/staff.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/dom/W3C/level2/core/files/staff.xml	(original)
+++ xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/staff.xml	Wed Dec  8 08:54:26 2004
@@ -1,48 +1,48 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>
-
-<!-- This is comment number 1.-->
-<staff>
- <employee>
-  <employeeId>EMP0001</employeeId>
-  <name>Margaret Martin</name>
-  <position>Accountant</position>           
-  <salary>56,000</salary>
-  <gender>Female</gender>
-  <address domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>
- </employee>
- <employee>
-  <employeeId>EMP0002</employeeId>
-  <name>Martha Raynolds<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>
-  <position>Secretary</position>
-  <salary>35,000</salary>
-  <gender>Female</gender>
-  <address domestic="Yes" street="Yes"> Dallas,
- 98554</address>
- </employee>
- <employee>
-  <employeeId>EMP0003</employeeId>
-  <name>Roger
- Jones</name>
-  <position>Department Manager</position>
-  <salary>100,000</salary>
-  <gender></gender>
-  <address domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>
- </employee>
- <employee>
-  <employeeId>EMP0004</employeeId>
-  <name>Jeny Oconnor</name>
-  <position>Personnel Director</position>
-  <salary>95,000</salary>
-  <gender>Female</gender>
-  <address domestic="Yes" street="Y">27 South Road. Dallas, Texas 98556</address>
- </employee>
- <employee>
-  <employeeId>EMP0005</employeeId>
-  <name>Robert Myers</name>
-  <position>Computer Specialist</position>
-  <salary>90,000</salary>
-  <gender>male</gender>
-  <address street="Yes">1821 Nordic. Road, Irving Texas 98558</address>
- </employee>
- </staff>
+<?xml version="1.0"?><?TEST-STYLE PIDATA?>
+
+<!-- This is comment number 1.-->
+<staff>
+ <employee>
+  <employeeId>EMP0001</employeeId>
+  <name>Margaret Martin</name>
+  <position>Accountant</position>           
+  <salary>56,000</salary>
+  <gender>Female</gender>
+  <address domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>
+ </employee>
+ <employee>
+  <employeeId>EMP0002</employeeId>
+  <name>Martha Raynolds<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>
+<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>
+  <position>Secretary</position>
+  <salary>35,000</salary>
+  <gender>Female</gender>
+  <address domestic="Yes" street="Yes"> Dallas,
+ 98554</address>
+ </employee>
+ <employee>
+  <employeeId>EMP0003</employeeId>
+  <name>Roger
+ Jones</name>
+  <position>Department Manager</position>
+  <salary>100,000</salary>
+  <gender></gender>
+  <address domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>
+ </employee>
+ <employee>
+  <employeeId>EMP0004</employeeId>
+  <name>Jeny Oconnor</name>
+  <position>Personnel Director</position>
+  <salary>95,000</salary>
+  <gender>Female</gender>
+  <address domestic="Yes" street="Y">27 South Road. Dallas, Texas 98556</address>
+ </employee>
+ <employee>
+  <employeeId>EMP0005</employeeId>
+  <name>Robert Myers</name>
+  <position>Computer Specialist</position>
+  <salary>90,000</salary>
+  <gender>male</gender>
+  <address street="Yes">1821 Nordic. Road, Irving Texas 98558</address>
+ </employee>
+ </staff>

Modified: xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/staff2.dtd
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/staff2.dtd?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/dom/W3C/level2/core/files/staff2.dtd&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/staff2.dtd&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/dom/W3C/level2/core/files/staff2.dtd	(original)
+++ xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/staff2.dtd	Wed Dec  8 08:54:26 2004
@@ -1,8 +1,8 @@
-<!ELEMENT employeeId (#PCDATA)>
-<!ELEMENT name (#PCDATA)>
-<!ELEMENT position (#PCDATA)>
-<!ELEMENT salary (#PCDATA)>
-<!ELEMENT address (#PCDATA)>
-<!ELEMENT gender ( #PCDATA)>
-<!ELEMENT employee (employeeId, name, position, salary, gender, address) >
-<!ELEMENT staff (employee)+>
+<!ELEMENT employeeId (#PCDATA)>
+<!ELEMENT name (#PCDATA)>
+<!ELEMENT position (#PCDATA)>
+<!ELEMENT salary (#PCDATA)>
+<!ELEMENT address (#PCDATA)>
+<!ELEMENT gender ( #PCDATA)>
+<!ELEMENT employee (employeeId, name, position, salary, gender, address) >
+<!ELEMENT staff (employee)+>

Modified: xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/staff2.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/staff2.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/dom/W3C/level2/core/files/staff2.xml&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/staff2.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/dom/W3C/level2/core/files/staff2.xml	(original)
+++ xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/staff2.xml	Wed Dec  8 08:54:26 2004
@@ -1,13 +1,13 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>
-
-<!-- This is comment number 1.-->
-<staff>
- <employee>
-  <employeeId>EMP0001</employeeId>
-  <name>Margaret Martin</name>
-  <position>Accountant</position>           
-  <salary>56,000</salary>
-  <gender>Female</gender>
-  <address>1230 North Ave. Dallas, Texas 98551</address>
- </employee>
- </staff>
+<?xml version="1.0"?><?TEST-STYLE PIDATA?>
+
+<!-- This is comment number 1.-->
+<staff>
+ <employee>
+  <employeeId>EMP0001</employeeId>
+  <name>Margaret Martin</name>
+  <position>Accountant</position>           
+  <salary>56,000</salary>
+  <gender>Female</gender>
+  <address>1230 North Ave. Dallas, Texas 98551</address>
+ </employee>
+ </staff>

Modified: xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/staffNS.dtd
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/staffNS.dtd?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/dom/W3C/level2/core/files/staffNS.dtd&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/staffNS.dtd&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/dom/W3C/level2/core/files/staffNS.dtd	(original)
+++ xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/staffNS.dtd	Wed Dec  8 08:54:26 2004
@@ -1,45 +1,45 @@
-<!ELEMENT staff (employee+,emp:employee,employee) >
-<!ELEMENT employee (employeeId,name,position,salary,gender,address) >
-<!ATTLIST employee xmlns CDATA #IMPLIED>
-<!ATTLIST employee xmlns:dmstc CDATA #IMPLIED>
-<!ATTLIST employee xmlns:emp2 CDATA #IMPLIED>
-
-<!ELEMENT employeeId (#PCDATA) >
-
-<!ELEMENT name (#PCDATA) >
-
-<!ELEMENT position (#PCDATA) >
-
-<!ELEMENT salary (#PCDATA) >
-
-<!ELEMENT entElement1 (#PCDATA) >
-<!ELEMENT gender (#PCDATA | entElement1)* >
-<!ATTLIST entElement1 xmlns:local1 CDATA #IMPLIED >
-
-<!ELEMENT address (#PCDATA) >
-<!ATTLIST address dmstc:domestic CDATA #IMPLIED>
-<!ATTLIST address street CDATA #IMPLIED>
-<!ATTLIST address domestic CDATA #IMPLIED>
-<!ATTLIST address xmlns CDATA #IMPLIED>
-
-<!ELEMENT emp:employee (emp:employeeId,nm:name,emp:position,emp:salary,emp:gender,emp:address) >
-<!ATTLIST emp:employee xmlns:emp CDATA #IMPLIED>
-<!ATTLIST emp:employee xmlns:nm CDATA #IMPLIED>
-<!ATTLIST emp:employee defaultAttr CDATA 'defaultVal'>
-
-<!ELEMENT emp:employeeId (#PCDATA) >
-
-<!ELEMENT nm:name (#PCDATA) >
-
-<!ELEMENT emp:position (#PCDATA) >
-
-<!ELEMENT emp:salary (#PCDATA) >
-
-<!ELEMENT emp:gender (#PCDATA) >
-
-<!ELEMENT emp:address (#PCDATA) >
-<!ATTLIST emp:address emp:domestic CDATA #IMPLIED>
-<!ATTLIST emp:address street CDATA #IMPLIED>
-<!ATTLIST emp:address emp:zone ID #IMPLIED>
-<!ATTLIST emp:address emp:district CDATA 'DISTRICT'>
-<!ATTLIST emp:address emp:local1 CDATA 'FALSE'>
+<!ELEMENT staff (employee+,emp:employee,employee) >
+<!ELEMENT employee (employeeId,name,position,salary,gender,address) >
+<!ATTLIST employee xmlns CDATA #IMPLIED>
+<!ATTLIST employee xmlns:dmstc CDATA #IMPLIED>
+<!ATTLIST employee xmlns:emp2 CDATA #IMPLIED>
+
+<!ELEMENT employeeId (#PCDATA) >
+
+<!ELEMENT name (#PCDATA) >
+
+<!ELEMENT position (#PCDATA) >
+
+<!ELEMENT salary (#PCDATA) >
+
+<!ELEMENT entElement1 (#PCDATA) >
+<!ELEMENT gender (#PCDATA | entElement1)* >
+<!ATTLIST entElement1 xmlns:local1 CDATA #IMPLIED >
+
+<!ELEMENT address (#PCDATA) >
+<!ATTLIST address dmstc:domestic CDATA #IMPLIED>
+<!ATTLIST address street CDATA #IMPLIED>
+<!ATTLIST address domestic CDATA #IMPLIED>
+<!ATTLIST address xmlns CDATA #IMPLIED>
+
+<!ELEMENT emp:employee (emp:employeeId,nm:name,emp:position,emp:salary,emp:gender,emp:address) >
+<!ATTLIST emp:employee xmlns:emp CDATA #IMPLIED>
+<!ATTLIST emp:employee xmlns:nm CDATA #IMPLIED>
+<!ATTLIST emp:employee defaultAttr CDATA 'defaultVal'>
+
+<!ELEMENT emp:employeeId (#PCDATA) >
+
+<!ELEMENT nm:name (#PCDATA) >
+
+<!ELEMENT emp:position (#PCDATA) >
+
+<!ELEMENT emp:salary (#PCDATA) >
+
+<!ELEMENT emp:gender (#PCDATA) >
+
+<!ELEMENT emp:address (#PCDATA) >
+<!ATTLIST emp:address emp:domestic CDATA #IMPLIED>
+<!ATTLIST emp:address street CDATA #IMPLIED>
+<!ATTLIST emp:address emp:zone ID #IMPLIED>
+<!ATTLIST emp:address emp:district CDATA 'DISTRICT'>
+<!ATTLIST emp:address emp:local1 CDATA 'FALSE'>

Modified: xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/staffNS.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/staffNS.xml?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/dom/W3C/level2/core/files/staffNS.xml&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/staffNS.xml&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/dom/W3C/level2/core/files/staffNS.xml	(original)
+++ xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/staffNS.xml	Wed Dec  8 08:54:26 2004
@@ -1,48 +1,48 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>
-
-<!-- This is comment number 1.-->
-<staff>
- <employee xmlns="http://www.nist.gov" xmlns:dmstc="http://www.usa.com">
-  <employeeId>EMP0001</employeeId>
-  <name>Margaret Martin</name>
-  <position>Accountant</position>           
-  <salary>56,000</salary>
-  <gender>Female</gender>
-  <address dmstc:domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>
- </employee>
- <employee xmlns:dmstc="http://www.usa.com">
-  <employeeId>EMP0002</employeeId>
-  <name>Martha Raynolds
-<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>
-  <position>Secretary</position>
-  <salary>35,000</salary>
-  <gender>Female</gender>
-  <address dmstc:domestic="Yes" street="Yes"> Dallas,
- 98554</address>
- </employee>
- <employee xmlns:dmstc="http://www.netzero.com">
-  <employeeId>EMP0003</employeeId>
-  <name>Roger
- Jones</name>
-  <position>Department Manager</position>
-  <salary>100,000</salary>
-  <gender></gender>
-  <address dmstc:domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>
- </employee>
- <emp:employee xmlns:emp="http://www.nist.gov" xmlns:nm="http://www.altavista.com" >    <emp:employeeId>EMP0004</emp:employeeId>
-  <nm:name>Jeny Oconnor</nm:name>
-  <emp:position>Personnel Director</emp:position>
-  <emp:salary>95,000</emp:salary>
-  <emp:gender>Female</emp:gender>
-  <emp:address emp:domestic="Yes" street="Y" emp:zone="CANADA" emp:local1="TRUE">27 South Road. Dallas, texas 98556</emp:address>
- </emp:employee>
- <employee xmlns:emp2="http://www.nist.gov">
-  <employeeId>EMP0005</employeeId>
-  <name>Robert Myers</name>
-  <position>Computer Specialist</position>
-  <salary>90,000</salary>
-  <gender>male</gender>
-  <address street="Yes" xmlns="http://www.nist.gov">1821 Nordic. Road, Irving Texas 98558</address>
- </employee>
- </staff>
+<?xml version="1.0"?><?TEST-STYLE PIDATA?>
+
+<!-- This is comment number 1.-->
+<staff>
+ <employee xmlns="http://www.nist.gov" xmlns:dmstc="http://www.usa.com">
+  <employeeId>EMP0001</employeeId>
+  <name>Margaret Martin</name>
+  <position>Accountant</position>           
+  <salary>56,000</salary>
+  <gender>Female</gender>
+  <address dmstc:domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>
+ </employee>
+ <employee xmlns:dmstc="http://www.usa.com">
+  <employeeId>EMP0002</employeeId>
+  <name>Martha Raynolds
+<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>
+<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>
+  <position>Secretary</position>
+  <salary>35,000</salary>
+  <gender>Female</gender>
+  <address dmstc:domestic="Yes" street="Yes"> Dallas,
+ 98554</address>
+ </employee>
+ <employee xmlns:dmstc="http://www.netzero.com">
+  <employeeId>EMP0003</employeeId>
+  <name>Roger
+ Jones</name>
+  <position>Department Manager</position>
+  <salary>100,000</salary>
+  <gender></gender>
+  <address dmstc:domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>
+ </employee>
+ <emp:employee xmlns:emp="http://www.nist.gov" xmlns:nm="http://www.altavista.com" >    <emp:employeeId>EMP0004</emp:employeeId>
+  <nm:name>Jeny Oconnor</nm:name>
+  <emp:position>Personnel Director</emp:position>
+  <emp:salary>95,000</emp:salary>
+  <emp:gender>Female</emp:gender>
+  <emp:address emp:domestic="Yes" street="Y" emp:zone="CANADA" emp:local1="TRUE">27 South Road. Dallas, texas 98556</emp:address>
+ </emp:employee>
+ <employee xmlns:emp2="http://www.nist.gov">
+  <employeeId>EMP0005</employeeId>
+  <name>Robert Myers</name>
+  <position>Computer Specialist</position>
+  <salary>90,000</salary>
+  <gender>male</gender>
+  <address street="Yes" xmlns="http://www.nist.gov">1821 Nordic. Road, Irving Texas 98558</address>
+ </employee>
+ </staff>

Modified: xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/xhtml1-frameset.dtd
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/xhtml1-frameset.dtd?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/dom/W3C/level2/core/files/xhtml1-frameset.dtd&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/xhtml1-frameset.dtd&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/dom/W3C/level2/core/files/xhtml1-frameset.dtd	(original)
+++ xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/xhtml1-frameset.dtd	Wed Dec  8 08:54:26 2004
@@ -1,1235 +1,1235 @@
-<!--
-   Extensible HTML version 1.0 Frameset DTD
-
-   This is the same as HTML 4 Frameset except for
-   changes due to the differences between XML and SGML.
-
-   Namespace = http://www.w3.org/1999/xhtml
-
-   For further information, see: http://www.w3.org/TR/xhtml1
-
-   Copyright (c) 1998-2002 W3C (MIT, INRIA, Keio),
-   All Rights Reserved. 
-
-   This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-   PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
-   SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd"
-
-   $Revision: 1.1 $
-   $Date: 2004/06/08 19:37:55 $
-
--->
-
-<!--================ Character mnemonic entities =========================-->
-
-<!ENTITY % HTMLlat1 PUBLIC
-   "-//W3C//ENTITIES Latin 1 for XHTML//EN"
-   "xhtml-lat1.ent">
-%HTMLlat1;
-
-<!ENTITY % HTMLsymbol PUBLIC
-   "-//W3C//ENTITIES Symbols for XHTML//EN"
-   "xhtml-symbol.ent">
-%HTMLsymbol;
-
-<!ENTITY % HTMLspecial PUBLIC
-   "-//W3C//ENTITIES Special for XHTML//EN"
-   "xhtml-special.ent">
-%HTMLspecial;
-
-<!--================== Imported Names ====================================-->
-
-<!ENTITY % ContentType "CDATA">
-    <!-- media type, as per [RFC2045] -->
-
-<!ENTITY % ContentTypes "CDATA">
-    <!-- comma-separated list of media types, as per [RFC2045] -->
-
-<!ENTITY % Charset "CDATA">
-    <!-- a character encoding, as per [RFC2045] -->
-
-<!ENTITY % Charsets "CDATA">
-    <!-- a space separated list of character encodings, as per [RFC2045] -->
-
-<!ENTITY % LanguageCode "NMTOKEN">
-    <!-- a language code, as per [RFC3066] -->
-
-<!ENTITY % Character "CDATA">
-    <!-- a single character, as per section 2.2 of [XML] -->
-
-<!ENTITY % Number "CDATA">
-    <!-- one or more digits -->
-
-<!ENTITY % LinkTypes "CDATA">
-    <!-- space-separated list of link types -->
-
-<!ENTITY % MediaDesc "CDATA">
-    <!-- single or comma-separated list of media descriptors -->
-
-<!ENTITY % URI "CDATA">
-    <!-- a Uniform Resource Identifier, see [RFC2396] -->
-
-<!ENTITY % UriList "CDATA">
-    <!-- a space separated list of Uniform Resource Identifiers -->
-
-<!ENTITY % Datetime "CDATA">
-    <!-- date and time information. ISO date format -->
-
-<!ENTITY % Script "CDATA">
-    <!-- script expression -->
-
-<!ENTITY % StyleSheet "CDATA">
-    <!-- style sheet data -->
-
-<!ENTITY % Text "CDATA">
-    <!-- used for titles etc. -->
-
-<!ENTITY % FrameTarget "NMTOKEN">
-    <!-- render in this frame -->
-
-<!ENTITY % Length "CDATA">
-    <!-- nn for pixels or nn% for percentage length -->
-
-<!ENTITY % MultiLength "CDATA">
-    <!-- pixel, percentage, or relative -->
-
-<!ENTITY % MultiLengths "CDATA">
-    <!-- comma-separated list of MultiLength -->
-
-<!ENTITY % Pixels "CDATA">
-    <!-- integer representing length in pixels -->
-
-<!-- these are used for image maps -->
-
-<!ENTITY % Shape "(rect|circle|poly|default)">
-
-<!ENTITY % Coords "CDATA">
-    <!-- comma separated list of lengths -->
-
-<!-- used for object, applet, img, input and iframe -->
-<!ENTITY % ImgAlign "(top|middle|bottom|left|right)">
-
-<!-- a color using sRGB: #RRGGBB as Hex values -->
-<!ENTITY % Color "CDATA">
-
-<!-- There are also 16 widely known color names with their sRGB values:
-
-    Black  = #000000    Green  = #008000
-    Silver = #C0C0C0    Lime   = #00FF00
-    Gray   = #808080    Olive  = #808000
-    White  = #FFFFFF    Yellow = #FFFF00
-    Maroon = #800000    Navy   = #000080
-    Red    = #FF0000    Blue   = #0000FF
-    Purple = #800080    Teal   = #008080
-    Fuchsia= #FF00FF    Aqua   = #00FFFF
--->
-
-<!--=================== Generic Attributes ===============================-->
-
-<!-- core attributes common to most elements
-  id       document-wide unique id
-  class    space separated list of classes
-  style    associated style info
-  title    advisory title/amplification
--->
-<!ENTITY % coreattrs
- "id          ID             #IMPLIED
-  class       CDATA          #IMPLIED
-  style       %StyleSheet;   #IMPLIED
-  title       %Text;         #IMPLIED"
-  >
-
-<!-- internationalization attributes
-  lang        language code (backwards compatible)
-  xml:lang    language code (as per XML 1.0 spec)
-  dir         direction for weak/neutral text
--->
-<!ENTITY % i18n
- "lang        %LanguageCode; #IMPLIED
-  xml:lang    %LanguageCode; #IMPLIED
-  dir         (ltr|rtl)      #IMPLIED"
-  >
-
-<!-- attributes for common UI events
-  onclick     a pointer button was clicked
-  ondblclick  a pointer button was double clicked
-  onmousedown a pointer button was pressed down
-  onmouseup   a pointer button was released
-  onmousemove a pointer was moved onto the element
-  onmouseout  a pointer was moved away from the element
-  onkeypress  a key was pressed and released
-  onkeydown   a key was pressed down
-  onkeyup     a key was released
--->
-<!ENTITY % events
- "onclick     %Script;       #IMPLIED
-  ondblclick  %Script;       #IMPLIED
-  onmousedown %Script;       #IMPLIED
-  onmouseup   %Script;       #IMPLIED
-  onmouseover %Script;       #IMPLIED
-  onmousemove %Script;       #IMPLIED
-  onmouseout  %Script;       #IMPLIED
-  onkeypress  %Script;       #IMPLIED
-  onkeydown   %Script;       #IMPLIED
-  onkeyup     %Script;       #IMPLIED"
-  >
-
-<!-- attributes for elements that can get the focus
-  accesskey   accessibility key character
-  tabindex    position in tabbing order
-  onfocus     the element got the focus
-  onblur      the element lost the focus
--->
-<!ENTITY % focus
- "accesskey   %Character;    #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED"
-  >
-
-<!ENTITY % attrs "%coreattrs; %i18n; %events;">
-
-<!-- text alignment for p, div, h1-h6. The default is
-     align="left" for ltr headings, "right" for rtl -->
-
-<!ENTITY % TextAlign "align (left|center|right|justify) #IMPLIED">
-
-<!--=================== Text Elements ====================================-->
-
-<!ENTITY % special.extra
-   "object | applet | img | map | iframe">
-	
-<!ENTITY % special.basic
-	"br | span | bdo">
-
-<!ENTITY % special
-   "%special.basic; | %special.extra;">
-
-<!ENTITY % fontstyle.extra "big | small | font | basefont">
-
-<!ENTITY % fontstyle.basic "tt | i | b | u
-                      | s | strike ">
-
-<!ENTITY % fontstyle "%fontstyle.basic; | %fontstyle.extra;">
-
-<!ENTITY % phrase.extra "sub | sup">
-<!ENTITY % phrase.basic "em | strong | dfn | code | q |
-                   samp | kbd | var | cite | abbr | acronym">
-
-<!ENTITY % phrase "%phrase.basic; | %phrase.extra;">
-
-<!ENTITY % inline.forms "input | select | textarea | label | button">
-
-<!-- these can occur at block or inline level -->
-<!ENTITY % misc.inline "ins | del | script">
-
-<!-- these can only occur at block level -->
-<!ENTITY % misc "noscript | %misc.inline;">
-
-
-<!ENTITY % inline "a | %special; | %fontstyle; | %phrase; | %inline.forms;">
-
-<!-- %Inline; covers inline or "text-level" elements -->
-<!ENTITY % Inline "(#PCDATA | %inline; | %misc.inline;)*">
-
-<!--================== Block level elements ==============================-->
-
-<!ENTITY % heading "h1|h2|h3|h4|h5|h6">
-<!ENTITY % lists "ul | ol | dl | menu | dir">
-<!ENTITY % blocktext "pre | hr | blockquote | address | center">
-
-<!ENTITY % block
-    "p | %heading; | div | %lists; | %blocktext; | isindex | fieldset | table">
-
-<!-- %Flow; mixes block and inline and is used for list items etc. -->
-<!ENTITY % Flow "(#PCDATA | %block; | form | %inline; | %misc;)*">
-
-<!--================== Content models for exclusions =====================-->
-
-<!-- a elements use %Inline; excluding a -->
-
-<!ENTITY % a.content
-   "(#PCDATA | %special; | %fontstyle; | %phrase; | %inline.forms; | %misc.inline;)*">
-
-<!-- pre uses %Inline excluding img, object, applet, big, small,
-     sub, sup, font, or basefont -->
-
-<!ENTITY % pre.content
-   "(#PCDATA | a | %special.basic; | %fontstyle.basic; | %phrase.basic; |
-	   %inline.forms; | %misc.inline;)*">
-
-
-<!-- form uses %Flow; excluding form -->
-
-<!ENTITY % form.content "(#PCDATA | %block; | %inline; | %misc;)*">
-
-<!-- button uses %Flow; but excludes a, form, form controls, iframe -->
-
-<!ENTITY % button.content
-   "(#PCDATA | p | %heading; | div | %lists; | %blocktext; |
-      table | br | span | bdo | object | applet | img | map |
-      %fontstyle; | %phrase; | %misc;)*">
-
-<!--================ Document Structure ==================================-->
-
-<!-- the namespace URI designates the document profile -->
-
-<!ELEMENT html (head, frameset)>
-<!ATTLIST html
-  %i18n;
-  id          ID             #IMPLIED
-  xmlns       %URI;          #FIXED 'http://www.w3.org/1999/xhtml'
-  >
-
-<!--================ Document Head =======================================-->
-
-<!ENTITY % head.misc "(script|style|meta|link|object|isindex)*">
-
-<!-- content model is %head.misc; combined with a single
-     title and an optional base element in any order -->
-
-<!ELEMENT head (%head.misc;,
-     ((title, %head.misc;, (base, %head.misc;)?) |
-      (base, %head.misc;, (title, %head.misc;))))>
-
-<!ATTLIST head
-  %i18n;
-  id          ID             #IMPLIED
-  profile     %URI;          #IMPLIED
-  >
-
-<!-- The title element is not considered part of the flow of text.
-       It should be displayed, for example as the page header or
-       window title. Exactly one title is required per document.
-    -->
-<!ELEMENT title (#PCDATA)>
-<!ATTLIST title 
-  %i18n;
-  id          ID             #IMPLIED
-  >
-
-<!-- document base URI -->
-
-<!ELEMENT base EMPTY>
-<!ATTLIST base
-  id          ID             #IMPLIED
-  href        %URI;          #IMPLIED
-  target      %FrameTarget;  #IMPLIED
-  >
-
-<!-- generic metainformation -->
-<!ELEMENT meta EMPTY>
-<!ATTLIST meta
-  %i18n;
-  id          ID             #IMPLIED
-  http-equiv  CDATA          #IMPLIED
-  name        CDATA          #IMPLIED
-  content     CDATA          #REQUIRED
-  scheme      CDATA          #IMPLIED
-  >
-
-<!--
-  Relationship values can be used in principle:
-
-   a) for document specific toolbars/menus when used
-      with the link element in document head e.g.
-        start, contents, previous, next, index, end, help
-   b) to link to a separate style sheet (rel="stylesheet")
-   c) to make a link to a script (rel="script")
-   d) by stylesheets to control how collections of
-      html nodes are rendered into printed documents
-   e) to make a link to a printable version of this document
-      e.g. a PostScript or PDF version (rel="alternate" media="print")
--->
-
-<!ELEMENT link EMPTY>
-<!ATTLIST link
-  %attrs;
-  charset     %Charset;      #IMPLIED
-  href        %URI;          #IMPLIED
-  hreflang    %LanguageCode; #IMPLIED
-  type        %ContentType;  #IMPLIED
-  rel         %LinkTypes;    #IMPLIED
-  rev         %LinkTypes;    #IMPLIED
-  media       %MediaDesc;    #IMPLIED
-  target      %FrameTarget;  #IMPLIED
-  >
-
-<!-- style info, which may include CDATA sections -->
-<!ELEMENT style (#PCDATA)>
-<!ATTLIST style
-  %i18n;
-  id          ID             #IMPLIED
-  type        %ContentType;  #REQUIRED
-  media       %MediaDesc;    #IMPLIED
-  title       %Text;         #IMPLIED
-  xml:space   (preserve)     #FIXED 'preserve'
-  >
-
-<!-- script statements, which may include CDATA sections -->
-<!ELEMENT script (#PCDATA)>
-<!ATTLIST script
-  id          ID             #IMPLIED
-  charset     %Charset;      #IMPLIED
-  type        %ContentType;  #REQUIRED
-  language    CDATA          #IMPLIED
-  src         %URI;          #IMPLIED
-  defer       (defer)        #IMPLIED
-  xml:space   (preserve)     #FIXED 'preserve'
-  >
-
-<!-- alternate content container for non script-based rendering -->
-
-<!ELEMENT noscript %Flow;>
-<!ATTLIST noscript
-  %attrs;
-  >
-
-<!--======================= Frames =======================================-->
-
-<!-- only one noframes element permitted per document -->
-
-<!ELEMENT frameset (frameset|frame|noframes)*>
-<!ATTLIST frameset
-  %coreattrs;
-  rows        %MultiLengths; #IMPLIED
-  cols        %MultiLengths; #IMPLIED
-  onload      %Script;       #IMPLIED
-  onunload    %Script;       #IMPLIED
-  >
-
-<!-- reserved frame names start with "_" otherwise starts with letter -->
-
-<!-- tiled window within frameset -->
-
-<!ELEMENT frame EMPTY>
-<!ATTLIST frame
-  %coreattrs;
-  longdesc    %URI;          #IMPLIED
-  name        NMTOKEN        #IMPLIED
-  src         %URI;          #IMPLIED
-  frameborder (1|0)          "1"
-  marginwidth %Pixels;       #IMPLIED
-  marginheight %Pixels;      #IMPLIED
-  noresize    (noresize)     #IMPLIED
-  scrolling   (yes|no|auto)  "auto"
-  >
-
-<!-- inline subwindow -->
-
-<!ELEMENT iframe %Flow;>
-<!ATTLIST iframe
-  %coreattrs;
-  longdesc    %URI;          #IMPLIED
-  name        NMTOKEN        #IMPLIED
-  src         %URI;          #IMPLIED
-  frameborder (1|0)          "1"
-  marginwidth %Pixels;       #IMPLIED
-  marginheight %Pixels;      #IMPLIED
-  scrolling   (yes|no|auto)  "auto"
-  align       %ImgAlign;     #IMPLIED
-  height      %Length;       #IMPLIED
-  width       %Length;       #IMPLIED
-  >
-
-<!-- alternate content container for non frame-based rendering -->
-
-<!ELEMENT noframes (body)>
-<!ATTLIST noframes
-  %attrs;
-  >
-
-<!--=================== Document Body ====================================-->
-
-<!ELEMENT body %Flow;>
-<!ATTLIST body
-  %attrs;
-  onload      %Script;       #IMPLIED
-  onunload    %Script;       #IMPLIED
-  background  %URI;          #IMPLIED
-  bgcolor     %Color;        #IMPLIED
-  text        %Color;        #IMPLIED
-  link        %Color;        #IMPLIED
-  vlink       %Color;        #IMPLIED
-  alink       %Color;        #IMPLIED
-  >
-
-<!ELEMENT div %Flow;>  <!-- generic language/style container -->
-<!ATTLIST div
-  %attrs;
-  %TextAlign;
-  >
-
-<!--=================== Paragraphs =======================================-->
-
-<!ELEMENT p %Inline;>
-<!ATTLIST p
-  %attrs;
-  %TextAlign;
-  >
-
-<!--=================== Headings =========================================-->
-
-<!--
-  There are six levels of headings from h1 (the most important)
-  to h6 (the least important).
--->
-
-<!ELEMENT h1  %Inline;>
-<!ATTLIST h1
-  %attrs;
-  %TextAlign;
-  >
-
-<!ELEMENT h2 %Inline;>
-<!ATTLIST h2
-  %attrs;
-  %TextAlign;
-  >
-
-<!ELEMENT h3 %Inline;>
-<!ATTLIST h3
-  %attrs;
-  %TextAlign;
-  >
-
-<!ELEMENT h4 %Inline;>
-<!ATTLIST h4
-  %attrs;
-  %TextAlign;
-  >
-
-<!ELEMENT h5 %Inline;>
-<!ATTLIST h5
-  %attrs;
-  %TextAlign;
-  >
-
-<!ELEMENT h6 %Inline;>
-<!ATTLIST h6
-  %attrs;
-  %TextAlign;
-  >
-
-<!--=================== Lists ============================================-->
-
-<!-- Unordered list bullet styles -->
-
-<!ENTITY % ULStyle "(disc|square|circle)">
-
-<!-- Unordered list -->
-
-<!ELEMENT ul (li)+>
-<!ATTLIST ul
-  %attrs;
-  type        %ULStyle;     #IMPLIED
-  compact     (compact)     #IMPLIED
-  >
-
-<!-- Ordered list numbering style
-
-    1   arabic numbers      1, 2, 3, ...
-    a   lower alpha         a, b, c, ...
-    A   upper alpha         A, B, C, ...
-    i   lower roman         i, ii, iii, ...
-    I   upper roman         I, II, III, ...
-
-    The style is applied to the sequence number which by default
-    is reset to 1 for the first list item in an ordered list.
--->
-<!ENTITY % OLStyle "CDATA">
-
-<!-- Ordered (numbered) list -->
-
-<!ELEMENT ol (li)+>
-<!ATTLIST ol
-  %attrs;
-  type        %OLStyle;      #IMPLIED
-  compact     (compact)      #IMPLIED
-  start       %Number;       #IMPLIED
-  >
-
-<!-- single column list (DEPRECATED) --> 
-<!ELEMENT menu (li)+>
-<!ATTLIST menu
-  %attrs;
-  compact     (compact)     #IMPLIED
-  >
-
-<!-- multiple column list (DEPRECATED) --> 
-<!ELEMENT dir (li)+>
-<!ATTLIST dir
-  %attrs;
-  compact     (compact)     #IMPLIED
-  >
-
-<!-- LIStyle is constrained to: "(%ULStyle;|%OLStyle;)" -->
-<!ENTITY % LIStyle "CDATA">
-
-<!-- list item -->
-
-<!ELEMENT li %Flow;>
-<!ATTLIST li
-  %attrs;
-  type        %LIStyle;      #IMPLIED
-  value       %Number;       #IMPLIED
-  >
-
-<!-- definition lists - dt for term, dd for its definition -->
-
-<!ELEMENT dl (dt|dd)+>
-<!ATTLIST dl
-  %attrs;
-  compact     (compact)      #IMPLIED
-  >
-
-<!ELEMENT dt %Inline;>
-<!ATTLIST dt
-  %attrs;
-  >
-
-<!ELEMENT dd %Flow;>
-<!ATTLIST dd
-  %attrs;
-  >
-
-<!--=================== Address ==========================================-->
-
-<!-- information on author -->
-
-<!ELEMENT address (#PCDATA | %inline; | %misc.inline; | p)*>
-<!ATTLIST address
-  %attrs;
-  >
-
-<!--=================== Horizontal Rule ==================================-->
-
-<!ELEMENT hr EMPTY>
-<!ATTLIST hr
-  %attrs;
-  align       (left|center|right) #IMPLIED
-  noshade     (noshade)      #IMPLIED
-  size        %Pixels;       #IMPLIED
-  width       %Length;       #IMPLIED
-  >
-
-<!--=================== Preformatted Text ================================-->
-
-<!-- content is %Inline; excluding 
-        "img|object|applet|big|small|sub|sup|font|basefont" -->
-
-<!ELEMENT pre %pre.content;>
-<!ATTLIST pre
-  %attrs;
-  width       %Number;      #IMPLIED
-  xml:space   (preserve)    #FIXED 'preserve'
-  >
-
-<!--=================== Block-like Quotes ================================-->
-
-<!ELEMENT blockquote %Flow;>
-<!ATTLIST blockquote
-  %attrs;
-  cite        %URI;          #IMPLIED
-  >
-
-<!--=================== Text alignment ===================================-->
-
-<!-- center content -->
-<!ELEMENT center %Flow;>
-<!ATTLIST center
-  %attrs;
-  >
-
-<!--=================== Inserted/Deleted Text ============================-->
-
-
-<!--
-  ins/del are allowed in block and inline content, but its
-  inappropriate to include block content within an ins element
-  occurring in inline content.
--->
-<!ELEMENT ins %Flow;>
-<!ATTLIST ins
-  %attrs;
-  cite        %URI;          #IMPLIED
-  datetime    %Datetime;     #IMPLIED
-  >
-
-<!ELEMENT del %Flow;>
-<!ATTLIST del
-  %attrs;
-  cite        %URI;          #IMPLIED
-  datetime    %Datetime;     #IMPLIED
-  >
-
-<!--================== The Anchor Element ================================-->
-
-<!-- content is %Inline; except that anchors shouldn't be nested -->
-
-<!ELEMENT a %a.content;>
-<!ATTLIST a
-  %attrs;
-  %focus;
-  charset     %Charset;      #IMPLIED
-  type        %ContentType;  #IMPLIED
-  name        NMTOKEN        #IMPLIED
-  href        %URI;          #IMPLIED
-  hreflang    %LanguageCode; #IMPLIED
-  rel         %LinkTypes;    #IMPLIED
-  rev         %LinkTypes;    #IMPLIED
-  shape       %Shape;        "rect"
-  coords      %Coords;       #IMPLIED
-  target      %FrameTarget;  #IMPLIED
-  >
-
-<!--===================== Inline Elements ================================-->
-
-<!ELEMENT span %Inline;> <!-- generic language/style container -->
-<!ATTLIST span
-  %attrs;
-  >
-
-<!ELEMENT bdo %Inline;>  <!-- I18N BiDi over-ride -->
-<!ATTLIST bdo
-  %coreattrs;
-  %events;
-  lang        %LanguageCode; #IMPLIED
-  xml:lang    %LanguageCode; #IMPLIED
-  dir         (ltr|rtl)      #REQUIRED
-  >
-
-<!ELEMENT br EMPTY>   <!-- forced line break -->
-<!ATTLIST br
-  %coreattrs;
-  clear       (left|all|right|none) "none"
-  >
-
-<!ELEMENT em %Inline;>   <!-- emphasis -->
-<!ATTLIST em %attrs;>
-
-<!ELEMENT strong %Inline;>   <!-- strong emphasis -->
-<!ATTLIST strong %attrs;>
-
-<!ELEMENT dfn %Inline;>   <!-- definitional -->
-<!ATTLIST dfn %attrs;>
-
-<!ELEMENT code %Inline;>   <!-- program code -->
-<!ATTLIST code %attrs;>
-
-<!ELEMENT samp %Inline;>   <!-- sample -->
-<!ATTLIST samp %attrs;>
-
-<!ELEMENT kbd %Inline;>  <!-- something user would type -->
-<!ATTLIST kbd %attrs;>
-
-<!ELEMENT var %Inline;>   <!-- variable -->
-<!ATTLIST var %attrs;>
-
-<!ELEMENT cite %Inline;>   <!-- citation -->
-<!ATTLIST cite %attrs;>
-
-<!ELEMENT abbr %Inline;>   <!-- abbreviation -->
-<!ATTLIST abbr %attrs;>
-
-<!ELEMENT acronym %Inline;>   <!-- acronym -->
-<!ATTLIST acronym %attrs;>
-
-<!ELEMENT q %Inline;>   <!-- inlined quote -->
-<!ATTLIST q
-  %attrs;
-  cite        %URI;          #IMPLIED
-  >
-
-<!ELEMENT sub %Inline;> <!-- subscript -->
-<!ATTLIST sub %attrs;>
-
-<!ELEMENT sup %Inline;> <!-- superscript -->
-<!ATTLIST sup %attrs;>
-
-<!ELEMENT tt %Inline;>   <!-- fixed pitch font -->
-<!ATTLIST tt %attrs;>
-
-<!ELEMENT i %Inline;>   <!-- italic font -->
-<!ATTLIST i %attrs;>
-
-<!ELEMENT b %Inline;>   <!-- bold font -->
-<!ATTLIST b %attrs;>
-
-<!ELEMENT big %Inline;>   <!-- bigger font -->
-<!ATTLIST big %attrs;>
-
-<!ELEMENT small %Inline;>   <!-- smaller font -->
-<!ATTLIST small %attrs;>
-
-<!ELEMENT u %Inline;>   <!-- underline -->
-<!ATTLIST u %attrs;>
-
-<!ELEMENT s %Inline;>   <!-- strike-through -->
-<!ATTLIST s %attrs;>
-
-<!ELEMENT strike %Inline;>   <!-- strike-through -->
-<!ATTLIST strike %attrs;>
-
-<!ELEMENT basefont EMPTY>  <!-- base font size -->
-<!ATTLIST basefont
-  id          ID             #IMPLIED
-  size        CDATA          #REQUIRED
-  color       %Color;        #IMPLIED
-  face        CDATA          #IMPLIED
-  >
-
-<!ELEMENT font %Inline;> <!-- local change to font -->
-<!ATTLIST font
-  %coreattrs;
-  %i18n;
-  size        CDATA          #IMPLIED
-  color       %Color;        #IMPLIED
-  face        CDATA          #IMPLIED
-  >
-
-<!--==================== Object ======================================-->
-<!--
-  object is used to embed objects as part of HTML pages.
-  param elements should precede other content. Parameters
-  can also be expressed as attribute/value pairs on the
-  object element itself when brevity is desired.
--->
-
-<!ELEMENT object (#PCDATA | param | %block; | form |%inline; | %misc;)*>
-<!ATTLIST object
-  %attrs;
-  declare     (declare)      #IMPLIED
-  classid     %URI;          #IMPLIED
-  codebase    %URI;          #IMPLIED
-  data        %URI;          #IMPLIED
-  type        %ContentType;  #IMPLIED
-  codetype    %ContentType;  #IMPLIED
-  archive     %UriList;      #IMPLIED
-  standby     %Text;         #IMPLIED
-  height      %Length;       #IMPLIED
-  width       %Length;       #IMPLIED
-  usemap      %URI;          #IMPLIED
-  name        NMTOKEN        #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  align       %ImgAlign;     #IMPLIED
-  border      %Pixels;       #IMPLIED
-  hspace      %Pixels;       #IMPLIED
-  vspace      %Pixels;       #IMPLIED
-  >
-
-<!--
-  param is used to supply a named property value.
-  In XML it would seem natural to follow RDF and support an
-  abbreviated syntax where the param elements are replaced
-  by attribute value pairs on the object start tag.
--->
-<!ELEMENT param EMPTY>
-<!ATTLIST param
-  id          ID             #IMPLIED
-  name        CDATA          #REQUIRED
-  value       CDATA          #IMPLIED
-  valuetype   (data|ref|object) "data"
-  type        %ContentType;  #IMPLIED
-  >
-
-<!--=================== Java applet ==================================-->
-<!--
-  One of code or object attributes must be present.
-  Place param elements before other content.
--->
-<!ELEMENT applet (#PCDATA | param | %block; | form | %inline; | %misc;)*>
-<!ATTLIST applet
-  %coreattrs;
-  codebase    %URI;          #IMPLIED
-  archive     CDATA          #IMPLIED
-  code        CDATA          #IMPLIED
-  object      CDATA          #IMPLIED
-  alt         %Text;         #IMPLIED
-  name        NMTOKEN        #IMPLIED
-  width       %Length;       #REQUIRED
-  height      %Length;       #REQUIRED
-  align       %ImgAlign;     #IMPLIED
-  hspace      %Pixels;       #IMPLIED
-  vspace      %Pixels;       #IMPLIED
-  >
-
-<!--=================== Images ===========================================-->
-
-<!--
-   To avoid accessibility problems for people who aren't
-   able to see the image, you should provide a text
-   description using the alt and longdesc attributes.
-   In addition, avoid the use of server-side image maps.
--->
-
-<!ELEMENT img EMPTY>
-<!ATTLIST img
-  %attrs;
-  src         %URI;          #REQUIRED
-  alt         %Text;         #REQUIRED
-  name        NMTOKEN        #IMPLIED
-  longdesc    %URI;          #IMPLIED
-  height      %Length;       #IMPLIED
-  width       %Length;       #IMPLIED
-  usemap      %URI;          #IMPLIED
-  ismap       (ismap)        #IMPLIED
-  align       %ImgAlign;     #IMPLIED
-  border      %Pixels;       #IMPLIED
-  hspace      %Pixels;       #IMPLIED
-  vspace      %Pixels;       #IMPLIED
-  >
-
-<!-- usemap points to a map element which may be in this document
-  or an external document, although the latter is not widely supported -->
-
-<!--================== Client-side image maps ============================-->
-
-<!-- These can be placed in the same document or grouped in a
-     separate document although this isn't yet widely supported -->
-
-<!ELEMENT map ((%block; | form | %misc;)+ | area+)>
-<!ATTLIST map
-  %i18n;
-  %events;
-  id          ID             #REQUIRED
-  class       CDATA          #IMPLIED
-  style       %StyleSheet;   #IMPLIED
-  title       %Text;         #IMPLIED
-  name        NMTOKEN        #IMPLIED
-  >
-
-<!ELEMENT area EMPTY>
-<!ATTLIST area
-  %attrs;
-  %focus;
-  shape       %Shape;        "rect"
-  coords      %Coords;       #IMPLIED
-  href        %URI;          #IMPLIED
-  nohref      (nohref)       #IMPLIED
-  alt         %Text;         #REQUIRED
-  target      %FrameTarget;  #IMPLIED
-  >
-
-<!--================ Forms ===============================================-->
-
-<!ELEMENT form %form.content;>   <!-- forms shouldn't be nested -->
-
-<!ATTLIST form
-  %attrs;
-  action      %URI;          #REQUIRED
-  method      (get|post)     "get"
-  name        NMTOKEN        #IMPLIED
-  enctype     %ContentType;  "application/x-www-form-urlencoded"
-  onsubmit    %Script;       #IMPLIED
-  onreset     %Script;       #IMPLIED
-  accept      %ContentTypes; #IMPLIED
-  accept-charset %Charsets;  #IMPLIED
-  target      %FrameTarget;  #IMPLIED
-  >
-
-<!--
-  Each label must not contain more than ONE field
-  Label elements shouldn't be nested.
--->
-<!ELEMENT label %Inline;>
-<!ATTLIST label
-  %attrs;
-  for         IDREF          #IMPLIED
-  accesskey   %Character;    #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED
-  >
-
-<!ENTITY % InputType
-  "(text | password | checkbox |
-    radio | submit | reset |
-    file | hidden | image | button)"
-   >
-
-<!-- the name attribute is required for all but submit & reset -->
-
-<!ELEMENT input EMPTY>     <!-- form control -->
-<!ATTLIST input
-  %attrs;
-  %focus;
-  type        %InputType;    "text"
-  name        CDATA          #IMPLIED
-  value       CDATA          #IMPLIED
-  checked     (checked)      #IMPLIED
-  disabled    (disabled)     #IMPLIED
-  readonly    (readonly)     #IMPLIED
-  size        CDATA          #IMPLIED
-  maxlength   %Number;       #IMPLIED
-  src         %URI;          #IMPLIED
-  alt         CDATA          #IMPLIED
-  usemap      %URI;          #IMPLIED
-  onselect    %Script;       #IMPLIED
-  onchange    %Script;       #IMPLIED
-  accept      %ContentTypes; #IMPLIED
-  align       %ImgAlign;     #IMPLIED
-  >
-
-<!ELEMENT select (optgroup|option)+>  <!-- option selector -->
-<!ATTLIST select
-  %attrs;
-  name        CDATA          #IMPLIED
-  size        %Number;       #IMPLIED
-  multiple    (multiple)     #IMPLIED
-  disabled    (disabled)     #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED
-  onchange    %Script;       #IMPLIED
-  >
-
-<!ELEMENT optgroup (option)+>   <!-- option group -->
-<!ATTLIST optgroup
-  %attrs;
-  disabled    (disabled)     #IMPLIED
-  label       %Text;         #REQUIRED
-  >
-
-<!ELEMENT option (#PCDATA)>     <!-- selectable choice -->
-<!ATTLIST option
-  %attrs;
-  selected    (selected)     #IMPLIED
-  disabled    (disabled)     #IMPLIED
-  label       %Text;         #IMPLIED
-  value       CDATA          #IMPLIED
-  >
-
-<!ELEMENT textarea (#PCDATA)>     <!-- multi-line text field -->
-<!ATTLIST textarea
-  %attrs;
-  %focus;
-  name        CDATA          #IMPLIED
-  rows        %Number;       #REQUIRED
-  cols        %Number;       #REQUIRED
-  disabled    (disabled)     #IMPLIED
-  readonly    (readonly)     #IMPLIED
-  onselect    %Script;       #IMPLIED
-  onchange    %Script;       #IMPLIED
-  >
-
-<!--
-  The fieldset element is used to group form fields.
-  Only one legend element should occur in the content
-  and if present should only be preceded by whitespace.
--->
-<!ELEMENT fieldset (#PCDATA | legend | %block; | form | %inline; | %misc;)*>
-<!ATTLIST fieldset
-  %attrs;
-  >
-
-<!ENTITY % LAlign "(top|bottom|left|right)">
-
-<!ELEMENT legend %Inline;>     <!-- fieldset label -->
-<!ATTLIST legend
-  %attrs;
-  accesskey   %Character;    #IMPLIED
-  align       %LAlign;       #IMPLIED
-  >
-
-<!--
- Content is %Flow; excluding a, form, form controls, iframe
---> 
-<!ELEMENT button %button.content;>  <!-- push button -->
-<!ATTLIST button
-  %attrs;
-  %focus;
-  name        CDATA          #IMPLIED
-  value       CDATA          #IMPLIED
-  type        (button|submit|reset) "submit"
-  disabled    (disabled)     #IMPLIED
-  >
-
-<!-- single-line text input control (DEPRECATED) -->
-<!ELEMENT isindex EMPTY>
-<!ATTLIST isindex
-  %coreattrs;
-  %i18n;
-  prompt      %Text;         #IMPLIED
-  >
-
-<!--======================= Tables =======================================-->
-
-<!-- Derived from IETF HTML table standard, see [RFC1942] -->
-
-<!--
- The border attribute sets the thickness of the frame around the
- table. The default units are screen pixels.
-
- The frame attribute specifies which parts of the frame around
- the table should be rendered. The values are not the same as
- CALS to avoid a name clash with the valign attribute.
--->
-<!ENTITY % TFrame "(void|above|below|hsides|lhs|rhs|vsides|box|border)">
-
-<!--
- The rules attribute defines which rules to draw between cells:
-
- If rules is absent then assume:
-     "none" if border is absent or border="0" otherwise "all"
--->
-
-<!ENTITY % TRules "(none | groups | rows | cols | all)">
-  
-<!-- horizontal placement of table relative to document -->
-<!ENTITY % TAlign "(left|center|right)">
-
-<!-- horizontal alignment attributes for cell contents
-
-  char        alignment char, e.g. char=":"
-  charoff     offset for alignment char
--->
-<!ENTITY % cellhalign
-  "align      (left|center|right|justify|char) #IMPLIED
-   char       %Character;    #IMPLIED
-   charoff    %Length;       #IMPLIED"
-  >
-
-<!-- vertical alignment attributes for cell contents -->
-<!ENTITY % cellvalign
-  "valign     (top|middle|bottom|baseline) #IMPLIED"
-  >
-
-<!ELEMENT table
-     (caption?, (col*|colgroup*), thead?, tfoot?, (tbody+|tr+))>
-<!ELEMENT caption  %Inline;>
-<!ELEMENT thead    (tr)+>
-<!ELEMENT tfoot    (tr)+>
-<!ELEMENT tbody    (tr)+>
-<!ELEMENT colgroup (col)*>
-<!ELEMENT col      EMPTY>
-<!ELEMENT tr       (th|td)+>
-<!ELEMENT th       %Flow;>
-<!ELEMENT td       %Flow;>
-
-<!ATTLIST table
-  %attrs;
-  summary     %Text;         #IMPLIED
-  width       %Length;       #IMPLIED
-  border      %Pixels;       #IMPLIED
-  frame       %TFrame;       #IMPLIED
-  rules       %TRules;       #IMPLIED
-  cellspacing %Length;       #IMPLIED
-  cellpadding %Length;       #IMPLIED
-  align       %TAlign;       #IMPLIED
-  bgcolor     %Color;        #IMPLIED
-  >
-
-<!ENTITY % CAlign "(top|bottom|left|right)">
-
-<!ATTLIST caption
-  %attrs;
-  align       %CAlign;       #IMPLIED
-  >
-
-<!--
-colgroup groups a set of col elements. It allows you to group
-several semantically related columns together.
--->
-<!ATTLIST colgroup
-  %attrs;
-  span        %Number;       "1"
-  width       %MultiLength;  #IMPLIED
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!--
- col elements define the alignment properties for cells in
- one or more columns.
-
- The width attribute specifies the width of the columns, e.g.
-
-     width=64        width in screen pixels
-     width=0.5*      relative width of 0.5
-
- The span attribute causes the attributes of one
- col element to apply to more than one column.
--->
-<!ATTLIST col
-  %attrs;
-  span        %Number;       "1"
-  width       %MultiLength;  #IMPLIED
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!--
-    Use thead to duplicate headers when breaking table
-    across page boundaries, or for static headers when
-    tbody sections are rendered in scrolling panel.
-
-    Use tfoot to duplicate footers when breaking table
-    across page boundaries, or for static footers when
-    tbody sections are rendered in scrolling panel.
-
-    Use multiple tbody sections when rules are needed
-    between groups of table rows.
--->
-<!ATTLIST thead
-  %attrs;
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!ATTLIST tfoot
-  %attrs;
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!ATTLIST tbody
-  %attrs;
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!ATTLIST tr
-  %attrs;
-  %cellhalign;
-  %cellvalign;
-  bgcolor     %Color;        #IMPLIED
-  >
-
-<!-- Scope is simpler than headers attribute for common tables -->
-<!ENTITY % Scope "(row|col|rowgroup|colgroup)">
-
-<!-- th is for headers, td for data and for cells acting as both -->
-
-<!ATTLIST th
-  %attrs;
-  abbr        %Text;         #IMPLIED
-  axis        CDATA          #IMPLIED
-  headers     IDREFS         #IMPLIED
-  scope       %Scope;        #IMPLIED
-  rowspan     %Number;       "1"
-  colspan     %Number;       "1"
-  %cellhalign;
-  %cellvalign;
-  nowrap      (nowrap)       #IMPLIED
-  bgcolor     %Color;        #IMPLIED
-  width       %Pixels;       #IMPLIED
-  height      %Pixels;       #IMPLIED
-  >
-
-<!ATTLIST td
-  %attrs;
-  abbr        %Text;         #IMPLIED
-  axis        CDATA          #IMPLIED
-  headers     IDREFS         #IMPLIED
-  scope       %Scope;        #IMPLIED
-  rowspan     %Number;       "1"
-  colspan     %Number;       "1"
-  %cellhalign;
-  %cellvalign;
-  nowrap      (nowrap)       #IMPLIED
-  bgcolor     %Color;        #IMPLIED
-  width       %Pixels;       #IMPLIED
-  height      %Pixels;       #IMPLIED
-  >
-
+<!--
+   Extensible HTML version 1.0 Frameset DTD
+
+   This is the same as HTML 4 Frameset except for
+   changes due to the differences between XML and SGML.
+
+   Namespace = http://www.w3.org/1999/xhtml
+
+   For further information, see: http://www.w3.org/TR/xhtml1
+
+   Copyright (c) 1998-2002 W3C (MIT, INRIA, Keio),
+   All Rights Reserved. 
+
+   This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+   PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
+   SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd"
+
+   $Revision$
+   $Date$
+
+-->
+
+<!--================ Character mnemonic entities =========================-->
+
+<!ENTITY % HTMLlat1 PUBLIC
+   "-//W3C//ENTITIES Latin 1 for XHTML//EN"
+   "xhtml-lat1.ent">
+%HTMLlat1;
+
+<!ENTITY % HTMLsymbol PUBLIC
+   "-//W3C//ENTITIES Symbols for XHTML//EN"
+   "xhtml-symbol.ent">
+%HTMLsymbol;
+
+<!ENTITY % HTMLspecial PUBLIC
+   "-//W3C//ENTITIES Special for XHTML//EN"
+   "xhtml-special.ent">
+%HTMLspecial;
+
+<!--================== Imported Names ====================================-->
+
+<!ENTITY % ContentType "CDATA">
+    <!-- media type, as per [RFC2045] -->
+
+<!ENTITY % ContentTypes "CDATA">
+    <!-- comma-separated list of media types, as per [RFC2045] -->
+
+<!ENTITY % Charset "CDATA">
+    <!-- a character encoding, as per [RFC2045] -->
+
+<!ENTITY % Charsets "CDATA">
+    <!-- a space separated list of character encodings, as per [RFC2045] -->
+
+<!ENTITY % LanguageCode "NMTOKEN">
+    <!-- a language code, as per [RFC3066] -->
+
+<!ENTITY % Character "CDATA">
+    <!-- a single character, as per section 2.2 of [XML] -->
+
+<!ENTITY % Number "CDATA">
+    <!-- one or more digits -->
+
+<!ENTITY % LinkTypes "CDATA">
+    <!-- space-separated list of link types -->
+
+<!ENTITY % MediaDesc "CDATA">
+    <!-- single or comma-separated list of media descriptors -->
+
+<!ENTITY % URI "CDATA">
+    <!-- a Uniform Resource Identifier, see [RFC2396] -->
+
+<!ENTITY % UriList "CDATA">
+    <!-- a space separated list of Uniform Resource Identifiers -->
+
+<!ENTITY % Datetime "CDATA">
+    <!-- date and time information. ISO date format -->
+
+<!ENTITY % Script "CDATA">
+    <!-- script expression -->
+
+<!ENTITY % StyleSheet "CDATA">
+    <!-- style sheet data -->
+
+<!ENTITY % Text "CDATA">
+    <!-- used for titles etc. -->
+
+<!ENTITY % FrameTarget "NMTOKEN">
+    <!-- render in this frame -->
+
+<!ENTITY % Length "CDATA">
+    <!-- nn for pixels or nn% for percentage length -->
+
+<!ENTITY % MultiLength "CDATA">
+    <!-- pixel, percentage, or relative -->
+
+<!ENTITY % MultiLengths "CDATA">
+    <!-- comma-separated list of MultiLength -->
+
+<!ENTITY % Pixels "CDATA">
+    <!-- integer representing length in pixels -->
+
+<!-- these are used for image maps -->
+
+<!ENTITY % Shape "(rect|circle|poly|default)">
+
+<!ENTITY % Coords "CDATA">
+    <!-- comma separated list of lengths -->
+
+<!-- used for object, applet, img, input and iframe -->
+<!ENTITY % ImgAlign "(top|middle|bottom|left|right)">
+
+<!-- a color using sRGB: #RRGGBB as Hex values -->
+<!ENTITY % Color "CDATA">
+
+<!-- There are also 16 widely known color names with their sRGB values:
+
+    Black  = #000000    Green  = #008000
+    Silver = #C0C0C0    Lime   = #00FF00
+    Gray   = #808080    Olive  = #808000
+    White  = #FFFFFF    Yellow = #FFFF00
+    Maroon = #800000    Navy   = #000080
+    Red    = #FF0000    Blue   = #0000FF
+    Purple = #800080    Teal   = #008080
+    Fuchsia= #FF00FF    Aqua   = #00FFFF
+-->
+
+<!--=================== Generic Attributes ===============================-->
+
+<!-- core attributes common to most elements
+  id       document-wide unique id
+  class    space separated list of classes
+  style    associated style info
+  title    advisory title/amplification
+-->
+<!ENTITY % coreattrs
+ "id          ID             #IMPLIED
+  class       CDATA          #IMPLIED
+  style       %StyleSheet;   #IMPLIED
+  title       %Text;         #IMPLIED"
+  >
+
+<!-- internationalization attributes
+  lang        language code (backwards compatible)
+  xml:lang    language code (as per XML 1.0 spec)
+  dir         direction for weak/neutral text
+-->
+<!ENTITY % i18n
+ "lang        %LanguageCode; #IMPLIED
+  xml:lang    %LanguageCode; #IMPLIED
+  dir         (ltr|rtl)      #IMPLIED"
+  >
+
+<!-- attributes for common UI events
+  onclick     a pointer button was clicked
+  ondblclick  a pointer button was double clicked
+  onmousedown a pointer button was pressed down
+  onmouseup   a pointer button was released
+  onmousemove a pointer was moved onto the element
+  onmouseout  a pointer was moved away from the element
+  onkeypress  a key was pressed and released
+  onkeydown   a key was pressed down
+  onkeyup     a key was released
+-->
+<!ENTITY % events
+ "onclick     %Script;       #IMPLIED
+  ondblclick  %Script;       #IMPLIED
+  onmousedown %Script;       #IMPLIED
+  onmouseup   %Script;       #IMPLIED
+  onmouseover %Script;       #IMPLIED
+  onmousemove %Script;       #IMPLIED
+  onmouseout  %Script;       #IMPLIED
+  onkeypress  %Script;       #IMPLIED
+  onkeydown   %Script;       #IMPLIED
+  onkeyup     %Script;       #IMPLIED"
+  >
+
+<!-- attributes for elements that can get the focus
+  accesskey   accessibility key character
+  tabindex    position in tabbing order
+  onfocus     the element got the focus
+  onblur      the element lost the focus
+-->
+<!ENTITY % focus
+ "accesskey   %Character;    #IMPLIED
+  tabindex    %Number;       #IMPLIED
+  onfocus     %Script;       #IMPLIED
+  onblur      %Script;       #IMPLIED"
+  >
+
+<!ENTITY % attrs "%coreattrs; %i18n; %events;">
+
+<!-- text alignment for p, div, h1-h6. The default is
+     align="left" for ltr headings, "right" for rtl -->
+
+<!ENTITY % TextAlign "align (left|center|right|justify) #IMPLIED">
+
+<!--=================== Text Elements ====================================-->
+
+<!ENTITY % special.extra
+   "object | applet | img | map | iframe">
+	
+<!ENTITY % special.basic
+	"br | span | bdo">
+
+<!ENTITY % special
+   "%special.basic; | %special.extra;">
+
+<!ENTITY % fontstyle.extra "big | small | font | basefont">
+
+<!ENTITY % fontstyle.basic "tt | i | b | u
+                      | s | strike ">
+
+<!ENTITY % fontstyle "%fontstyle.basic; | %fontstyle.extra;">
+
+<!ENTITY % phrase.extra "sub | sup">
+<!ENTITY % phrase.basic "em | strong | dfn | code | q |
+                   samp | kbd | var | cite | abbr | acronym">
+
+<!ENTITY % phrase "%phrase.basic; | %phrase.extra;">
+
+<!ENTITY % inline.forms "input | select | textarea | label | button">
+
+<!-- these can occur at block or inline level -->
+<!ENTITY % misc.inline "ins | del | script">
+
+<!-- these can only occur at block level -->
+<!ENTITY % misc "noscript | %misc.inline;">
+
+
+<!ENTITY % inline "a | %special; | %fontstyle; | %phrase; | %inline.forms;">
+
+<!-- %Inline; covers inline or "text-level" elements -->
+<!ENTITY % Inline "(#PCDATA | %inline; | %misc.inline;)*">
+
+<!--================== Block level elements ==============================-->
+
+<!ENTITY % heading "h1|h2|h3|h4|h5|h6">
+<!ENTITY % lists "ul | ol | dl | menu | dir">
+<!ENTITY % blocktext "pre | hr | blockquote | address | center">
+
+<!ENTITY % block
+    "p | %heading; | div | %lists; | %blocktext; | isindex | fieldset | table">
+
+<!-- %Flow; mixes block and inline and is used for list items etc. -->
+<!ENTITY % Flow "(#PCDATA | %block; | form | %inline; | %misc;)*">
+
+<!--================== Content models for exclusions =====================-->
+
+<!-- a elements use %Inline; excluding a -->
+
+<!ENTITY % a.content
+   "(#PCDATA | %special; | %fontstyle; | %phrase; | %inline.forms; | %misc.inline;)*">
+
+<!-- pre uses %Inline excluding img, object, applet, big, small,
+     sub, sup, font, or basefont -->
+
+<!ENTITY % pre.content
+   "(#PCDATA | a | %special.basic; | %fontstyle.basic; | %phrase.basic; |
+	   %inline.forms; | %misc.inline;)*">
+
+
+<!-- form uses %Flow; excluding form -->
+
+<!ENTITY % form.content "(#PCDATA | %block; | %inline; | %misc;)*">
+
+<!-- button uses %Flow; but excludes a, form, form controls, iframe -->
+
+<!ENTITY % button.content
+   "(#PCDATA | p | %heading; | div | %lists; | %blocktext; |
+      table | br | span | bdo | object | applet | img | map |
+      %fontstyle; | %phrase; | %misc;)*">
+
+<!--================ Document Structure ==================================-->
+
+<!-- the namespace URI designates the document profile -->
+
+<!ELEMENT html (head, frameset)>
+<!ATTLIST html
+  %i18n;
+  id          ID             #IMPLIED
+  xmlns       %URI;          #FIXED 'http://www.w3.org/1999/xhtml'
+  >
+
+<!--================ Document Head =======================================-->
+
+<!ENTITY % head.misc "(script|style|meta|link|object|isindex)*">
+
+<!-- content model is %head.misc; combined with a single
+     title and an optional base element in any order -->
+
+<!ELEMENT head (%head.misc;,
+     ((title, %head.misc;, (base, %head.misc;)?) |
+      (base, %head.misc;, (title, %head.misc;))))>
+
+<!ATTLIST head
+  %i18n;
+  id          ID             #IMPLIED
+  profile     %URI;          #IMPLIED
+  >
+
+<!-- The title element is not considered part of the flow of text.
+       It should be displayed, for example as the page header or
+       window title. Exactly one title is required per document.
+    -->
+<!ELEMENT title (#PCDATA)>
+<!ATTLIST title 
+  %i18n;
+  id          ID             #IMPLIED
+  >
+
+<!-- document base URI -->
+
+<!ELEMENT base EMPTY>
+<!ATTLIST base
+  id          ID             #IMPLIED
+  href        %URI;          #IMPLIED
+  target      %FrameTarget;  #IMPLIED
+  >
+
+<!-- generic metainformation -->
+<!ELEMENT meta EMPTY>
+<!ATTLIST meta
+  %i18n;
+  id          ID             #IMPLIED
+  http-equiv  CDATA          #IMPLIED
+  name        CDATA          #IMPLIED
+  content     CDATA          #REQUIRED
+  scheme      CDATA          #IMPLIED
+  >
+
+<!--
+  Relationship values can be used in principle:
+
+   a) for document specific toolbars/menus when used
+      with the link element in document head e.g.
+        start, contents, previous, next, index, end, help
+   b) to link to a separate style sheet (rel="stylesheet")
+   c) to make a link to a script (rel="script")
+   d) by stylesheets to control how collections of
+      html nodes are rendered into printed documents
+   e) to make a link to a printable version of this document
+      e.g. a PostScript or PDF version (rel="alternate" media="print")
+-->
+
+<!ELEMENT link EMPTY>
+<!ATTLIST link
+  %attrs;
+  charset     %Charset;      #IMPLIED
+  href        %URI;          #IMPLIED
+  hreflang    %LanguageCode; #IMPLIED
+  type        %ContentType;  #IMPLIED
+  rel         %LinkTypes;    #IMPLIED
+  rev         %LinkTypes;    #IMPLIED
+  media       %MediaDesc;    #IMPLIED
+  target      %FrameTarget;  #IMPLIED
+  >
+
+<!-- style info, which may include CDATA sections -->
+<!ELEMENT style (#PCDATA)>
+<!ATTLIST style
+  %i18n;
+  id          ID             #IMPLIED
+  type        %ContentType;  #REQUIRED
+  media       %MediaDesc;    #IMPLIED
+  title       %Text;         #IMPLIED
+  xml:space   (preserve)     #FIXED 'preserve'
+  >
+
+<!-- script statements, which may include CDATA sections -->
+<!ELEMENT script (#PCDATA)>
+<!ATTLIST script
+  id          ID             #IMPLIED
+  charset     %Charset;      #IMPLIED
+  type        %ContentType;  #REQUIRED
+  language    CDATA          #IMPLIED
+  src         %URI;          #IMPLIED
+  defer       (defer)        #IMPLIED
+  xml:space   (preserve)     #FIXED 'preserve'
+  >
+
+<!-- alternate content container for non script-based rendering -->
+
+<!ELEMENT noscript %Flow;>
+<!ATTLIST noscript
+  %attrs;
+  >
+
+<!--======================= Frames =======================================-->
+
+<!-- only one noframes element permitted per document -->
+
+<!ELEMENT frameset (frameset|frame|noframes)*>
+<!ATTLIST frameset
+  %coreattrs;
+  rows        %MultiLengths; #IMPLIED
+  cols        %MultiLengths; #IMPLIED
+  onload      %Script;       #IMPLIED
+  onunload    %Script;       #IMPLIED
+  >
+
+<!-- reserved frame names start with "_" otherwise starts with letter -->
+
+<!-- tiled window within frameset -->
+
+<!ELEMENT frame EMPTY>
+<!ATTLIST frame
+  %coreattrs;
+  longdesc    %URI;          #IMPLIED
+  name        NMTOKEN        #IMPLIED
+  src         %URI;          #IMPLIED
+  frameborder (1|0)          "1"
+  marginwidth %Pixels;       #IMPLIED
+  marginheight %Pixels;      #IMPLIED
+  noresize    (noresize)     #IMPLIED
+  scrolling   (yes|no|auto)  "auto"
+  >
+
+<!-- inline subwindow -->
+
+<!ELEMENT iframe %Flow;>
+<!ATTLIST iframe
+  %coreattrs;
+  longdesc    %URI;          #IMPLIED
+  name        NMTOKEN        #IMPLIED
+  src         %URI;          #IMPLIED
+  frameborder (1|0)          "1"
+  marginwidth %Pixels;       #IMPLIED
+  marginheight %Pixels;      #IMPLIED
+  scrolling   (yes|no|auto)  "auto"
+  align       %ImgAlign;     #IMPLIED
+  height      %Length;       #IMPLIED
+  width       %Length;       #IMPLIED
+  >
+
+<!-- alternate content container for non frame-based rendering -->
+
+<!ELEMENT noframes (body)>
+<!ATTLIST noframes
+  %attrs;
+  >
+
+<!--=================== Document Body ====================================-->
+
+<!ELEMENT body %Flow;>
+<!ATTLIST body
+  %attrs;
+  onload      %Script;       #IMPLIED
+  onunload    %Script;       #IMPLIED
+  background  %URI;          #IMPLIED
+  bgcolor     %Color;        #IMPLIED
+  text        %Color;        #IMPLIED
+  link        %Color;        #IMPLIED
+  vlink       %Color;        #IMPLIED
+  alink       %Color;        #IMPLIED
+  >
+
+<!ELEMENT div %Flow;>  <!-- generic language/style container -->
+<!ATTLIST div
+  %attrs;
+  %TextAlign;
+  >
+
+<!--=================== Paragraphs =======================================-->
+
+<!ELEMENT p %Inline;>
+<!ATTLIST p
+  %attrs;
+  %TextAlign;
+  >
+
+<!--=================== Headings =========================================-->
+
+<!--
+  There are six levels of headings from h1 (the most important)
+  to h6 (the least important).
+-->
+
+<!ELEMENT h1  %Inline;>
+<!ATTLIST h1
+  %attrs;
+  %TextAlign;
+  >
+
+<!ELEMENT h2 %Inline;>
+<!ATTLIST h2
+  %attrs;
+  %TextAlign;
+  >
+
+<!ELEMENT h3 %Inline;>
+<!ATTLIST h3
+  %attrs;
+  %TextAlign;
+  >
+
+<!ELEMENT h4 %Inline;>
+<!ATTLIST h4
+  %attrs;
+  %TextAlign;
+  >
+
+<!ELEMENT h5 %Inline;>
+<!ATTLIST h5
+  %attrs;
+  %TextAlign;
+  >
+
+<!ELEMENT h6 %Inline;>
+<!ATTLIST h6
+  %attrs;
+  %TextAlign;
+  >
+
+<!--=================== Lists ============================================-->
+
+<!-- Unordered list bullet styles -->
+
+<!ENTITY % ULStyle "(disc|square|circle)">
+
+<!-- Unordered list -->
+
+<!ELEMENT ul (li)+>
+<!ATTLIST ul
+  %attrs;
+  type        %ULStyle;     #IMPLIED
+  compact     (compact)     #IMPLIED
+  >
+
+<!-- Ordered list numbering style
+
+    1   arabic numbers      1, 2, 3, ...
+    a   lower alpha         a, b, c, ...
+    A   upper alpha         A, B, C, ...
+    i   lower roman         i, ii, iii, ...
+    I   upper roman         I, II, III, ...
+
+    The style is applied to the sequence number which by default
+    is reset to 1 for the first list item in an ordered list.
+-->
+<!ENTITY % OLStyle "CDATA">
+
+<!-- Ordered (numbered) list -->
+
+<!ELEMENT ol (li)+>
+<!ATTLIST ol
+  %attrs;
+  type        %OLStyle;      #IMPLIED
+  compact     (compact)      #IMPLIED
+  start       %Number;       #IMPLIED
+  >
+
+<!-- single column list (DEPRECATED) --> 
+<!ELEMENT menu (li)+>
+<!ATTLIST menu
+  %attrs;
+  compact     (compact)     #IMPLIED
+  >
+
+<!-- multiple column list (DEPRECATED) --> 
+<!ELEMENT dir (li)+>
+<!ATTLIST dir
+  %attrs;
+  compact     (compact)     #IMPLIED
+  >
+
+<!-- LIStyle is constrained to: "(%ULStyle;|%OLStyle;)" -->
+<!ENTITY % LIStyle "CDATA">
+
+<!-- list item -->
+
+<!ELEMENT li %Flow;>
+<!ATTLIST li
+  %attrs;
+  type        %LIStyle;      #IMPLIED
+  value       %Number;       #IMPLIED
+  >
+
+<!-- definition lists - dt for term, dd for its definition -->
+
+<!ELEMENT dl (dt|dd)+>
+<!ATTLIST dl
+  %attrs;
+  compact     (compact)      #IMPLIED
+  >
+
+<!ELEMENT dt %Inline;>
+<!ATTLIST dt
+  %attrs;
+  >
+
+<!ELEMENT dd %Flow;>
+<!ATTLIST dd
+  %attrs;
+  >
+
+<!--=================== Address ==========================================-->
+
+<!-- information on author -->
+
+<!ELEMENT address (#PCDATA | %inline; | %misc.inline; | p)*>
+<!ATTLIST address
+  %attrs;
+  >
+
+<!--=================== Horizontal Rule ==================================-->
+
+<!ELEMENT hr EMPTY>
+<!ATTLIST hr
+  %attrs;
+  align       (left|center|right) #IMPLIED
+  noshade     (noshade)      #IMPLIED
+  size        %Pixels;       #IMPLIED
+  width       %Length;       #IMPLIED
+  >
+
+<!--=================== Preformatted Text ================================-->
+
+<!-- content is %Inline; excluding 
+        "img|object|applet|big|small|sub|sup|font|basefont" -->
+
+<!ELEMENT pre %pre.content;>
+<!ATTLIST pre
+  %attrs;
+  width       %Number;      #IMPLIED
+  xml:space   (preserve)    #FIXED 'preserve'
+  >
+
+<!--=================== Block-like Quotes ================================-->
+
+<!ELEMENT blockquote %Flow;>
+<!ATTLIST blockquote
+  %attrs;
+  cite        %URI;          #IMPLIED
+  >
+
+<!--=================== Text alignment ===================================-->
+
+<!-- center content -->
+<!ELEMENT center %Flow;>
+<!ATTLIST center
+  %attrs;
+  >
+
+<!--=================== Inserted/Deleted Text ============================-->
+
+
+<!--
+  ins/del are allowed in block and inline content, but its
+  inappropriate to include block content within an ins element
+  occurring in inline content.
+-->
+<!ELEMENT ins %Flow;>
+<!ATTLIST ins
+  %attrs;
+  cite        %URI;          #IMPLIED
+  datetime    %Datetime;     #IMPLIED
+  >
+
+<!ELEMENT del %Flow;>
+<!ATTLIST del
+  %attrs;
+  cite        %URI;          #IMPLIED
+  datetime    %Datetime;     #IMPLIED
+  >
+
+<!--================== The Anchor Element ================================-->
+
+<!-- content is %Inline; except that anchors shouldn't be nested -->
+
+<!ELEMENT a %a.content;>
+<!ATTLIST a
+  %attrs;
+  %focus;
+  charset     %Charset;      #IMPLIED
+  type        %ContentType;  #IMPLIED
+  name        NMTOKEN        #IMPLIED
+  href        %URI;          #IMPLIED
+  hreflang    %LanguageCode; #IMPLIED
+  rel         %LinkTypes;    #IMPLIED
+  rev         %LinkTypes;    #IMPLIED
+  shape       %Shape;        "rect"
+  coords      %Coords;       #IMPLIED
+  target      %FrameTarget;  #IMPLIED
+  >
+
+<!--===================== Inline Elements ================================-->
+
+<!ELEMENT span %Inline;> <!-- generic language/style container -->
+<!ATTLIST span
+  %attrs;
+  >
+
+<!ELEMENT bdo %Inline;>  <!-- I18N BiDi over-ride -->
+<!ATTLIST bdo
+  %coreattrs;
+  %events;
+  lang        %LanguageCode; #IMPLIED
+  xml:lang    %LanguageCode; #IMPLIED
+  dir         (ltr|rtl)      #REQUIRED
+  >
+
+<!ELEMENT br EMPTY>   <!-- forced line break -->
+<!ATTLIST br
+  %coreattrs;
+  clear       (left|all|right|none) "none"
+  >
+
+<!ELEMENT em %Inline;>   <!-- emphasis -->
+<!ATTLIST em %attrs;>
+
+<!ELEMENT strong %Inline;>   <!-- strong emphasis -->
+<!ATTLIST strong %attrs;>
+
+<!ELEMENT dfn %Inline;>   <!-- definitional -->
+<!ATTLIST dfn %attrs;>
+
+<!ELEMENT code %Inline;>   <!-- program code -->
+<!ATTLIST code %attrs;>
+
+<!ELEMENT samp %Inline;>   <!-- sample -->
+<!ATTLIST samp %attrs;>
+
+<!ELEMENT kbd %Inline;>  <!-- something user would type -->
+<!ATTLIST kbd %attrs;>
+
+<!ELEMENT var %Inline;>   <!-- variable -->
+<!ATTLIST var %attrs;>
+
+<!ELEMENT cite %Inline;>   <!-- citation -->
+<!ATTLIST cite %attrs;>
+
+<!ELEMENT abbr %Inline;>   <!-- abbreviation -->
+<!ATTLIST abbr %attrs;>
+
+<!ELEMENT acronym %Inline;>   <!-- acronym -->
+<!ATTLIST acronym %attrs;>
+
+<!ELEMENT q %Inline;>   <!-- inlined quote -->
+<!ATTLIST q
+  %attrs;
+  cite        %URI;          #IMPLIED
+  >
+
+<!ELEMENT sub %Inline;> <!-- subscript -->
+<!ATTLIST sub %attrs;>
+
+<!ELEMENT sup %Inline;> <!-- superscript -->
+<!ATTLIST sup %attrs;>
+
+<!ELEMENT tt %Inline;>   <!-- fixed pitch font -->
+<!ATTLIST tt %attrs;>
+
+<!ELEMENT i %Inline;>   <!-- italic font -->
+<!ATTLIST i %attrs;>
+
+<!ELEMENT b %Inline;>   <!-- bold font -->
+<!ATTLIST b %attrs;>
+
+<!ELEMENT big %Inline;>   <!-- bigger font -->
+<!ATTLIST big %attrs;>
+
+<!ELEMENT small %Inline;>   <!-- smaller font -->
+<!ATTLIST small %attrs;>
+
+<!ELEMENT u %Inline;>   <!-- underline -->
+<!ATTLIST u %attrs;>
+
+<!ELEMENT s %Inline;>   <!-- strike-through -->
+<!ATTLIST s %attrs;>
+
+<!ELEMENT strike %Inline;>   <!-- strike-through -->
+<!ATTLIST strike %attrs;>
+
+<!ELEMENT basefont EMPTY>  <!-- base font size -->
+<!ATTLIST basefont
+  id          ID             #IMPLIED
+  size        CDATA          #REQUIRED
+  color       %Color;        #IMPLIED
+  face        CDATA          #IMPLIED
+  >
+
+<!ELEMENT font %Inline;> <!-- local change to font -->
+<!ATTLIST font
+  %coreattrs;
+  %i18n;
+  size        CDATA          #IMPLIED
+  color       %Color;        #IMPLIED
+  face        CDATA          #IMPLIED
+  >
+
+<!--==================== Object ======================================-->
+<!--
+  object is used to embed objects as part of HTML pages.
+  param elements should precede other content. Parameters
+  can also be expressed as attribute/value pairs on the
+  object element itself when brevity is desired.
+-->
+
+<!ELEMENT object (#PCDATA | param | %block; | form |%inline; | %misc;)*>
+<!ATTLIST object
+  %attrs;
+  declare     (declare)      #IMPLIED
+  classid     %URI;          #IMPLIED
+  codebase    %URI;          #IMPLIED
+  data        %URI;          #IMPLIED
+  type        %ContentType;  #IMPLIED
+  codetype    %ContentType;  #IMPLIED
+  archive     %UriList;      #IMPLIED
+  standby     %Text;         #IMPLIED
+  height      %Length;       #IMPLIED
+  width       %Length;       #IMPLIED
+  usemap      %URI;          #IMPLIED
+  name        NMTOKEN        #IMPLIED
+  tabindex    %Number;       #IMPLIED
+  align       %ImgAlign;     #IMPLIED
+  border      %Pixels;       #IMPLIED
+  hspace      %Pixels;       #IMPLIED
+  vspace      %Pixels;       #IMPLIED
+  >
+
+<!--
+  param is used to supply a named property value.
+  In XML it would seem natural to follow RDF and support an
+  abbreviated syntax where the param elements are replaced
+  by attribute value pairs on the object start tag.
+-->
+<!ELEMENT param EMPTY>
+<!ATTLIST param
+  id          ID             #IMPLIED
+  name        CDATA          #REQUIRED
+  value       CDATA          #IMPLIED
+  valuetype   (data|ref|object) "data"
+  type        %ContentType;  #IMPLIED
+  >
+
+<!--=================== Java applet ==================================-->
+<!--
+  One of code or object attributes must be present.
+  Place param elements before other content.
+-->
+<!ELEMENT applet (#PCDATA | param | %block; | form | %inline; | %misc;)*>
+<!ATTLIST applet
+  %coreattrs;
+  codebase    %URI;          #IMPLIED
+  archive     CDATA          #IMPLIED
+  code        CDATA          #IMPLIED
+  object      CDATA          #IMPLIED
+  alt         %Text;         #IMPLIED
+  name        NMTOKEN        #IMPLIED
+  width       %Length;       #REQUIRED
+  height      %Length;       #REQUIRED
+  align       %ImgAlign;     #IMPLIED
+  hspace      %Pixels;       #IMPLIED
+  vspace      %Pixels;       #IMPLIED
+  >
+
+<!--=================== Images ===========================================-->
+
+<!--
+   To avoid accessibility problems for people who aren't
+   able to see the image, you should provide a text
+   description using the alt and longdesc attributes.
+   In addition, avoid the use of server-side image maps.
+-->
+
+<!ELEMENT img EMPTY>
+<!ATTLIST img
+  %attrs;
+  src         %URI;          #REQUIRED
+  alt         %Text;         #REQUIRED
+  name        NMTOKEN        #IMPLIED
+  longdesc    %URI;          #IMPLIED
+  height      %Length;       #IMPLIED
+  width       %Length;       #IMPLIED
+  usemap      %URI;          #IMPLIED
+  ismap       (ismap)        #IMPLIED
+  align       %ImgAlign;     #IMPLIED
+  border      %Pixels;       #IMPLIED
+  hspace      %Pixels;       #IMPLIED
+  vspace      %Pixels;       #IMPLIED
+  >
+
+<!-- usemap points to a map element which may be in this document
+  or an external document, although the latter is not widely supported -->
+
+<!--================== Client-side image maps ============================-->
+
+<!-- These can be placed in the same document or grouped in a
+     separate document although this isn't yet widely supported -->
+
+<!ELEMENT map ((%block; | form | %misc;)+ | area+)>
+<!ATTLIST map
+  %i18n;
+  %events;
+  id          ID             #REQUIRED
+  class       CDATA          #IMPLIED
+  style       %StyleSheet;   #IMPLIED
+  title       %Text;         #IMPLIED
+  name        NMTOKEN        #IMPLIED
+  >
+
+<!ELEMENT area EMPTY>
+<!ATTLIST area
+  %attrs;
+  %focus;
+  shape       %Shape;        "rect"
+  coords      %Coords;       #IMPLIED
+  href        %URI;          #IMPLIED
+  nohref      (nohref)       #IMPLIED
+  alt         %Text;         #REQUIRED
+  target      %FrameTarget;  #IMPLIED
+  >
+
+<!--================ Forms ===============================================-->
+
+<!ELEMENT form %form.content;>   <!-- forms shouldn't be nested -->
+
+<!ATTLIST form
+  %attrs;
+  action      %URI;          #REQUIRED
+  method      (get|post)     "get"
+  name        NMTOKEN        #IMPLIED
+  enctype     %ContentType;  "application/x-www-form-urlencoded"
+  onsubmit    %Script;       #IMPLIED
+  onreset     %Script;       #IMPLIED
+  accept      %ContentTypes; #IMPLIED
+  accept-charset %Charsets;  #IMPLIED
+  target      %FrameTarget;  #IMPLIED
+  >
+
+<!--
+  Each label must not contain more than ONE field
+  Label elements shouldn't be nested.
+-->
+<!ELEMENT label %Inline;>
+<!ATTLIST label
+  %attrs;
+  for         IDREF          #IMPLIED
+  accesskey   %Character;    #IMPLIED
+  onfocus     %Script;       #IMPLIED
+  onblur      %Script;       #IMPLIED
+  >
+
+<!ENTITY % InputType
+  "(text | password | checkbox |
+    radio | submit | reset |
+    file | hidden | image | button)"
+   >
+
+<!-- the name attribute is required for all but submit & reset -->
+
+<!ELEMENT input EMPTY>     <!-- form control -->
+<!ATTLIST input
+  %attrs;
+  %focus;
+  type        %InputType;    "text"
+  name        CDATA          #IMPLIED
+  value       CDATA          #IMPLIED
+  checked     (checked)      #IMPLIED
+  disabled    (disabled)     #IMPLIED
+  readonly    (readonly)     #IMPLIED
+  size        CDATA          #IMPLIED
+  maxlength   %Number;       #IMPLIED
+  src         %URI;          #IMPLIED
+  alt         CDATA          #IMPLIED
+  usemap      %URI;          #IMPLIED
+  onselect    %Script;       #IMPLIED
+  onchange    %Script;       #IMPLIED
+  accept      %ContentTypes; #IMPLIED
+  align       %ImgAlign;     #IMPLIED
+  >
+
+<!ELEMENT select (optgroup|option)+>  <!-- option selector -->
+<!ATTLIST select
+  %attrs;
+  name        CDATA          #IMPLIED
+  size        %Number;       #IMPLIED
+  multiple    (multiple)     #IMPLIED
+  disabled    (disabled)     #IMPLIED
+  tabindex    %Number;       #IMPLIED
+  onfocus     %Script;       #IMPLIED
+  onblur      %Script;       #IMPLIED
+  onchange    %Script;       #IMPLIED
+  >
+
+<!ELEMENT optgroup (option)+>   <!-- option group -->
+<!ATTLIST optgroup
+  %attrs;
+  disabled    (disabled)     #IMPLIED
+  label       %Text;         #REQUIRED
+  >
+
+<!ELEMENT option (#PCDATA)>     <!-- selectable choice -->
+<!ATTLIST option
+  %attrs;
+  selected    (selected)     #IMPLIED
+  disabled    (disabled)     #IMPLIED
+  label       %Text;         #IMPLIED
+  value       CDATA          #IMPLIED
+  >
+
+<!ELEMENT textarea (#PCDATA)>     <!-- multi-line text field -->
+<!ATTLIST textarea
+  %attrs;
+  %focus;
+  name        CDATA          #IMPLIED
+  rows        %Number;       #REQUIRED
+  cols        %Number;       #REQUIRED
+  disabled    (disabled)     #IMPLIED
+  readonly    (readonly)     #IMPLIED
+  onselect    %Script;       #IMPLIED
+  onchange    %Script;       #IMPLIED
+  >
+
+<!--
+  The fieldset element is used to group form fields.
+  Only one legend element should occur in the content
+  and if present should only be preceded by whitespace.
+-->
+<!ELEMENT fieldset (#PCDATA | legend | %block; | form | %inline; | %misc;)*>
+<!ATTLIST fieldset
+  %attrs;
+  >
+
+<!ENTITY % LAlign "(top|bottom|left|right)">
+
+<!ELEMENT legend %Inline;>     <!-- fieldset label -->
+<!ATTLIST legend
+  %attrs;
+  accesskey   %Character;    #IMPLIED
+  align       %LAlign;       #IMPLIED
+  >
+
+<!--
+ Content is %Flow; excluding a, form, form controls, iframe
+--> 
+<!ELEMENT button %button.content;>  <!-- push button -->
+<!ATTLIST button
+  %attrs;
+  %focus;
+  name        CDATA          #IMPLIED
+  value       CDATA          #IMPLIED
+  type        (button|submit|reset) "submit"
+  disabled    (disabled)     #IMPLIED
+  >
+
+<!-- single-line text input control (DEPRECATED) -->
+<!ELEMENT isindex EMPTY>
+<!ATTLIST isindex
+  %coreattrs;
+  %i18n;
+  prompt      %Text;         #IMPLIED
+  >
+
+<!--======================= Tables =======================================-->
+
+<!-- Derived from IETF HTML table standard, see [RFC1942] -->
+
+<!--
+ The border attribute sets the thickness of the frame around the
+ table. The default units are screen pixels.
+
+ The frame attribute specifies which parts of the frame around
+ the table should be rendered. The values are not the same as
+ CALS to avoid a name clash with the valign attribute.
+-->
+<!ENTITY % TFrame "(void|above|below|hsides|lhs|rhs|vsides|box|border)">
+
+<!--
+ The rules attribute defines which rules to draw between cells:
+
+ If rules is absent then assume:
+     "none" if border is absent or border="0" otherwise "all"
+-->
+
+<!ENTITY % TRules "(none | groups | rows | cols | all)">
+  
+<!-- horizontal placement of table relative to document -->
+<!ENTITY % TAlign "(left|center|right)">
+
+<!-- horizontal alignment attributes for cell contents
+
+  char        alignment char, e.g. char=":"
+  charoff     offset for alignment char
+-->
+<!ENTITY % cellhalign
+  "align      (left|center|right|justify|char) #IMPLIED
+   char       %Character;    #IMPLIED
+   charoff    %Length;       #IMPLIED"
+  >
+
+<!-- vertical alignment attributes for cell contents -->
+<!ENTITY % cellvalign
+  "valign     (top|middle|bottom|baseline) #IMPLIED"
+  >
+
+<!ELEMENT table
+     (caption?, (col*|colgroup*), thead?, tfoot?, (tbody+|tr+))>
+<!ELEMENT caption  %Inline;>
+<!ELEMENT thead    (tr)+>
+<!ELEMENT tfoot    (tr)+>
+<!ELEMENT tbody    (tr)+>
+<!ELEMENT colgroup (col)*>
+<!ELEMENT col      EMPTY>
+<!ELEMENT tr       (th|td)+>
+<!ELEMENT th       %Flow;>
+<!ELEMENT td       %Flow;>
+
+<!ATTLIST table
+  %attrs;
+  summary     %Text;         #IMPLIED
+  width       %Length;       #IMPLIED
+  border      %Pixels;       #IMPLIED
+  frame       %TFrame;       #IMPLIED
+  rules       %TRules;       #IMPLIED
+  cellspacing %Length;       #IMPLIED
+  cellpadding %Length;       #IMPLIED
+  align       %TAlign;       #IMPLIED
+  bgcolor     %Color;        #IMPLIED
+  >
+
+<!ENTITY % CAlign "(top|bottom|left|right)">
+
+<!ATTLIST caption
+  %attrs;
+  align       %CAlign;       #IMPLIED
+  >
+
+<!--
+colgroup groups a set of col elements. It allows you to group
+several semantically related columns together.
+-->
+<!ATTLIST colgroup
+  %attrs;
+  span        %Number;       "1"
+  width       %MultiLength;  #IMPLIED
+  %cellhalign;
+  %cellvalign;
+  >
+
+<!--
+ col elements define the alignment properties for cells in
+ one or more columns.
+
+ The width attribute specifies the width of the columns, e.g.
+
+     width=64        width in screen pixels
+     width=0.5*      relative width of 0.5
+
+ The span attribute causes the attributes of one
+ col element to apply to more than one column.
+-->
+<!ATTLIST col
+  %attrs;
+  span        %Number;       "1"
+  width       %MultiLength;  #IMPLIED
+  %cellhalign;
+  %cellvalign;
+  >
+
+<!--
+    Use thead to duplicate headers when breaking table
+    across page boundaries, or for static headers when
+    tbody sections are rendered in scrolling panel.
+
+    Use tfoot to duplicate footers when breaking table
+    across page boundaries, or for static footers when
+    tbody sections are rendered in scrolling panel.
+
+    Use multiple tbody sections when rules are needed
+    between groups of table rows.
+-->
+<!ATTLIST thead
+  %attrs;
+  %cellhalign;
+  %cellvalign;
+  >
+
+<!ATTLIST tfoot
+  %attrs;
+  %cellhalign;
+  %cellvalign;
+  >
+
+<!ATTLIST tbody
+  %attrs;
+  %cellhalign;
+  %cellvalign;
+  >
+
+<!ATTLIST tr
+  %attrs;
+  %cellhalign;
+  %cellvalign;
+  bgcolor     %Color;        #IMPLIED
+  >
+
+<!-- Scope is simpler than headers attribute for common tables -->
+<!ENTITY % Scope "(row|col|rowgroup|colgroup)">
+
+<!-- th is for headers, td for data and for cells acting as both -->
+
+<!ATTLIST th
+  %attrs;
+  abbr        %Text;         #IMPLIED
+  axis        CDATA          #IMPLIED
+  headers     IDREFS         #IMPLIED
+  scope       %Scope;        #IMPLIED
+  rowspan     %Number;       "1"
+  colspan     %Number;       "1"
+  %cellhalign;
+  %cellvalign;
+  nowrap      (nowrap)       #IMPLIED
+  bgcolor     %Color;        #IMPLIED
+  width       %Pixels;       #IMPLIED
+  height      %Pixels;       #IMPLIED
+  >
+
+<!ATTLIST td
+  %attrs;
+  abbr        %Text;         #IMPLIED
+  axis        CDATA          #IMPLIED
+  headers     IDREFS         #IMPLIED
+  scope       %Scope;        #IMPLIED
+  rowspan     %Number;       "1"
+  colspan     %Number;       "1"
+  %cellhalign;
+  %cellvalign;
+  nowrap      (nowrap)       #IMPLIED
+  bgcolor     %Color;        #IMPLIED
+  width       %Pixels;       #IMPLIED
+  height      %Pixels;       #IMPLIED
+  >
+

Modified: xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/xhtml1-strict.dtd
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/xhtml1-strict.dtd?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/dom/W3C/level2/core/files/xhtml1-strict.dtd&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/xhtml1-strict.dtd&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/dom/W3C/level2/core/files/xhtml1-strict.dtd	(original)
+++ xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/xhtml1-strict.dtd	Wed Dec  8 08:54:26 2004
@@ -1,978 +1,978 @@
-<!--
-   Extensible HTML version 1.0 Strict DTD
-
-   This is the same as HTML 4 Strict except for
-   changes due to the differences between XML and SGML.
-
-   Namespace = http://www.w3.org/1999/xhtml
-
-   For further information, see: http://www.w3.org/TR/xhtml1
-
-   Copyright (c) 1998-2002 W3C (MIT, INRIA, Keio),
-   All Rights Reserved. 
-
-   This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-   PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-   SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"
-
-   $Revision: 1.1 $
-   $Date: 2004/06/08 19:37:55 $
-
--->
-
-<!--================ Character mnemonic entities =========================-->
-
-<!ENTITY % HTMLlat1 PUBLIC
-   "-//W3C//ENTITIES Latin 1 for XHTML//EN"
-   "xhtml-lat1.ent">
-%HTMLlat1;
-
-<!ENTITY % HTMLsymbol PUBLIC
-   "-//W3C//ENTITIES Symbols for XHTML//EN"
-   "xhtml-symbol.ent">
-%HTMLsymbol;
-
-<!ENTITY % HTMLspecial PUBLIC
-   "-//W3C//ENTITIES Special for XHTML//EN"
-   "xhtml-special.ent">
-%HTMLspecial;
-
-<!--================== Imported Names ====================================-->
-
-<!ENTITY % ContentType "CDATA">
-    <!-- media type, as per [RFC2045] -->
-
-<!ENTITY % ContentTypes "CDATA">
-    <!-- comma-separated list of media types, as per [RFC2045] -->
-
-<!ENTITY % Charset "CDATA">
-    <!-- a character encoding, as per [RFC2045] -->
-
-<!ENTITY % Charsets "CDATA">
-    <!-- a space separated list of character encodings, as per [RFC2045] -->
-
-<!ENTITY % LanguageCode "NMTOKEN">
-    <!-- a language code, as per [RFC3066] -->
-
-<!ENTITY % Character "CDATA">
-    <!-- a single character, as per section 2.2 of [XML] -->
-
-<!ENTITY % Number "CDATA">
-    <!-- one or more digits -->
-
-<!ENTITY % LinkTypes "CDATA">
-    <!-- space-separated list of link types -->
-
-<!ENTITY % MediaDesc "CDATA">
-    <!-- single or comma-separated list of media descriptors -->
-
-<!ENTITY % URI "CDATA">
-    <!-- a Uniform Resource Identifier, see [RFC2396] -->
-
-<!ENTITY % UriList "CDATA">
-    <!-- a space separated list of Uniform Resource Identifiers -->
-
-<!ENTITY % Datetime "CDATA">
-    <!-- date and time information. ISO date format -->
-
-<!ENTITY % Script "CDATA">
-    <!-- script expression -->
-
-<!ENTITY % StyleSheet "CDATA">
-    <!-- style sheet data -->
-
-<!ENTITY % Text "CDATA">
-    <!-- used for titles etc. -->
-
-<!ENTITY % Length "CDATA">
-    <!-- nn for pixels or nn% for percentage length -->
-
-<!ENTITY % MultiLength "CDATA">
-    <!-- pixel, percentage, or relative -->
-
-<!ENTITY % Pixels "CDATA">
-    <!-- integer representing length in pixels -->
-
-<!-- these are used for image maps -->
-
-<!ENTITY % Shape "(rect|circle|poly|default)">
-
-<!ENTITY % Coords "CDATA">
-    <!-- comma separated list of lengths -->
-
-<!--=================== Generic Attributes ===============================-->
-
-<!-- core attributes common to most elements
-  id       document-wide unique id
-  class    space separated list of classes
-  style    associated style info
-  title    advisory title/amplification
--->
-<!ENTITY % coreattrs
- "id          ID             #IMPLIED
-  class       CDATA          #IMPLIED
-  style       %StyleSheet;   #IMPLIED
-  title       %Text;         #IMPLIED"
-  >
-
-<!-- internationalization attributes
-  lang        language code (backwards compatible)
-  xml:lang    language code (as per XML 1.0 spec)
-  dir         direction for weak/neutral text
--->
-<!ENTITY % i18n
- "lang        %LanguageCode; #IMPLIED
-  xml:lang    %LanguageCode; #IMPLIED
-  dir         (ltr|rtl)      #IMPLIED"
-  >
-
-<!-- attributes for common UI events
-  onclick     a pointer button was clicked
-  ondblclick  a pointer button was double clicked
-  onmousedown a pointer button was pressed down
-  onmouseup   a pointer button was released
-  onmousemove a pointer was moved onto the element
-  onmouseout  a pointer was moved away from the element
-  onkeypress  a key was pressed and released
-  onkeydown   a key was pressed down
-  onkeyup     a key was released
--->
-<!ENTITY % events
- "onclick     %Script;       #IMPLIED
-  ondblclick  %Script;       #IMPLIED
-  onmousedown %Script;       #IMPLIED
-  onmouseup   %Script;       #IMPLIED
-  onmouseover %Script;       #IMPLIED
-  onmousemove %Script;       #IMPLIED
-  onmouseout  %Script;       #IMPLIED
-  onkeypress  %Script;       #IMPLIED
-  onkeydown   %Script;       #IMPLIED
-  onkeyup     %Script;       #IMPLIED"
-  >
-
-<!-- attributes for elements that can get the focus
-  accesskey   accessibility key character
-  tabindex    position in tabbing order
-  onfocus     the element got the focus
-  onblur      the element lost the focus
--->
-<!ENTITY % focus
- "accesskey   %Character;    #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED"
-  >
-
-<!ENTITY % attrs "%coreattrs; %i18n; %events;">
-
-<!--=================== Text Elements ====================================-->
-
-<!ENTITY % special.pre
-   "br | span | bdo | map">
-
-
-<!ENTITY % special
-   "%special.pre; | object | img ">
-
-<!ENTITY % fontstyle "tt | i | b | big | small ">
-
-<!ENTITY % phrase "em | strong | dfn | code | q |
-                   samp | kbd | var | cite | abbr | acronym | sub | sup ">
-
-<!ENTITY % inline.forms "input | select | textarea | label | button">
-
-<!-- these can occur at block or inline level -->
-<!ENTITY % misc.inline "ins | del | script">
-
-<!-- these can only occur at block level -->
-<!ENTITY % misc "noscript | %misc.inline;">
-
-<!ENTITY % inline "a | %special; | %fontstyle; | %phrase; | %inline.forms;">
-
-<!-- %Inline; covers inline or "text-level" elements -->
-<!ENTITY % Inline "(#PCDATA | %inline; | %misc.inline;)*">
-
-<!--================== Block level elements ==============================-->
-
-<!ENTITY % heading "h1|h2|h3|h4|h5|h6">
-<!ENTITY % lists "ul | ol | dl">
-<!ENTITY % blocktext "pre | hr | blockquote | address">
-
-<!ENTITY % block
-     "p | %heading; | div | %lists; | %blocktext; | fieldset | table">
-
-<!ENTITY % Block "(%block; | form | %misc;)*">
-
-<!-- %Flow; mixes block and inline and is used for list items etc. -->
-<!ENTITY % Flow "(#PCDATA | %block; | form | %inline; | %misc;)*">
-
-<!--================== Content models for exclusions =====================-->
-
-<!-- a elements use %Inline; excluding a -->
-
-<!ENTITY % a.content
-   "(#PCDATA | %special; | %fontstyle; | %phrase; | %inline.forms; | %misc.inline;)*">
-
-<!-- pre uses %Inline excluding big, small, sup or sup -->
-
-<!ENTITY % pre.content
-   "(#PCDATA | a | %fontstyle; | %phrase; | %special.pre; | %misc.inline;
-      | %inline.forms;)*">
-
-<!-- form uses %Block; excluding form -->
-
-<!ENTITY % form.content "(%block; | %misc;)*">
-
-<!-- button uses %Flow; but excludes a, form and form controls -->
-
-<!ENTITY % button.content
-   "(#PCDATA | p | %heading; | div | %lists; | %blocktext; |
-    table | %special; | %fontstyle; | %phrase; | %misc;)*">
-
-<!--================ Document Structure ==================================-->
-
-<!-- the namespace URI designates the document profile -->
-
-<!ELEMENT html (head, body)>
-<!ATTLIST html
-  %i18n;
-  id          ID             #IMPLIED
-  xmlns       %URI;          #FIXED 'http://www.w3.org/1999/xhtml'
-  >
-
-<!--================ Document Head =======================================-->
-
-<!ENTITY % head.misc "(script|style|meta|link|object)*">
-
-<!-- content model is %head.misc; combined with a single
-     title and an optional base element in any order -->
-
-<!ELEMENT head (%head.misc;,
-     ((title, %head.misc;, (base, %head.misc;)?) |
-      (base, %head.misc;, (title, %head.misc;))))>
-
-<!ATTLIST head
-  %i18n;
-  id          ID             #IMPLIED
-  profile     %URI;          #IMPLIED
-  >
-
-<!-- The title element is not considered part of the flow of text.
-       It should be displayed, for example as the page header or
-       window title. Exactly one title is required per document.
-    -->
-<!ELEMENT title (#PCDATA)>
-<!ATTLIST title 
-  %i18n;
-  id          ID             #IMPLIED
-  >
-
-<!-- document base URI -->
-
-<!ELEMENT base EMPTY>
-<!ATTLIST base
-  href        %URI;          #REQUIRED
-  id          ID             #IMPLIED
-  >
-
-<!-- generic metainformation -->
-<!ELEMENT meta EMPTY>
-<!ATTLIST meta
-  %i18n;
-  id          ID             #IMPLIED
-  http-equiv  CDATA          #IMPLIED
-  name        CDATA          #IMPLIED
-  content     CDATA          #REQUIRED
-  scheme      CDATA          #IMPLIED
-  >
-
-<!--
-  Relationship values can be used in principle:
-
-   a) for document specific toolbars/menus when used
-      with the link element in document head e.g.
-        start, contents, previous, next, index, end, help
-   b) to link to a separate style sheet (rel="stylesheet")
-   c) to make a link to a script (rel="script")
-   d) by stylesheets to control how collections of
-      html nodes are rendered into printed documents
-   e) to make a link to a printable version of this document
-      e.g. a PostScript or PDF version (rel="alternate" media="print")
--->
-
-<!ELEMENT link EMPTY>
-<!ATTLIST link
-  %attrs;
-  charset     %Charset;      #IMPLIED
-  href        %URI;          #IMPLIED
-  hreflang    %LanguageCode; #IMPLIED
-  type        %ContentType;  #IMPLIED
-  rel         %LinkTypes;    #IMPLIED
-  rev         %LinkTypes;    #IMPLIED
-  media       %MediaDesc;    #IMPLIED
-  >
-
-<!-- style info, which may include CDATA sections -->
-<!ELEMENT style (#PCDATA)>
-<!ATTLIST style
-  %i18n;
-  id          ID             #IMPLIED
-  type        %ContentType;  #REQUIRED
-  media       %MediaDesc;    #IMPLIED
-  title       %Text;         #IMPLIED
-  xml:space   (preserve)     #FIXED 'preserve'
-  >
-
-<!-- script statements, which may include CDATA sections -->
-<!ELEMENT script (#PCDATA)>
-<!ATTLIST script
-  id          ID             #IMPLIED
-  charset     %Charset;      #IMPLIED
-  type        %ContentType;  #REQUIRED
-  src         %URI;          #IMPLIED
-  defer       (defer)        #IMPLIED
-  xml:space   (preserve)     #FIXED 'preserve'
-  >
-
-<!-- alternate content container for non script-based rendering -->
-
-<!ELEMENT noscript %Block;>
-<!ATTLIST noscript
-  %attrs;
-  >
-
-<!--=================== Document Body ====================================-->
-
-<!ELEMENT body %Block;>
-<!ATTLIST body
-  %attrs;
-  onload          %Script;   #IMPLIED
-  onunload        %Script;   #IMPLIED
-  >
-
-<!ELEMENT div %Flow;>  <!-- generic language/style container -->
-<!ATTLIST div
-  %attrs;
-  >
-
-<!--=================== Paragraphs =======================================-->
-
-<!ELEMENT p %Inline;>
-<!ATTLIST p
-  %attrs;
-  >
-
-<!--=================== Headings =========================================-->
-
-<!--
-  There are six levels of headings from h1 (the most important)
-  to h6 (the least important).
--->
-
-<!ELEMENT h1  %Inline;>
-<!ATTLIST h1
-   %attrs;
-   >
-
-<!ELEMENT h2 %Inline;>
-<!ATTLIST h2
-   %attrs;
-   >
-
-<!ELEMENT h3 %Inline;>
-<!ATTLIST h3
-   %attrs;
-   >
-
-<!ELEMENT h4 %Inline;>
-<!ATTLIST h4
-   %attrs;
-   >
-
-<!ELEMENT h5 %Inline;>
-<!ATTLIST h5
-   %attrs;
-   >
-
-<!ELEMENT h6 %Inline;>
-<!ATTLIST h6
-   %attrs;
-   >
-
-<!--=================== Lists ============================================-->
-
-<!-- Unordered list -->
-
-<!ELEMENT ul (li)+>
-<!ATTLIST ul
-  %attrs;
-  >
-
-<!-- Ordered (numbered) list -->
-
-<!ELEMENT ol (li)+>
-<!ATTLIST ol
-  %attrs;
-  >
-
-<!-- list item -->
-
-<!ELEMENT li %Flow;>
-<!ATTLIST li
-  %attrs;
-  >
-
-<!-- definition lists - dt for term, dd for its definition -->
-
-<!ELEMENT dl (dt|dd)+>
-<!ATTLIST dl
-  %attrs;
-  >
-
-<!ELEMENT dt %Inline;>
-<!ATTLIST dt
-  %attrs;
-  >
-
-<!ELEMENT dd %Flow;>
-<!ATTLIST dd
-  %attrs;
-  >
-
-<!--=================== Address ==========================================-->
-
-<!-- information on author -->
-
-<!ELEMENT address %Inline;>
-<!ATTLIST address
-  %attrs;
-  >
-
-<!--=================== Horizontal Rule ==================================-->
-
-<!ELEMENT hr EMPTY>
-<!ATTLIST hr
-  %attrs;
-  >
-
-<!--=================== Preformatted Text ================================-->
-
-<!-- content is %Inline; excluding "img|object|big|small|sub|sup" -->
-
-<!ELEMENT pre %pre.content;>
-<!ATTLIST pre
-  %attrs;
-  xml:space (preserve) #FIXED 'preserve'
-  >
-
-<!--=================== Block-like Quotes ================================-->
-
-<!ELEMENT blockquote %Block;>
-<!ATTLIST blockquote
-  %attrs;
-  cite        %URI;          #IMPLIED
-  >
-
-<!--=================== Inserted/Deleted Text ============================-->
-
-<!--
-  ins/del are allowed in block and inline content, but its
-  inappropriate to include block content within an ins element
-  occurring in inline content.
--->
-<!ELEMENT ins %Flow;>
-<!ATTLIST ins
-  %attrs;
-  cite        %URI;          #IMPLIED
-  datetime    %Datetime;     #IMPLIED
-  >
-
-<!ELEMENT del %Flow;>
-<!ATTLIST del
-  %attrs;
-  cite        %URI;          #IMPLIED
-  datetime    %Datetime;     #IMPLIED
-  >
-
-<!--================== The Anchor Element ================================-->
-
-<!-- content is %Inline; except that anchors shouldn't be nested -->
-
-<!ELEMENT a %a.content;>
-<!ATTLIST a
-  %attrs;
-  %focus;
-  charset     %Charset;      #IMPLIED
-  type        %ContentType;  #IMPLIED
-  name        NMTOKEN        #IMPLIED
-  href        %URI;          #IMPLIED
-  hreflang    %LanguageCode; #IMPLIED
-  rel         %LinkTypes;    #IMPLIED
-  rev         %LinkTypes;    #IMPLIED
-  shape       %Shape;        "rect"
-  coords      %Coords;       #IMPLIED
-  >
-
-<!--===================== Inline Elements ================================-->
-
-<!ELEMENT span %Inline;> <!-- generic language/style container -->
-<!ATTLIST span
-  %attrs;
-  >
-
-<!ELEMENT bdo %Inline;>  <!-- I18N BiDi over-ride -->
-<!ATTLIST bdo
-  %coreattrs;
-  %events;
-  lang        %LanguageCode; #IMPLIED
-  xml:lang    %LanguageCode; #IMPLIED
-  dir         (ltr|rtl)      #REQUIRED
-  >
-
-<!ELEMENT br EMPTY>   <!-- forced line break -->
-<!ATTLIST br
-  %coreattrs;
-  >
-
-<!ELEMENT em %Inline;>   <!-- emphasis -->
-<!ATTLIST em %attrs;>
-
-<!ELEMENT strong %Inline;>   <!-- strong emphasis -->
-<!ATTLIST strong %attrs;>
-
-<!ELEMENT dfn %Inline;>   <!-- definitional -->
-<!ATTLIST dfn %attrs;>
-
-<!ELEMENT code %Inline;>   <!-- program code -->
-<!ATTLIST code %attrs;>
-
-<!ELEMENT samp %Inline;>   <!-- sample -->
-<!ATTLIST samp %attrs;>
-
-<!ELEMENT kbd %Inline;>  <!-- something user would type -->
-<!ATTLIST kbd %attrs;>
-
-<!ELEMENT var %Inline;>   <!-- variable -->
-<!ATTLIST var %attrs;>
-
-<!ELEMENT cite %Inline;>   <!-- citation -->
-<!ATTLIST cite %attrs;>
-
-<!ELEMENT abbr %Inline;>   <!-- abbreviation -->
-<!ATTLIST abbr %attrs;>
-
-<!ELEMENT acronym %Inline;>   <!-- acronym -->
-<!ATTLIST acronym %attrs;>
-
-<!ELEMENT q %Inline;>   <!-- inlined quote -->
-<!ATTLIST q
-  %attrs;
-  cite        %URI;          #IMPLIED
-  >
-
-<!ELEMENT sub %Inline;> <!-- subscript -->
-<!ATTLIST sub %attrs;>
-
-<!ELEMENT sup %Inline;> <!-- superscript -->
-<!ATTLIST sup %attrs;>
-
-<!ELEMENT tt %Inline;>   <!-- fixed pitch font -->
-<!ATTLIST tt %attrs;>
-
-<!ELEMENT i %Inline;>   <!-- italic font -->
-<!ATTLIST i %attrs;>
-
-<!ELEMENT b %Inline;>   <!-- bold font -->
-<!ATTLIST b %attrs;>
-
-<!ELEMENT big %Inline;>   <!-- bigger font -->
-<!ATTLIST big %attrs;>
-
-<!ELEMENT small %Inline;>   <!-- smaller font -->
-<!ATTLIST small %attrs;>
-
-<!--==================== Object ======================================-->
-<!--
-  object is used to embed objects as part of HTML pages.
-  param elements should precede other content. Parameters
-  can also be expressed as attribute/value pairs on the
-  object element itself when brevity is desired.
--->
-
-<!ELEMENT object (#PCDATA | param | %block; | form | %inline; | %misc;)*>
-<!ATTLIST object
-  %attrs;
-  declare     (declare)      #IMPLIED
-  classid     %URI;          #IMPLIED
-  codebase    %URI;          #IMPLIED
-  data        %URI;          #IMPLIED
-  type        %ContentType;  #IMPLIED
-  codetype    %ContentType;  #IMPLIED
-  archive     %UriList;      #IMPLIED
-  standby     %Text;         #IMPLIED
-  height      %Length;       #IMPLIED
-  width       %Length;       #IMPLIED
-  usemap      %URI;          #IMPLIED
-  name        NMTOKEN        #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  >
-
-<!--
-  param is used to supply a named property value.
-  In XML it would seem natural to follow RDF and support an
-  abbreviated syntax where the param elements are replaced
-  by attribute value pairs on the object start tag.
--->
-<!ELEMENT param EMPTY>
-<!ATTLIST param
-  id          ID             #IMPLIED
-  name        CDATA          #IMPLIED
-  value       CDATA          #IMPLIED
-  valuetype   (data|ref|object) "data"
-  type        %ContentType;  #IMPLIED
-  >
-
-<!--=================== Images ===========================================-->
-
-<!--
-   To avoid accessibility problems for people who aren't
-   able to see the image, you should provide a text
-   description using the alt and longdesc attributes.
-   In addition, avoid the use of server-side image maps.
-   Note that in this DTD there is no name attribute. That
-   is only available in the transitional and frameset DTD.
--->
-
-<!ELEMENT img EMPTY>
-<!ATTLIST img
-  %attrs;
-  src         %URI;          #REQUIRED
-  alt         %Text;         #REQUIRED
-  longdesc    %URI;          #IMPLIED
-  height      %Length;       #IMPLIED
-  width       %Length;       #IMPLIED
-  usemap      %URI;          #IMPLIED
-  ismap       (ismap)        #IMPLIED
-  >
-
-<!-- usemap points to a map element which may be in this document
-  or an external document, although the latter is not widely supported -->
-
-<!--================== Client-side image maps ============================-->
-
-<!-- These can be placed in the same document or grouped in a
-     separate document although this isn't yet widely supported -->
-
-<!ELEMENT map ((%block; | form | %misc;)+ | area+)>
-<!ATTLIST map
-  %i18n;
-  %events;
-  id          ID             #REQUIRED
-  class       CDATA          #IMPLIED
-  style       %StyleSheet;   #IMPLIED
-  title       %Text;         #IMPLIED
-  name        NMTOKEN        #IMPLIED
-  >
-
-<!ELEMENT area EMPTY>
-<!ATTLIST area
-  %attrs;
-  %focus;
-  shape       %Shape;        "rect"
-  coords      %Coords;       #IMPLIED
-  href        %URI;          #IMPLIED
-  nohref      (nohref)       #IMPLIED
-  alt         %Text;         #REQUIRED
-  >
-
-<!--================ Forms ===============================================-->
-<!ELEMENT form %form.content;>   <!-- forms shouldn't be nested -->
-
-<!ATTLIST form
-  %attrs;
-  action      %URI;          #REQUIRED
-  method      (get|post)     "get"
-  enctype     %ContentType;  "application/x-www-form-urlencoded"
-  onsubmit    %Script;       #IMPLIED
-  onreset     %Script;       #IMPLIED
-  accept      %ContentTypes; #IMPLIED
-  accept-charset %Charsets;  #IMPLIED
-  >
-
-<!--
-  Each label must not contain more than ONE field
-  Label elements shouldn't be nested.
--->
-<!ELEMENT label %Inline;>
-<!ATTLIST label
-  %attrs;
-  for         IDREF          #IMPLIED
-  accesskey   %Character;    #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED
-  >
-
-<!ENTITY % InputType
-  "(text | password | checkbox |
-    radio | submit | reset |
-    file | hidden | image | button)"
-   >
-
-<!-- the name attribute is required for all but submit & reset -->
-
-<!ELEMENT input EMPTY>     <!-- form control -->
-<!ATTLIST input
-  %attrs;
-  %focus;
-  type        %InputType;    "text"
-  name        CDATA          #IMPLIED
-  value       CDATA          #IMPLIED
-  checked     (checked)      #IMPLIED
-  disabled    (disabled)     #IMPLIED
-  readonly    (readonly)     #IMPLIED
-  size        CDATA          #IMPLIED
-  maxlength   %Number;       #IMPLIED
-  src         %URI;          #IMPLIED
-  alt         CDATA          #IMPLIED
-  usemap      %URI;          #IMPLIED
-  onselect    %Script;       #IMPLIED
-  onchange    %Script;       #IMPLIED
-  accept      %ContentTypes; #IMPLIED
-  >
-
-<!ELEMENT select (optgroup|option)+>  <!-- option selector -->
-<!ATTLIST select
-  %attrs;
-  name        CDATA          #IMPLIED
-  size        %Number;       #IMPLIED
-  multiple    (multiple)     #IMPLIED
-  disabled    (disabled)     #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED
-  onchange    %Script;       #IMPLIED
-  >
-
-<!ELEMENT optgroup (option)+>   <!-- option group -->
-<!ATTLIST optgroup
-  %attrs;
-  disabled    (disabled)     #IMPLIED
-  label       %Text;         #REQUIRED
-  >
-
-<!ELEMENT option (#PCDATA)>     <!-- selectable choice -->
-<!ATTLIST option
-  %attrs;
-  selected    (selected)     #IMPLIED
-  disabled    (disabled)     #IMPLIED
-  label       %Text;         #IMPLIED
-  value       CDATA          #IMPLIED
-  >
-
-<!ELEMENT textarea (#PCDATA)>     <!-- multi-line text field -->
-<!ATTLIST textarea
-  %attrs;
-  %focus;
-  name        CDATA          #IMPLIED
-  rows        %Number;       #REQUIRED
-  cols        %Number;       #REQUIRED
-  disabled    (disabled)     #IMPLIED
-  readonly    (readonly)     #IMPLIED
-  onselect    %Script;       #IMPLIED
-  onchange    %Script;       #IMPLIED
-  >
-
-<!--
-  The fieldset element is used to group form fields.
-  Only one legend element should occur in the content
-  and if present should only be preceded by whitespace.
--->
-<!ELEMENT fieldset (#PCDATA | legend | %block; | form | %inline; | %misc;)*>
-<!ATTLIST fieldset
-  %attrs;
-  >
-
-<!ELEMENT legend %Inline;>     <!-- fieldset label -->
-<!ATTLIST legend
-  %attrs;
-  accesskey   %Character;    #IMPLIED
-  >
-
-<!--
- Content is %Flow; excluding a, form and form controls
---> 
-<!ELEMENT button %button.content;>  <!-- push button -->
-<!ATTLIST button
-  %attrs;
-  %focus;
-  name        CDATA          #IMPLIED
-  value       CDATA          #IMPLIED
-  type        (button|submit|reset) "submit"
-  disabled    (disabled)     #IMPLIED
-  >
-
-<!--======================= Tables =======================================-->
-
-<!-- Derived from IETF HTML table standard, see [RFC1942] -->
-
-<!--
- The border attribute sets the thickness of the frame around the
- table. The default units are screen pixels.
-
- The frame attribute specifies which parts of the frame around
- the table should be rendered. The values are not the same as
- CALS to avoid a name clash with the valign attribute.
--->
-<!ENTITY % TFrame "(void|above|below|hsides|lhs|rhs|vsides|box|border)">
-
-<!--
- The rules attribute defines which rules to draw between cells:
-
- If rules is absent then assume:
-     "none" if border is absent or border="0" otherwise "all"
--->
-
-<!ENTITY % TRules "(none | groups | rows | cols | all)">
-  
-<!-- horizontal alignment attributes for cell contents
-
-  char        alignment char, e.g. char=':'
-  charoff     offset for alignment char
--->
-<!ENTITY % cellhalign
-  "align      (left|center|right|justify|char) #IMPLIED
-   char       %Character;    #IMPLIED
-   charoff    %Length;       #IMPLIED"
-  >
-
-<!-- vertical alignment attributes for cell contents -->
-<!ENTITY % cellvalign
-  "valign     (top|middle|bottom|baseline) #IMPLIED"
-  >
-
-<!ELEMENT table
-     (caption?, (col*|colgroup*), thead?, tfoot?, (tbody+|tr+))>
-<!ELEMENT caption  %Inline;>
-<!ELEMENT thead    (tr)+>
-<!ELEMENT tfoot    (tr)+>
-<!ELEMENT tbody    (tr)+>
-<!ELEMENT colgroup (col)*>
-<!ELEMENT col      EMPTY>
-<!ELEMENT tr       (th|td)+>
-<!ELEMENT th       %Flow;>
-<!ELEMENT td       %Flow;>
-
-<!ATTLIST table
-  %attrs;
-  summary     %Text;         #IMPLIED
-  width       %Length;       #IMPLIED
-  border      %Pixels;       #IMPLIED
-  frame       %TFrame;       #IMPLIED
-  rules       %TRules;       #IMPLIED
-  cellspacing %Length;       #IMPLIED
-  cellpadding %Length;       #IMPLIED
-  >
-
-<!ATTLIST caption
-  %attrs;
-  >
-
-<!--
-colgroup groups a set of col elements. It allows you to group
-several semantically related columns together.
--->
-<!ATTLIST colgroup
-  %attrs;
-  span        %Number;       "1"
-  width       %MultiLength;  #IMPLIED
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!--
- col elements define the alignment properties for cells in
- one or more columns.
-
- The width attribute specifies the width of the columns, e.g.
-
-     width=64        width in screen pixels
-     width=0.5*      relative width of 0.5
-
- The span attribute causes the attributes of one
- col element to apply to more than one column.
--->
-<!ATTLIST col
-  %attrs;
-  span        %Number;       "1"
-  width       %MultiLength;  #IMPLIED
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!--
-    Use thead to duplicate headers when breaking table
-    across page boundaries, or for static headers when
-    tbody sections are rendered in scrolling panel.
-
-    Use tfoot to duplicate footers when breaking table
-    across page boundaries, or for static footers when
-    tbody sections are rendered in scrolling panel.
-
-    Use multiple tbody sections when rules are needed
-    between groups of table rows.
--->
-<!ATTLIST thead
-  %attrs;
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!ATTLIST tfoot
-  %attrs;
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!ATTLIST tbody
-  %attrs;
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!ATTLIST tr
-  %attrs;
-  %cellhalign;
-  %cellvalign;
-  >
-
-
-<!-- Scope is simpler than headers attribute for common tables -->
-<!ENTITY % Scope "(row|col|rowgroup|colgroup)">
-
-<!-- th is for headers, td for data and for cells acting as both -->
-
-<!ATTLIST th
-  %attrs;
-  abbr        %Text;         #IMPLIED
-  axis        CDATA          #IMPLIED
-  headers     IDREFS         #IMPLIED
-  scope       %Scope;        #IMPLIED
-  rowspan     %Number;       "1"
-  colspan     %Number;       "1"
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!ATTLIST td
-  %attrs;
-  abbr        %Text;         #IMPLIED
-  axis        CDATA          #IMPLIED
-  headers     IDREFS         #IMPLIED
-  scope       %Scope;        #IMPLIED
-  rowspan     %Number;       "1"
-  colspan     %Number;       "1"
-  %cellhalign;
-  %cellvalign;
-  >
-
+<!--
+   Extensible HTML version 1.0 Strict DTD
+
+   This is the same as HTML 4 Strict except for
+   changes due to the differences between XML and SGML.
+
+   Namespace = http://www.w3.org/1999/xhtml
+
+   For further information, see: http://www.w3.org/TR/xhtml1
+
+   Copyright (c) 1998-2002 W3C (MIT, INRIA, Keio),
+   All Rights Reserved. 
+
+   This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+   PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+   SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"
+
+   $Revision$
+   $Date$
+
+-->
+
+<!--================ Character mnemonic entities =========================-->
+
+<!ENTITY % HTMLlat1 PUBLIC
+   "-//W3C//ENTITIES Latin 1 for XHTML//EN"
+   "xhtml-lat1.ent">
+%HTMLlat1;
+
+<!ENTITY % HTMLsymbol PUBLIC
+   "-//W3C//ENTITIES Symbols for XHTML//EN"
+   "xhtml-symbol.ent">
+%HTMLsymbol;
+
+<!ENTITY % HTMLspecial PUBLIC
+   "-//W3C//ENTITIES Special for XHTML//EN"
+   "xhtml-special.ent">
+%HTMLspecial;
+
+<!--================== Imported Names ====================================-->
+
+<!ENTITY % ContentType "CDATA">
+    <!-- media type, as per [RFC2045] -->
+
+<!ENTITY % ContentTypes "CDATA">
+    <!-- comma-separated list of media types, as per [RFC2045] -->
+
+<!ENTITY % Charset "CDATA">
+    <!-- a character encoding, as per [RFC2045] -->
+
+<!ENTITY % Charsets "CDATA">
+    <!-- a space separated list of character encodings, as per [RFC2045] -->
+
+<!ENTITY % LanguageCode "NMTOKEN">
+    <!-- a language code, as per [RFC3066] -->
+
+<!ENTITY % Character "CDATA">
+    <!-- a single character, as per section 2.2 of [XML] -->
+
+<!ENTITY % Number "CDATA">
+    <!-- one or more digits -->
+
+<!ENTITY % LinkTypes "CDATA">
+    <!-- space-separated list of link types -->
+
+<!ENTITY % MediaDesc "CDATA">
+    <!-- single or comma-separated list of media descriptors -->
+
+<!ENTITY % URI "CDATA">
+    <!-- a Uniform Resource Identifier, see [RFC2396] -->
+
+<!ENTITY % UriList "CDATA">
+    <!-- a space separated list of Uniform Resource Identifiers -->
+
+<!ENTITY % Datetime "CDATA">
+    <!-- date and time information. ISO date format -->
+
+<!ENTITY % Script "CDATA">
+    <!-- script expression -->
+
+<!ENTITY % StyleSheet "CDATA">
+    <!-- style sheet data -->
+
+<!ENTITY % Text "CDATA">
+    <!-- used for titles etc. -->
+
+<!ENTITY % Length "CDATA">
+    <!-- nn for pixels or nn% for percentage length -->
+
+<!ENTITY % MultiLength "CDATA">
+    <!-- pixel, percentage, or relative -->
+
+<!ENTITY % Pixels "CDATA">
+    <!-- integer representing length in pixels -->
+
+<!-- these are used for image maps -->
+
+<!ENTITY % Shape "(rect|circle|poly|default)">
+
+<!ENTITY % Coords "CDATA">
+    <!-- comma separated list of lengths -->
+
+<!--=================== Generic Attributes ===============================-->
+
+<!-- core attributes common to most elements
+  id       document-wide unique id
+  class    space separated list of classes
+  style    associated style info
+  title    advisory title/amplification
+-->
+<!ENTITY % coreattrs
+ "id          ID             #IMPLIED
+  class       CDATA          #IMPLIED
+  style       %StyleSheet;   #IMPLIED
+  title       %Text;         #IMPLIED"
+  >
+
+<!-- internationalization attributes
+  lang        language code (backwards compatible)
+  xml:lang    language code (as per XML 1.0 spec)
+  dir         direction for weak/neutral text
+-->
+<!ENTITY % i18n
+ "lang        %LanguageCode; #IMPLIED
+  xml:lang    %LanguageCode; #IMPLIED
+  dir         (ltr|rtl)      #IMPLIED"
+  >
+
+<!-- attributes for common UI events
+  onclick     a pointer button was clicked
+  ondblclick  a pointer button was double clicked
+  onmousedown a pointer button was pressed down
+  onmouseup   a pointer button was released
+  onmousemove a pointer was moved onto the element
+  onmouseout  a pointer was moved away from the element
+  onkeypress  a key was pressed and released
+  onkeydown   a key was pressed down
+  onkeyup     a key was released
+-->
+<!ENTITY % events
+ "onclick     %Script;       #IMPLIED
+  ondblclick  %Script;       #IMPLIED
+  onmousedown %Script;       #IMPLIED
+  onmouseup   %Script;       #IMPLIED
+  onmouseover %Script;       #IMPLIED
+  onmousemove %Script;       #IMPLIED
+  onmouseout  %Script;       #IMPLIED
+  onkeypress  %Script;       #IMPLIED
+  onkeydown   %Script;       #IMPLIED
+  onkeyup     %Script;       #IMPLIED"
+  >
+
+<!-- attributes for elements that can get the focus
+  accesskey   accessibility key character
+  tabindex    position in tabbing order
+  onfocus     the element got the focus
+  onblur      the element lost the focus
+-->
+<!ENTITY % focus
+ "accesskey   %Character;    #IMPLIED
+  tabindex    %Number;       #IMPLIED
+  onfocus     %Script;       #IMPLIED
+  onblur      %Script;       #IMPLIED"
+  >
+
+<!ENTITY % attrs "%coreattrs; %i18n; %events;">
+
+<!--=================== Text Elements ====================================-->
+
+<!ENTITY % special.pre
+   "br | span | bdo | map">
+
+
+<!ENTITY % special
+   "%special.pre; | object | img ">
+
+<!ENTITY % fontstyle "tt | i | b | big | small ">
+
+<!ENTITY % phrase "em | strong | dfn | code | q |
+                   samp | kbd | var | cite | abbr | acronym | sub | sup ">
+
+<!ENTITY % inline.forms "input | select | textarea | label | button">
+
+<!-- these can occur at block or inline level -->
+<!ENTITY % misc.inline "ins | del | script">
+
+<!-- these can only occur at block level -->
+<!ENTITY % misc "noscript | %misc.inline;">
+
+<!ENTITY % inline "a | %special; | %fontstyle; | %phrase; | %inline.forms;">
+
+<!-- %Inline; covers inline or "text-level" elements -->
+<!ENTITY % Inline "(#PCDATA | %inline; | %misc.inline;)*">
+
+<!--================== Block level elements ==============================-->
+
+<!ENTITY % heading "h1|h2|h3|h4|h5|h6">
+<!ENTITY % lists "ul | ol | dl">
+<!ENTITY % blocktext "pre | hr | blockquote | address">
+
+<!ENTITY % block
+     "p | %heading; | div | %lists; | %blocktext; | fieldset | table">
+
+<!ENTITY % Block "(%block; | form | %misc;)*">
+
+<!-- %Flow; mixes block and inline and is used for list items etc. -->
+<!ENTITY % Flow "(#PCDATA | %block; | form | %inline; | %misc;)*">
+
+<!--================== Content models for exclusions =====================-->
+
+<!-- a elements use %Inline; excluding a -->
+
+<!ENTITY % a.content
+   "(#PCDATA | %special; | %fontstyle; | %phrase; | %inline.forms; | %misc.inline;)*">
+
+<!-- pre uses %Inline excluding big, small, sup or sup -->
+
+<!ENTITY % pre.content
+   "(#PCDATA | a | %fontstyle; | %phrase; | %special.pre; | %misc.inline;
+      | %inline.forms;)*">
+
+<!-- form uses %Block; excluding form -->
+
+<!ENTITY % form.content "(%block; | %misc;)*">
+
+<!-- button uses %Flow; but excludes a, form and form controls -->
+
+<!ENTITY % button.content
+   "(#PCDATA | p | %heading; | div | %lists; | %blocktext; |
+    table | %special; | %fontstyle; | %phrase; | %misc;)*">
+
+<!--================ Document Structure ==================================-->
+
+<!-- the namespace URI designates the document profile -->
+
+<!ELEMENT html (head, body)>
+<!ATTLIST html
+  %i18n;
+  id          ID             #IMPLIED
+  xmlns       %URI;          #FIXED 'http://www.w3.org/1999/xhtml'
+  >
+
+<!--================ Document Head =======================================-->
+
+<!ENTITY % head.misc "(script|style|meta|link|object)*">
+
+<!-- content model is %head.misc; combined with a single
+     title and an optional base element in any order -->
+
+<!ELEMENT head (%head.misc;,
+     ((title, %head.misc;, (base, %head.misc;)?) |
+      (base, %head.misc;, (title, %head.misc;))))>
+
+<!ATTLIST head
+  %i18n;
+  id          ID             #IMPLIED
+  profile     %URI;          #IMPLIED
+  >
+
+<!-- The title element is not considered part of the flow of text.
+       It should be displayed, for example as the page header or
+       window title. Exactly one title is required per document.
+    -->
+<!ELEMENT title (#PCDATA)>
+<!ATTLIST title 
+  %i18n;
+  id          ID             #IMPLIED
+  >
+
+<!-- document base URI -->
+
+<!ELEMENT base EMPTY>
+<!ATTLIST base
+  href        %URI;          #REQUIRED
+  id          ID             #IMPLIED
+  >
+
+<!-- generic metainformation -->
+<!ELEMENT meta EMPTY>
+<!ATTLIST meta
+  %i18n;
+  id          ID             #IMPLIED
+  http-equiv  CDATA          #IMPLIED
+  name        CDATA          #IMPLIED
+  content     CDATA          #REQUIRED
+  scheme      CDATA          #IMPLIED
+  >
+
+<!--
+  Relationship values can be used in principle:
+
+   a) for document specific toolbars/menus when used
+      with the link element in document head e.g.
+        start, contents, previous, next, index, end, help
+   b) to link to a separate style sheet (rel="stylesheet")
+   c) to make a link to a script (rel="script")
+   d) by stylesheets to control how collections of
+      html nodes are rendered into printed documents
+   e) to make a link to a printable version of this document
+      e.g. a PostScript or PDF version (rel="alternate" media="print")
+-->
+
+<!ELEMENT link EMPTY>
+<!ATTLIST link
+  %attrs;
+  charset     %Charset;      #IMPLIED
+  href        %URI;          #IMPLIED
+  hreflang    %LanguageCode; #IMPLIED
+  type        %ContentType;  #IMPLIED
+  rel         %LinkTypes;    #IMPLIED
+  rev         %LinkTypes;    #IMPLIED
+  media       %MediaDesc;    #IMPLIED
+  >
+
+<!-- style info, which may include CDATA sections -->
+<!ELEMENT style (#PCDATA)>
+<!ATTLIST style
+  %i18n;
+  id          ID             #IMPLIED
+  type        %ContentType;  #REQUIRED
+  media       %MediaDesc;    #IMPLIED
+  title       %Text;         #IMPLIED
+  xml:space   (preserve)     #FIXED 'preserve'
+  >
+
+<!-- script statements, which may include CDATA sections -->
+<!ELEMENT script (#PCDATA)>
+<!ATTLIST script
+  id          ID             #IMPLIED
+  charset     %Charset;      #IMPLIED
+  type        %ContentType;  #REQUIRED
+  src         %URI;          #IMPLIED
+  defer       (defer)        #IMPLIED
+  xml:space   (preserve)     #FIXED 'preserve'
+  >
+
+<!-- alternate content container for non script-based rendering -->
+
+<!ELEMENT noscript %Block;>
+<!ATTLIST noscript
+  %attrs;
+  >
+
+<!--=================== Document Body ====================================-->
+
+<!ELEMENT body %Block;>
+<!ATTLIST body
+  %attrs;
+  onload          %Script;   #IMPLIED
+  onunload        %Script;   #IMPLIED
+  >
+
+<!ELEMENT div %Flow;>  <!-- generic language/style container -->
+<!ATTLIST div
+  %attrs;
+  >
+
+<!--=================== Paragraphs =======================================-->
+
+<!ELEMENT p %Inline;>
+<!ATTLIST p
+  %attrs;
+  >
+
+<!--=================== Headings =========================================-->
+
+<!--
+  There are six levels of headings from h1 (the most important)
+  to h6 (the least important).
+-->
+
+<!ELEMENT h1  %Inline;>
+<!ATTLIST h1
+   %attrs;
+   >
+
+<!ELEMENT h2 %Inline;>
+<!ATTLIST h2
+   %attrs;
+   >
+
+<!ELEMENT h3 %Inline;>
+<!ATTLIST h3
+   %attrs;
+   >
+
+<!ELEMENT h4 %Inline;>
+<!ATTLIST h4
+   %attrs;
+   >
+
+<!ELEMENT h5 %Inline;>
+<!ATTLIST h5
+   %attrs;
+   >
+
+<!ELEMENT h6 %Inline;>
+<!ATTLIST h6
+   %attrs;
+   >
+
+<!--=================== Lists ============================================-->
+
+<!-- Unordered list -->
+
+<!ELEMENT ul (li)+>
+<!ATTLIST ul
+  %attrs;
+  >
+
+<!-- Ordered (numbered) list -->
+
+<!ELEMENT ol (li)+>
+<!ATTLIST ol
+  %attrs;
+  >
+
+<!-- list item -->
+
+<!ELEMENT li %Flow;>
+<!ATTLIST li
+  %attrs;
+  >
+
+<!-- definition lists - dt for term, dd for its definition -->
+
+<!ELEMENT dl (dt|dd)+>
+<!ATTLIST dl
+  %attrs;
+  >
+
+<!ELEMENT dt %Inline;>
+<!ATTLIST dt
+  %attrs;
+  >
+
+<!ELEMENT dd %Flow;>
+<!ATTLIST dd
+  %attrs;
+  >
+
+<!--=================== Address ==========================================-->
+
+<!-- information on author -->
+
+<!ELEMENT address %Inline;>
+<!ATTLIST address
+  %attrs;
+  >
+
+<!--=================== Horizontal Rule ==================================-->
+
+<!ELEMENT hr EMPTY>
+<!ATTLIST hr
+  %attrs;
+  >
+
+<!--=================== Preformatted Text ================================-->
+
+<!-- content is %Inline; excluding "img|object|big|small|sub|sup" -->
+
+<!ELEMENT pre %pre.content;>
+<!ATTLIST pre
+  %attrs;
+  xml:space (preserve) #FIXED 'preserve'
+  >
+
+<!--=================== Block-like Quotes ================================-->
+
+<!ELEMENT blockquote %Block;>
+<!ATTLIST blockquote
+  %attrs;
+  cite        %URI;          #IMPLIED
+  >
+
+<!--=================== Inserted/Deleted Text ============================-->
+
+<!--
+  ins/del are allowed in block and inline content, but its
+  inappropriate to include block content within an ins element
+  occurring in inline content.
+-->
+<!ELEMENT ins %Flow;>
+<!ATTLIST ins
+  %attrs;
+  cite        %URI;          #IMPLIED
+  datetime    %Datetime;     #IMPLIED
+  >
+
+<!ELEMENT del %Flow;>
+<!ATTLIST del
+  %attrs;
+  cite        %URI;          #IMPLIED
+  datetime    %Datetime;     #IMPLIED
+  >
+
+<!--================== The Anchor Element ================================-->
+
+<!-- content is %Inline; except that anchors shouldn't be nested -->
+
+<!ELEMENT a %a.content;>
+<!ATTLIST a
+  %attrs;
+  %focus;
+  charset     %Charset;      #IMPLIED
+  type        %ContentType;  #IMPLIED
+  name        NMTOKEN        #IMPLIED
+  href        %URI;          #IMPLIED
+  hreflang    %LanguageCode; #IMPLIED
+  rel         %LinkTypes;    #IMPLIED
+  rev         %LinkTypes;    #IMPLIED
+  shape       %Shape;        "rect"
+  coords      %Coords;       #IMPLIED
+  >
+
+<!--===================== Inline Elements ================================-->
+
+<!ELEMENT span %Inline;> <!-- generic language/style container -->
+<!ATTLIST span
+  %attrs;
+  >
+
+<!ELEMENT bdo %Inline;>  <!-- I18N BiDi over-ride -->
+<!ATTLIST bdo
+  %coreattrs;
+  %events;
+  lang        %LanguageCode; #IMPLIED
+  xml:lang    %LanguageCode; #IMPLIED
+  dir         (ltr|rtl)      #REQUIRED
+  >
+
+<!ELEMENT br EMPTY>   <!-- forced line break -->
+<!ATTLIST br
+  %coreattrs;
+  >
+
+<!ELEMENT em %Inline;>   <!-- emphasis -->
+<!ATTLIST em %attrs;>
+
+<!ELEMENT strong %Inline;>   <!-- strong emphasis -->
+<!ATTLIST strong %attrs;>
+
+<!ELEMENT dfn %Inline;>   <!-- definitional -->
+<!ATTLIST dfn %attrs;>
+
+<!ELEMENT code %Inline;>   <!-- program code -->
+<!ATTLIST code %attrs;>
+
+<!ELEMENT samp %Inline;>   <!-- sample -->
+<!ATTLIST samp %attrs;>
+
+<!ELEMENT kbd %Inline;>  <!-- something user would type -->
+<!ATTLIST kbd %attrs;>
+
+<!ELEMENT var %Inline;>   <!-- variable -->
+<!ATTLIST var %attrs;>
+
+<!ELEMENT cite %Inline;>   <!-- citation -->
+<!ATTLIST cite %attrs;>
+
+<!ELEMENT abbr %Inline;>   <!-- abbreviation -->
+<!ATTLIST abbr %attrs;>
+
+<!ELEMENT acronym %Inline;>   <!-- acronym -->
+<!ATTLIST acronym %attrs;>
+
+<!ELEMENT q %Inline;>   <!-- inlined quote -->
+<!ATTLIST q
+  %attrs;
+  cite        %URI;          #IMPLIED
+  >
+
+<!ELEMENT sub %Inline;> <!-- subscript -->
+<!ATTLIST sub %attrs;>
+
+<!ELEMENT sup %Inline;> <!-- superscript -->
+<!ATTLIST sup %attrs;>
+
+<!ELEMENT tt %Inline;>   <!-- fixed pitch font -->
+<!ATTLIST tt %attrs;>
+
+<!ELEMENT i %Inline;>   <!-- italic font -->
+<!ATTLIST i %attrs;>
+
+<!ELEMENT b %Inline;>   <!-- bold font -->
+<!ATTLIST b %attrs;>
+
+<!ELEMENT big %Inline;>   <!-- bigger font -->
+<!ATTLIST big %attrs;>
+
+<!ELEMENT small %Inline;>   <!-- smaller font -->
+<!ATTLIST small %attrs;>
+
+<!--==================== Object ======================================-->
+<!--
+  object is used to embed objects as part of HTML pages.
+  param elements should precede other content. Parameters
+  can also be expressed as attribute/value pairs on the
+  object element itself when brevity is desired.
+-->
+
+<!ELEMENT object (#PCDATA | param | %block; | form | %inline; | %misc;)*>
+<!ATTLIST object
+  %attrs;
+  declare     (declare)      #IMPLIED
+  classid     %URI;          #IMPLIED
+  codebase    %URI;          #IMPLIED
+  data        %URI;          #IMPLIED
+  type        %ContentType;  #IMPLIED
+  codetype    %ContentType;  #IMPLIED
+  archive     %UriList;      #IMPLIED
+  standby     %Text;         #IMPLIED
+  height      %Length;       #IMPLIED
+  width       %Length;       #IMPLIED
+  usemap      %URI;          #IMPLIED
+  name        NMTOKEN        #IMPLIED
+  tabindex    %Number;       #IMPLIED
+  >
+
+<!--
+  param is used to supply a named property value.
+  In XML it would seem natural to follow RDF and support an
+  abbreviated syntax where the param elements are replaced
+  by attribute value pairs on the object start tag.
+-->
+<!ELEMENT param EMPTY>
+<!ATTLIST param
+  id          ID             #IMPLIED
+  name        CDATA          #IMPLIED
+  value       CDATA          #IMPLIED
+  valuetype   (data|ref|object) "data"
+  type        %ContentType;  #IMPLIED
+  >
+
+<!--=================== Images ===========================================-->
+
+<!--
+   To avoid accessibility problems for people who aren't
+   able to see the image, you should provide a text
+   description using the alt and longdesc attributes.
+   In addition, avoid the use of server-side image maps.
+   Note that in this DTD there is no name attribute. That
+   is only available in the transitional and frameset DTD.
+-->
+
+<!ELEMENT img EMPTY>
+<!ATTLIST img
+  %attrs;
+  src         %URI;          #REQUIRED
+  alt         %Text;         #REQUIRED
+  longdesc    %URI;          #IMPLIED
+  height      %Length;       #IMPLIED
+  width       %Length;       #IMPLIED
+  usemap      %URI;          #IMPLIED
+  ismap       (ismap)        #IMPLIED
+  >
+
+<!-- usemap points to a map element which may be in this document
+  or an external document, although the latter is not widely supported -->
+
+<!--================== Client-side image maps ============================-->
+
+<!-- These can be placed in the same document or grouped in a
+     separate document although this isn't yet widely supported -->
+
+<!ELEMENT map ((%block; | form | %misc;)+ | area+)>
+<!ATTLIST map
+  %i18n;
+  %events;
+  id          ID             #REQUIRED
+  class       CDATA          #IMPLIED
+  style       %StyleSheet;   #IMPLIED
+  title       %Text;         #IMPLIED
+  name        NMTOKEN        #IMPLIED
+  >
+
+<!ELEMENT area EMPTY>
+<!ATTLIST area
+  %attrs;
+  %focus;
+  shape       %Shape;        "rect"
+  coords      %Coords;       #IMPLIED
+  href        %URI;          #IMPLIED
+  nohref      (nohref)       #IMPLIED
+  alt         %Text;         #REQUIRED
+  >
+
+<!--================ Forms ===============================================-->
+<!ELEMENT form %form.content;>   <!-- forms shouldn't be nested -->
+
+<!ATTLIST form
+  %attrs;
+  action      %URI;          #REQUIRED
+  method      (get|post)     "get"
+  enctype     %ContentType;  "application/x-www-form-urlencoded"
+  onsubmit    %Script;       #IMPLIED
+  onreset     %Script;       #IMPLIED
+  accept      %ContentTypes; #IMPLIED
+  accept-charset %Charsets;  #IMPLIED
+  >
+
+<!--
+  Each label must not contain more than ONE field
+  Label elements shouldn't be nested.
+-->
+<!ELEMENT label %Inline;>
+<!ATTLIST label
+  %attrs;
+  for         IDREF          #IMPLIED
+  accesskey   %Character;    #IMPLIED
+  onfocus     %Script;       #IMPLIED
+  onblur      %Script;       #IMPLIED
+  >
+
+<!ENTITY % InputType
+  "(text | password | checkbox |
+    radio | submit | reset |
+    file | hidden | image | button)"
+   >
+
+<!-- the name attribute is required for all but submit & reset -->
+
+<!ELEMENT input EMPTY>     <!-- form control -->
+<!ATTLIST input
+  %attrs;
+  %focus;
+  type        %InputType;    "text"
+  name        CDATA          #IMPLIED
+  value       CDATA          #IMPLIED
+  checked     (checked)      #IMPLIED
+  disabled    (disabled)     #IMPLIED
+  readonly    (readonly)     #IMPLIED
+  size        CDATA          #IMPLIED
+  maxlength   %Number;       #IMPLIED
+  src         %URI;          #IMPLIED
+  alt         CDATA          #IMPLIED
+  usemap      %URI;          #IMPLIED
+  onselect    %Script;       #IMPLIED
+  onchange    %Script;       #IMPLIED
+  accept      %ContentTypes; #IMPLIED
+  >
+
+<!ELEMENT select (optgroup|option)+>  <!-- option selector -->
+<!ATTLIST select
+  %attrs;
+  name        CDATA          #IMPLIED
+  size        %Number;       #IMPLIED
+  multiple    (multiple)     #IMPLIED
+  disabled    (disabled)     #IMPLIED
+  tabindex    %Number;       #IMPLIED
+  onfocus     %Script;       #IMPLIED
+  onblur      %Script;       #IMPLIED
+  onchange    %Script;       #IMPLIED
+  >
+
+<!ELEMENT optgroup (option)+>   <!-- option group -->
+<!ATTLIST optgroup
+  %attrs;
+  disabled    (disabled)     #IMPLIED
+  label       %Text;         #REQUIRED
+  >
+
+<!ELEMENT option (#PCDATA)>     <!-- selectable choice -->
+<!ATTLIST option
+  %attrs;
+  selected    (selected)     #IMPLIED
+  disabled    (disabled)     #IMPLIED
+  label       %Text;         #IMPLIED
+  value       CDATA          #IMPLIED
+  >
+
+<!ELEMENT textarea (#PCDATA)>     <!-- multi-line text field -->
+<!ATTLIST textarea
+  %attrs;
+  %focus;
+  name        CDATA          #IMPLIED
+  rows        %Number;       #REQUIRED
+  cols        %Number;       #REQUIRED
+  disabled    (disabled)     #IMPLIED
+  readonly    (readonly)     #IMPLIED
+  onselect    %Script;       #IMPLIED
+  onchange    %Script;       #IMPLIED
+  >
+
+<!--
+  The fieldset element is used to group form fields.
+  Only one legend element should occur in the content
+  and if present should only be preceded by whitespace.
+-->
+<!ELEMENT fieldset (#PCDATA | legend | %block; | form | %inline; | %misc;)*>
+<!ATTLIST fieldset
+  %attrs;
+  >
+
+<!ELEMENT legend %Inline;>     <!-- fieldset label -->
+<!ATTLIST legend
+  %attrs;
+  accesskey   %Character;    #IMPLIED
+  >
+
+<!--
+ Content is %Flow; excluding a, form and form controls
+--> 
+<!ELEMENT button %button.content;>  <!-- push button -->
+<!ATTLIST button
+  %attrs;
+  %focus;
+  name        CDATA          #IMPLIED
+  value       CDATA          #IMPLIED
+  type        (button|submit|reset) "submit"
+  disabled    (disabled)     #IMPLIED
+  >
+
+<!--======================= Tables =======================================-->
+
+<!-- Derived from IETF HTML table standard, see [RFC1942] -->
+
+<!--
+ The border attribute sets the thickness of the frame around the
+ table. The default units are screen pixels.
+
+ The frame attribute specifies which parts of the frame around
+ the table should be rendered. The values are not the same as
+ CALS to avoid a name clash with the valign attribute.
+-->
+<!ENTITY % TFrame "(void|above|below|hsides|lhs|rhs|vsides|box|border)">
+
+<!--
+ The rules attribute defines which rules to draw between cells:
+
+ If rules is absent then assume:
+     "none" if border is absent or border="0" otherwise "all"
+-->
+
+<!ENTITY % TRules "(none | groups | rows | cols | all)">
+  
+<!-- horizontal alignment attributes for cell contents
+
+  char        alignment char, e.g. char=':'
+  charoff     offset for alignment char
+-->
+<!ENTITY % cellhalign
+  "align      (left|center|right|justify|char) #IMPLIED
+   char       %Character;    #IMPLIED
+   charoff    %Length;       #IMPLIED"
+  >
+
+<!-- vertical alignment attributes for cell contents -->
+<!ENTITY % cellvalign
+  "valign     (top|middle|bottom|baseline) #IMPLIED"
+  >
+
+<!ELEMENT table
+     (caption?, (col*|colgroup*), thead?, tfoot?, (tbody+|tr+))>
+<!ELEMENT caption  %Inline;>
+<!ELEMENT thead    (tr)+>
+<!ELEMENT tfoot    (tr)+>
+<!ELEMENT tbody    (tr)+>
+<!ELEMENT colgroup (col)*>
+<!ELEMENT col      EMPTY>
+<!ELEMENT tr       (th|td)+>
+<!ELEMENT th       %Flow;>
+<!ELEMENT td       %Flow;>
+
+<!ATTLIST table
+  %attrs;
+  summary     %Text;         #IMPLIED
+  width       %Length;       #IMPLIED
+  border      %Pixels;       #IMPLIED
+  frame       %TFrame;       #IMPLIED
+  rules       %TRules;       #IMPLIED
+  cellspacing %Length;       #IMPLIED
+  cellpadding %Length;       #IMPLIED
+  >
+
+<!ATTLIST caption
+  %attrs;
+  >
+
+<!--
+colgroup groups a set of col elements. It allows you to group
+several semantically related columns together.
+-->
+<!ATTLIST colgroup
+  %attrs;
+  span        %Number;       "1"
+  width       %MultiLength;  #IMPLIED
+  %cellhalign;
+  %cellvalign;
+  >
+
+<!--
+ col elements define the alignment properties for cells in
+ one or more columns.
+
+ The width attribute specifies the width of the columns, e.g.
+
+     width=64        width in screen pixels
+     width=0.5*      relative width of 0.5
+
+ The span attribute causes the attributes of one
+ col element to apply to more than one column.
+-->
+<!ATTLIST col
+  %attrs;
+  span        %Number;       "1"
+  width       %MultiLength;  #IMPLIED
+  %cellhalign;
+  %cellvalign;
+  >
+
+<!--
+    Use thead to duplicate headers when breaking table
+    across page boundaries, or for static headers when
+    tbody sections are rendered in scrolling panel.
+
+    Use tfoot to duplicate footers when breaking table
+    across page boundaries, or for static footers when
+    tbody sections are rendered in scrolling panel.
+
+    Use multiple tbody sections when rules are needed
+    between groups of table rows.
+-->
+<!ATTLIST thead
+  %attrs;
+  %cellhalign;
+  %cellvalign;
+  >
+
+<!ATTLIST tfoot
+  %attrs;
+  %cellhalign;
+  %cellvalign;
+  >
+
+<!ATTLIST tbody
+  %attrs;
+  %cellhalign;
+  %cellvalign;
+  >
+
+<!ATTLIST tr
+  %attrs;
+  %cellhalign;
+  %cellvalign;
+  >
+
+
+<!-- Scope is simpler than headers attribute for common tables -->
+<!ENTITY % Scope "(row|col|rowgroup|colgroup)">
+
+<!-- th is for headers, td for data and for cells acting as both -->
+
+<!ATTLIST th
+  %attrs;
+  abbr        %Text;         #IMPLIED
+  axis        CDATA          #IMPLIED
+  headers     IDREFS         #IMPLIED
+  scope       %Scope;        #IMPLIED
+  rowspan     %Number;       "1"
+  colspan     %Number;       "1"
+  %cellhalign;
+  %cellvalign;
+  >
+
+<!ATTLIST td
+  %attrs;
+  abbr        %Text;         #IMPLIED
+  axis        CDATA          #IMPLIED
+  headers     IDREFS         #IMPLIED
+  scope       %Scope;        #IMPLIED
+  rowspan     %Number;       "1"
+  colspan     %Number;       "1"
+  %cellhalign;
+  %cellvalign;
+  >
+

Modified: xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/xhtml1-transitional.dtd
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/xhtml1-transitional.dtd?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/dom/W3C/level2/core/files/xhtml1-transitional.dtd&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/xhtml1-transitional.dtd&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/dom/W3C/level2/core/files/xhtml1-transitional.dtd	(original)
+++ xmlbeans/trunk/test/cases/xbean/dom/W3C/level2/core/files/xhtml1-transitional.dtd	Wed Dec  8 08:54:26 2004
@@ -1,1201 +1,1201 @@
-<!--
-   Extensible HTML version 1.0 Transitional DTD
-
-   This is the same as HTML 4 Transitional except for
-   changes due to the differences between XML and SGML.
-
-   Namespace = http://www.w3.org/1999/xhtml
-
-   For further information, see: http://www.w3.org/TR/xhtml1
-
-   Copyright (c) 1998-2002 W3C (MIT, INRIA, Keio),
-   All Rights Reserved. 
-
-   This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-   PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-   SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
-
-   $Revision: 1.1 $
-   $Date: 2004/06/08 19:37:55 $
-
--->
-
-<!--================ Character mnemonic entities =========================-->
-
-<!ENTITY % HTMLlat1 PUBLIC
-   "-//W3C//ENTITIES Latin 1 for XHTML//EN"
-   "xhtml-lat1.ent">
-%HTMLlat1;
-
-<!ENTITY % HTMLsymbol PUBLIC
-   "-//W3C//ENTITIES Symbols for XHTML//EN"
-   "xhtml-symbol.ent">
-%HTMLsymbol;
-
-<!ENTITY % HTMLspecial PUBLIC
-   "-//W3C//ENTITIES Special for XHTML//EN"
-   "xhtml-special.ent">
-%HTMLspecial;
-
-<!--================== Imported Names ====================================-->
-
-<!ENTITY % ContentType "CDATA">
-    <!-- media type, as per [RFC2045] -->
-
-<!ENTITY % ContentTypes "CDATA">
-    <!-- comma-separated list of media types, as per [RFC2045] -->
-
-<!ENTITY % Charset "CDATA">
-    <!-- a character encoding, as per [RFC2045] -->
-
-<!ENTITY % Charsets "CDATA">
-    <!-- a space separated list of character encodings, as per [RFC2045] -->
-
-<!ENTITY % LanguageCode "NMTOKEN">
-    <!-- a language code, as per [RFC3066] -->
-
-<!ENTITY % Character "CDATA">
-    <!-- a single character, as per section 2.2 of [XML] -->
-
-<!ENTITY % Number "CDATA">
-    <!-- one or more digits -->
-
-<!ENTITY % LinkTypes "CDATA">
-    <!-- space-separated list of link types -->
-
-<!ENTITY % MediaDesc "CDATA">
-    <!-- single or comma-separated list of media descriptors -->
-
-<!ENTITY % URI "CDATA">
-    <!-- a Uniform Resource Identifier, see [RFC2396] -->
-
-<!ENTITY % UriList "CDATA">
-    <!-- a space separated list of Uniform Resource Identifiers -->
-
-<!ENTITY % Datetime "CDATA">
-    <!-- date and time information. ISO date format -->
-
-<!ENTITY % Script "CDATA">
-    <!-- script expression -->
-
-<!ENTITY % StyleSheet "CDATA">
-    <!-- style sheet data -->
-
-<!ENTITY % Text "CDATA">
-    <!-- used for titles etc. -->
-
-<!ENTITY % FrameTarget "NMTOKEN">
-    <!-- render in this frame -->
-
-<!ENTITY % Length "CDATA">
-    <!-- nn for pixels or nn% for percentage length -->
-
-<!ENTITY % MultiLength "CDATA">
-    <!-- pixel, percentage, or relative -->
-
-<!ENTITY % Pixels "CDATA">
-    <!-- integer representing length in pixels -->
-
-<!-- these are used for image maps -->
-
-<!ENTITY % Shape "(rect|circle|poly|default)">
-
-<!ENTITY % Coords "CDATA">
-    <!-- comma separated list of lengths -->
-
-<!-- used for object, applet, img, input and iframe -->
-<!ENTITY % ImgAlign "(top|middle|bottom|left|right)">
-
-<!-- a color using sRGB: #RRGGBB as Hex values -->
-<!ENTITY % Color "CDATA">
-
-<!-- There are also 16 widely known color names with their sRGB values:
-
-    Black  = #000000    Green  = #008000
-    Silver = #C0C0C0    Lime   = #00FF00
-    Gray   = #808080    Olive  = #808000
-    White  = #FFFFFF    Yellow = #FFFF00
-    Maroon = #800000    Navy   = #000080
-    Red    = #FF0000    Blue   = #0000FF
-    Purple = #800080    Teal   = #008080
-    Fuchsia= #FF00FF    Aqua   = #00FFFF
--->
-
-<!--=================== Generic Attributes ===============================-->
-
-<!-- core attributes common to most elements
-  id       document-wide unique id
-  class    space separated list of classes
-  style    associated style info
-  title    advisory title/amplification
--->
-<!ENTITY % coreattrs
- "id          ID             #IMPLIED
-  class       CDATA          #IMPLIED
-  style       %StyleSheet;   #IMPLIED
-  title       %Text;         #IMPLIED"
-  >
-
-<!-- internationalization attributes
-  lang        language code (backwards compatible)
-  xml:lang    language code (as per XML 1.0 spec)
-  dir         direction for weak/neutral text
--->
-<!ENTITY % i18n
- "lang        %LanguageCode; #IMPLIED
-  xml:lang    %LanguageCode; #IMPLIED
-  dir         (ltr|rtl)      #IMPLIED"
-  >
-
-<!-- attributes for common UI events
-  onclick     a pointer button was clicked
-  ondblclick  a pointer button was double clicked
-  onmousedown a pointer button was pressed down
-  onmouseup   a pointer button was released
-  onmousemove a pointer was moved onto the element
-  onmouseout  a pointer was moved away from the element
-  onkeypress  a key was pressed and released
-  onkeydown   a key was pressed down
-  onkeyup     a key was released
--->
-<!ENTITY % events
- "onclick     %Script;       #IMPLIED
-  ondblclick  %Script;       #IMPLIED
-  onmousedown %Script;       #IMPLIED
-  onmouseup   %Script;       #IMPLIED
-  onmouseover %Script;       #IMPLIED
-  onmousemove %Script;       #IMPLIED
-  onmouseout  %Script;       #IMPLIED
-  onkeypress  %Script;       #IMPLIED
-  onkeydown   %Script;       #IMPLIED
-  onkeyup     %Script;       #IMPLIED"
-  >
-
-<!-- attributes for elements that can get the focus
-  accesskey   accessibility key character
-  tabindex    position in tabbing order
-  onfocus     the element got the focus
-  onblur      the element lost the focus
--->
-<!ENTITY % focus
- "accesskey   %Character;    #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED"
-  >
-
-<!ENTITY % attrs "%coreattrs; %i18n; %events;">
-
-<!-- text alignment for p, div, h1-h6. The default is
-     align="left" for ltr headings, "right" for rtl -->
-
-<!ENTITY % TextAlign "align (left|center|right|justify) #IMPLIED">
-
-<!--=================== Text Elements ====================================-->
-
-<!ENTITY % special.extra
-   "object | applet | img | map | iframe">
-	
-<!ENTITY % special.basic
-	"br | span | bdo">
-
-<!ENTITY % special
-   "%special.basic; | %special.extra;">
-
-<!ENTITY % fontstyle.extra "big | small | font | basefont">
-
-<!ENTITY % fontstyle.basic "tt | i | b | u
-                      | s | strike ">
-
-<!ENTITY % fontstyle "%fontstyle.basic; | %fontstyle.extra;">
-
-<!ENTITY % phrase.extra "sub | sup">
-<!ENTITY % phrase.basic "em | strong | dfn | code | q |
-                   samp | kbd | var | cite | abbr | acronym">
-
-<!ENTITY % phrase "%phrase.basic; | %phrase.extra;">
-
-<!ENTITY % inline.forms "input | select | textarea | label | button">
-
-<!-- these can occur at block or inline level -->
-<!ENTITY % misc.inline "ins | del | script">
-
-<!-- these can only occur at block level -->
-<!ENTITY % misc "noscript | %misc.inline;">
-
-<!ENTITY % inline "a | %special; | %fontstyle; | %phrase; | %inline.forms;">
-
-<!-- %Inline; covers inline or "text-level" elements -->
-<!ENTITY % Inline "(#PCDATA | %inline; | %misc.inline;)*">
-
-<!--================== Block level elements ==============================-->
-
-<!ENTITY % heading "h1|h2|h3|h4|h5|h6">
-<!ENTITY % lists "ul | ol | dl | menu | dir">
-<!ENTITY % blocktext "pre | hr | blockquote | address | center | noframes">
-
-<!ENTITY % block
-    "p | %heading; | div | %lists; | %blocktext; | isindex |fieldset | table">
-
-<!-- %Flow; mixes block and inline and is used for list items etc. -->
-<!ENTITY % Flow "(#PCDATA | %block; | form | %inline; | %misc;)*">
-
-<!--================== Content models for exclusions =====================-->
-
-<!-- a elements use %Inline; excluding a -->
-
-<!ENTITY % a.content
-   "(#PCDATA | %special; | %fontstyle; | %phrase; | %inline.forms; | %misc.inline;)*">
-
-<!-- pre uses %Inline excluding img, object, applet, big, small,
-     font, or basefont -->
-
-<!ENTITY % pre.content
-   "(#PCDATA | a | %special.basic; | %fontstyle.basic; | %phrase.basic; |
-	   %inline.forms; | %misc.inline;)*">
-
-<!-- form uses %Flow; excluding form -->
-
-<!ENTITY % form.content "(#PCDATA | %block; | %inline; | %misc;)*">
-
-<!-- button uses %Flow; but excludes a, form, form controls, iframe -->
-
-<!ENTITY % button.content
-   "(#PCDATA | p | %heading; | div | %lists; | %blocktext; |
-      table | br | span | bdo | object | applet | img | map |
-      %fontstyle; | %phrase; | %misc;)*">
-
-<!--================ Document Structure ==================================-->
-
-<!-- the namespace URI designates the document profile -->
-
-<!ELEMENT html (head, body)>
-<!ATTLIST html
-  %i18n;
-  id          ID             #IMPLIED
-  xmlns       %URI;          #FIXED 'http://www.w3.org/1999/xhtml'
-  >
-
-<!--================ Document Head =======================================-->
-
-<!ENTITY % head.misc "(script|style|meta|link|object|isindex)*">
-
-<!-- content model is %head.misc; combined with a single
-     title and an optional base element in any order -->
-
-<!ELEMENT head (%head.misc;,
-     ((title, %head.misc;, (base, %head.misc;)?) |
-      (base, %head.misc;, (title, %head.misc;))))>
-
-<!ATTLIST head
-  %i18n;
-  id          ID             #IMPLIED
-  profile     %URI;          #IMPLIED
-  >
-
-<!-- The title element is not considered part of the flow of text.
-       It should be displayed, for example as the page header or
-       window title. Exactly one title is required per document.
-    -->
-<!ELEMENT title (#PCDATA)>
-<!ATTLIST title 
-  %i18n;
-  id          ID             #IMPLIED
-  >
-
-<!-- document base URI -->
-
-<!ELEMENT base EMPTY>
-<!ATTLIST base
-  id          ID             #IMPLIED
-  href        %URI;          #IMPLIED
-  target      %FrameTarget;  #IMPLIED
-  >
-
-<!-- generic metainformation -->
-<!ELEMENT meta EMPTY>
-<!ATTLIST meta
-  %i18n;
-  id          ID             #IMPLIED
-  http-equiv  CDATA          #IMPLIED
-  name        CDATA          #IMPLIED
-  content     CDATA          #REQUIRED
-  scheme      CDATA          #IMPLIED
-  >
-
-<!--
-  Relationship values can be used in principle:
-
-   a) for document specific toolbars/menus when used
-      with the link element in document head e.g.
-        start, contents, previous, next, index, end, help
-   b) to link to a separate style sheet (rel="stylesheet")
-   c) to make a link to a script (rel="script")
-   d) by stylesheets to control how collections of
-      html nodes are rendered into printed documents
-   e) to make a link to a printable version of this document
-      e.g. a PostScript or PDF version (rel="alternate" media="print")
--->
-
-<!ELEMENT link EMPTY>
-<!ATTLIST link
-  %attrs;
-  charset     %Charset;      #IMPLIED
-  href        %URI;          #IMPLIED
-  hreflang    %LanguageCode; #IMPLIED
-  type        %ContentType;  #IMPLIED
-  rel         %LinkTypes;    #IMPLIED
-  rev         %LinkTypes;    #IMPLIED
-  media       %MediaDesc;    #IMPLIED
-  target      %FrameTarget;  #IMPLIED
-  >
-
-<!-- style info, which may include CDATA sections -->
-<!ELEMENT style (#PCDATA)>
-<!ATTLIST style
-  %i18n;
-  id          ID             #IMPLIED
-  type        %ContentType;  #REQUIRED
-  media       %MediaDesc;    #IMPLIED
-  title       %Text;         #IMPLIED
-  xml:space   (preserve)     #FIXED 'preserve'
-  >
-
-<!-- script statements, which may include CDATA sections -->
-<!ELEMENT script (#PCDATA)>
-<!ATTLIST script
-  id          ID             #IMPLIED
-  charset     %Charset;      #IMPLIED
-  type        %ContentType;  #REQUIRED
-  language    CDATA          #IMPLIED
-  src         %URI;          #IMPLIED
-  defer       (defer)        #IMPLIED
-  xml:space   (preserve)     #FIXED 'preserve'
-  >
-
-<!-- alternate content container for non script-based rendering -->
-
-<!ELEMENT noscript %Flow;>
-<!ATTLIST noscript
-  %attrs;
-  >
-
-<!--======================= Frames =======================================-->
-
-<!-- inline subwindow -->
-
-<!ELEMENT iframe %Flow;>
-<!ATTLIST iframe
-  %coreattrs;
-  longdesc    %URI;          #IMPLIED
-  name        NMTOKEN        #IMPLIED
-  src         %URI;          #IMPLIED
-  frameborder (1|0)          "1"
-  marginwidth %Pixels;       #IMPLIED
-  marginheight %Pixels;      #IMPLIED
-  scrolling   (yes|no|auto)  "auto"
-  align       %ImgAlign;     #IMPLIED
-  height      %Length;       #IMPLIED
-  width       %Length;       #IMPLIED
-  >
-
-<!-- alternate content container for non frame-based rendering -->
-
-<!ELEMENT noframes %Flow;>
-<!ATTLIST noframes
-  %attrs;
-  >
-
-<!--=================== Document Body ====================================-->
-
-<!ELEMENT body %Flow;>
-<!ATTLIST body
-  %attrs;
-  onload      %Script;       #IMPLIED
-  onunload    %Script;       #IMPLIED
-  background  %URI;          #IMPLIED
-  bgcolor     %Color;        #IMPLIED
-  text        %Color;        #IMPLIED
-  link        %Color;        #IMPLIED
-  vlink       %Color;        #IMPLIED
-  alink       %Color;        #IMPLIED
-  >
-
-<!ELEMENT div %Flow;>  <!-- generic language/style container -->
-<!ATTLIST div
-  %attrs;
-  %TextAlign;
-  >
-
-<!--=================== Paragraphs =======================================-->
-
-<!ELEMENT p %Inline;>
-<!ATTLIST p
-  %attrs;
-  %TextAlign;
-  >
-
-<!--=================== Headings =========================================-->
-
-<!--
-  There are six levels of headings from h1 (the most important)
-  to h6 (the least important).
--->
-
-<!ELEMENT h1  %Inline;>
-<!ATTLIST h1
-  %attrs;
-  %TextAlign;
-  >
-
-<!ELEMENT h2 %Inline;>
-<!ATTLIST h2
-  %attrs;
-  %TextAlign;
-  >
-
-<!ELEMENT h3 %Inline;>
-<!ATTLIST h3
-  %attrs;
-  %TextAlign;
-  >
-
-<!ELEMENT h4 %Inline;>
-<!ATTLIST h4
-  %attrs;
-  %TextAlign;
-  >
-
-<!ELEMENT h5 %Inline;>
-<!ATTLIST h5
-  %attrs;
-  %TextAlign;
-  >
-
-<!ELEMENT h6 %Inline;>
-<!ATTLIST h6
-  %attrs;
-  %TextAlign;
-  >
-
-<!--=================== Lists ============================================-->
-
-<!-- Unordered list bullet styles -->
-
-<!ENTITY % ULStyle "(disc|square|circle)">
-
-<!-- Unordered list -->
-
-<!ELEMENT ul (li)+>
-<!ATTLIST ul
-  %attrs;
-  type        %ULStyle;     #IMPLIED
-  compact     (compact)     #IMPLIED
-  >
-
-<!-- Ordered list numbering style
-
-    1   arabic numbers      1, 2, 3, ...
-    a   lower alpha         a, b, c, ...
-    A   upper alpha         A, B, C, ...
-    i   lower roman         i, ii, iii, ...
-    I   upper roman         I, II, III, ...
-
-    The style is applied to the sequence number which by default
-    is reset to 1 for the first list item in an ordered list.
--->
-<!ENTITY % OLStyle "CDATA">
-
-<!-- Ordered (numbered) list -->
-
-<!ELEMENT ol (li)+>
-<!ATTLIST ol
-  %attrs;
-  type        %OLStyle;      #IMPLIED
-  compact     (compact)      #IMPLIED
-  start       %Number;       #IMPLIED
-  >
-
-<!-- single column list (DEPRECATED) --> 
-<!ELEMENT menu (li)+>
-<!ATTLIST menu
-  %attrs;
-  compact     (compact)     #IMPLIED
-  >
-
-<!-- multiple column list (DEPRECATED) --> 
-<!ELEMENT dir (li)+>
-<!ATTLIST dir
-  %attrs;
-  compact     (compact)     #IMPLIED
-  >
-
-<!-- LIStyle is constrained to: "(%ULStyle;|%OLStyle;)" -->
-<!ENTITY % LIStyle "CDATA">
-
-<!-- list item -->
-
-<!ELEMENT li %Flow;>
-<!ATTLIST li
-  %attrs;
-  type        %LIStyle;      #IMPLIED
-  value       %Number;       #IMPLIED
-  >
-
-<!-- definition lists - dt for term, dd for its definition -->
-
-<!ELEMENT dl (dt|dd)+>
-<!ATTLIST dl
-  %attrs;
-  compact     (compact)      #IMPLIED
-  >
-
-<!ELEMENT dt %Inline;>
-<!ATTLIST dt
-  %attrs;
-  >
-
-<!ELEMENT dd %Flow;>
-<!ATTLIST dd
-  %attrs;
-  >
-
-<!--=================== Address ==========================================-->
-
-<!-- information on author -->
-
-<!ELEMENT address (#PCDATA | %inline; | %misc.inline; | p)*>
-<!ATTLIST address
-  %attrs;
-  >
-
-<!--=================== Horizontal Rule ==================================-->
-
-<!ELEMENT hr EMPTY>
-<!ATTLIST hr
-  %attrs;
-  align       (left|center|right) #IMPLIED
-  noshade     (noshade)      #IMPLIED
-  size        %Pixels;       #IMPLIED
-  width       %Length;       #IMPLIED
-  >
-
-<!--=================== Preformatted Text ================================-->
-
-<!-- content is %Inline; excluding 
-        "img|object|applet|big|small|sub|sup|font|basefont" -->
-
-<!ELEMENT pre %pre.content;>
-<!ATTLIST pre
-  %attrs;
-  width       %Number;      #IMPLIED
-  xml:space   (preserve)    #FIXED 'preserve'
-  >
-
-<!--=================== Block-like Quotes ================================-->
-
-<!ELEMENT blockquote %Flow;>
-<!ATTLIST blockquote
-  %attrs;
-  cite        %URI;          #IMPLIED
-  >
-
-<!--=================== Text alignment ===================================-->
-
-<!-- center content -->
-<!ELEMENT center %Flow;>
-<!ATTLIST center
-  %attrs;
-  >
-
-<!--=================== Inserted/Deleted Text ============================-->
-
-<!--
-  ins/del are allowed in block and inline content, but its
-  inappropriate to include block content within an ins element
-  occurring in inline content.
--->
-<!ELEMENT ins %Flow;>
-<!ATTLIST ins
-  %attrs;
-  cite        %URI;          #IMPLIED
-  datetime    %Datetime;     #IMPLIED
-  >
-
-<!ELEMENT del %Flow;>
-<!ATTLIST del
-  %attrs;
-  cite        %URI;          #IMPLIED
-  datetime    %Datetime;     #IMPLIED
-  >
-
-<!--================== The Anchor Element ================================-->
-
-<!-- content is %Inline; except that anchors shouldn't be nested -->
-
-<!ELEMENT a %a.content;>
-<!ATTLIST a
-  %attrs;
-  %focus;
-  charset     %Charset;      #IMPLIED
-  type        %ContentType;  #IMPLIED
-  name        NMTOKEN        #IMPLIED
-  href        %URI;          #IMPLIED
-  hreflang    %LanguageCode; #IMPLIED
-  rel         %LinkTypes;    #IMPLIED
-  rev         %LinkTypes;    #IMPLIED
-  shape       %Shape;        "rect"
-  coords      %Coords;       #IMPLIED
-  target      %FrameTarget;  #IMPLIED
-  >
-
-<!--===================== Inline Elements ================================-->
-
-<!ELEMENT span %Inline;> <!-- generic language/style container -->
-<!ATTLIST span
-  %attrs;
-  >
-
-<!ELEMENT bdo %Inline;>  <!-- I18N BiDi over-ride -->
-<!ATTLIST bdo
-  %coreattrs;
-  %events;
-  lang        %LanguageCode; #IMPLIED
-  xml:lang    %LanguageCode; #IMPLIED
-  dir         (ltr|rtl)      #REQUIRED
-  >
-
-<!ELEMENT br EMPTY>   <!-- forced line break -->
-<!ATTLIST br
-  %coreattrs;
-  clear       (left|all|right|none) "none"
-  >
-
-<!ELEMENT em %Inline;>   <!-- emphasis -->
-<!ATTLIST em %attrs;>
-
-<!ELEMENT strong %Inline;>   <!-- strong emphasis -->
-<!ATTLIST strong %attrs;>
-
-<!ELEMENT dfn %Inline;>   <!-- definitional -->
-<!ATTLIST dfn %attrs;>
-
-<!ELEMENT code %Inline;>   <!-- program code -->
-<!ATTLIST code %attrs;>
-
-<!ELEMENT samp %Inline;>   <!-- sample -->
-<!ATTLIST samp %attrs;>
-
-<!ELEMENT kbd %Inline;>  <!-- something user would type -->
-<!ATTLIST kbd %attrs;>
-
-<!ELEMENT var %Inline;>   <!-- variable -->
-<!ATTLIST var %attrs;>
-
-<!ELEMENT cite %Inline;>   <!-- citation -->
-<!ATTLIST cite %attrs;>
-
-<!ELEMENT abbr %Inline;>   <!-- abbreviation -->
-<!ATTLIST abbr %attrs;>
-
-<!ELEMENT acronym %Inline;>   <!-- acronym -->
-<!ATTLIST acronym %attrs;>
-
-<!ELEMENT q %Inline;>   <!-- inlined quote -->
-<!ATTLIST q
-  %attrs;
-  cite        %URI;          #IMPLIED
-  >
-
-<!ELEMENT sub %Inline;> <!-- subscript -->
-<!ATTLIST sub %attrs;>
-
-<!ELEMENT sup %Inline;> <!-- superscript -->
-<!ATTLIST sup %attrs;>
-
-<!ELEMENT tt %Inline;>   <!-- fixed pitch font -->
-<!ATTLIST tt %attrs;>
-
-<!ELEMENT i %Inline;>   <!-- italic font -->
-<!ATTLIST i %attrs;>
-
-<!ELEMENT b %Inline;>   <!-- bold font -->
-<!ATTLIST b %attrs;>
-
-<!ELEMENT big %Inline;>   <!-- bigger font -->
-<!ATTLIST big %attrs;>
-
-<!ELEMENT small %Inline;>   <!-- smaller font -->
-<!ATTLIST small %attrs;>
-
-<!ELEMENT u %Inline;>   <!-- underline -->
-<!ATTLIST u %attrs;>
-
-<!ELEMENT s %Inline;>   <!-- strike-through -->
-<!ATTLIST s %attrs;>
-
-<!ELEMENT strike %Inline;>   <!-- strike-through -->
-<!ATTLIST strike %attrs;>
-
-<!ELEMENT basefont EMPTY>  <!-- base font size -->
-<!ATTLIST basefont
-  id          ID             #IMPLIED
-  size        CDATA          #REQUIRED
-  color       %Color;        #IMPLIED
-  face        CDATA          #IMPLIED
-  >
-
-<!ELEMENT font %Inline;> <!-- local change to font -->
-<!ATTLIST font
-  %coreattrs;
-  %i18n;
-  size        CDATA          #IMPLIED
-  color       %Color;        #IMPLIED
-  face        CDATA          #IMPLIED
-  >
-
-<!--==================== Object ======================================-->
-<!--
-  object is used to embed objects as part of HTML pages.
-  param elements should precede other content. Parameters
-  can also be expressed as attribute/value pairs on the
-  object element itself when brevity is desired.
--->
-
-<!ELEMENT object (#PCDATA | param | %block; | form | %inline; | %misc;)*>
-<!ATTLIST object
-  %attrs;
-  declare     (declare)      #IMPLIED
-  classid     %URI;          #IMPLIED
-  codebase    %URI;          #IMPLIED
-  data        %URI;          #IMPLIED
-  type        %ContentType;  #IMPLIED
-  codetype    %ContentType;  #IMPLIED
-  archive     %UriList;      #IMPLIED
-  standby     %Text;         #IMPLIED
-  height      %Length;       #IMPLIED
-  width       %Length;       #IMPLIED
-  usemap      %URI;          #IMPLIED
-  name        NMTOKEN        #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  align       %ImgAlign;     #IMPLIED
-  border      %Pixels;       #IMPLIED
-  hspace      %Pixels;       #IMPLIED
-  vspace      %Pixels;       #IMPLIED
-  >
-
-<!--
-  param is used to supply a named property value.
-  In XML it would seem natural to follow RDF and support an
-  abbreviated syntax where the param elements are replaced
-  by attribute value pairs on the object start tag.
--->
-<!ELEMENT param EMPTY>
-<!ATTLIST param
-  id          ID             #IMPLIED
-  name        CDATA          #REQUIRED
-  value       CDATA          #IMPLIED
-  valuetype   (data|ref|object) "data"
-  type        %ContentType;  #IMPLIED
-  >
-
-<!--=================== Java applet ==================================-->
-<!--
-  One of code or object attributes must be present.
-  Place param elements before other content.
--->
-<!ELEMENT applet (#PCDATA | param | %block; | form | %inline; | %misc;)*>
-<!ATTLIST applet
-  %coreattrs;
-  codebase    %URI;          #IMPLIED
-  archive     CDATA          #IMPLIED
-  code        CDATA          #IMPLIED
-  object      CDATA          #IMPLIED
-  alt         %Text;         #IMPLIED
-  name        NMTOKEN        #IMPLIED
-  width       %Length;       #REQUIRED
-  height      %Length;       #REQUIRED
-  align       %ImgAlign;     #IMPLIED
-  hspace      %Pixels;       #IMPLIED
-  vspace      %Pixels;       #IMPLIED
-  >
-
-<!--=================== Images ===========================================-->
-
-<!--
-   To avoid accessibility problems for people who aren't
-   able to see the image, you should provide a text
-   description using the alt and longdesc attributes.
-   In addition, avoid the use of server-side image maps.
--->
-
-<!ELEMENT img EMPTY>
-<!ATTLIST img
-  %attrs;
-  src         %URI;          #REQUIRED
-  alt         %Text;         #REQUIRED
-  name        NMTOKEN        #IMPLIED
-  longdesc    %URI;          #IMPLIED
-  height      %Length;       #IMPLIED
-  width       %Length;       #IMPLIED
-  usemap      %URI;          #IMPLIED
-  ismap       (ismap)        #IMPLIED
-  align       %ImgAlign;     #IMPLIED
-  border      %Length;       #IMPLIED
-  hspace      %Pixels;       #IMPLIED
-  vspace      %Pixels;       #IMPLIED
-  >
-
-<!-- usemap points to a map element which may be in this document
-  or an external document, although the latter is not widely supported -->
-
-<!--================== Client-side image maps ============================-->
-
-<!-- These can be placed in the same document or grouped in a
-     separate document although this isn't yet widely supported -->
-
-<!ELEMENT map ((%block; | form | %misc;)+ | area+)>
-<!ATTLIST map
-  %i18n;
-  %events;
-  id          ID             #REQUIRED
-  class       CDATA          #IMPLIED
-  style       %StyleSheet;   #IMPLIED
-  title       %Text;         #IMPLIED
-  name        CDATA          #IMPLIED
-  >
-
-<!ELEMENT area EMPTY>
-<!ATTLIST area
-  %attrs;
-  %focus;
-  shape       %Shape;        "rect"
-  coords      %Coords;       #IMPLIED
-  href        %URI;          #IMPLIED
-  nohref      (nohref)       #IMPLIED
-  alt         %Text;         #REQUIRED
-  target      %FrameTarget;  #IMPLIED
-  >
-
-<!--================ Forms ===============================================-->
-
-<!ELEMENT form %form.content;>   <!-- forms shouldn't be nested -->
-
-<!ATTLIST form
-  %attrs;
-  action      %URI;          #REQUIRED
-  method      (get|post)     "get"
-  name        NMTOKEN        #IMPLIED
-  enctype     %ContentType;  "application/x-www-form-urlencoded"
-  onsubmit    %Script;       #IMPLIED
-  onreset     %Script;       #IMPLIED
-  accept      %ContentTypes; #IMPLIED
-  accept-charset %Charsets;  #IMPLIED
-  target      %FrameTarget;  #IMPLIED
-  >
-
-<!--
-  Each label must not contain more than ONE field
-  Label elements shouldn't be nested.
--->
-<!ELEMENT label %Inline;>
-<!ATTLIST label
-  %attrs;
-  for         IDREF          #IMPLIED
-  accesskey   %Character;    #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED
-  >
-
-<!ENTITY % InputType
-  "(text | password | checkbox |
-    radio | submit | reset |
-    file | hidden | image | button)"
-   >
-
-<!-- the name attribute is required for all but submit & reset -->
-
-<!ELEMENT input EMPTY>     <!-- form control -->
-<!ATTLIST input
-  %attrs;
-  %focus;
-  type        %InputType;    "text"
-  name        CDATA          #IMPLIED
-  value       CDATA          #IMPLIED
-  checked     (checked)      #IMPLIED
-  disabled    (disabled)     #IMPLIED
-  readonly    (readonly)     #IMPLIED
-  size        CDATA          #IMPLIED
-  maxlength   %Number;       #IMPLIED
-  src         %URI;          #IMPLIED
-  alt         CDATA          #IMPLIED
-  usemap      %URI;          #IMPLIED
-  onselect    %Script;       #IMPLIED
-  onchange    %Script;       #IMPLIED
-  accept      %ContentTypes; #IMPLIED
-  align       %ImgAlign;     #IMPLIED
-  >
-
-<!ELEMENT select (optgroup|option)+>  <!-- option selector -->
-<!ATTLIST select
-  %attrs;
-  name        CDATA          #IMPLIED
-  size        %Number;       #IMPLIED
-  multiple    (multiple)     #IMPLIED
-  disabled    (disabled)     #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED
-  onchange    %Script;       #IMPLIED
-  >
-
-<!ELEMENT optgroup (option)+>   <!-- option group -->
-<!ATTLIST optgroup
-  %attrs;
-  disabled    (disabled)     #IMPLIED
-  label       %Text;         #REQUIRED
-  >
-
-<!ELEMENT option (#PCDATA)>     <!-- selectable choice -->
-<!ATTLIST option
-  %attrs;
-  selected    (selected)     #IMPLIED
-  disabled    (disabled)     #IMPLIED
-  label       %Text;         #IMPLIED
-  value       CDATA          #IMPLIED
-  >
-
-<!ELEMENT textarea (#PCDATA)>     <!-- multi-line text field -->
-<!ATTLIST textarea
-  %attrs;
-  %focus;
-  name        CDATA          #IMPLIED
-  rows        %Number;       #REQUIRED
-  cols        %Number;       #REQUIRED
-  disabled    (disabled)     #IMPLIED
-  readonly    (readonly)     #IMPLIED
-  onselect    %Script;       #IMPLIED
-  onchange    %Script;       #IMPLIED
-  >
-
-<!--
-  The fieldset element is used to group form fields.
-  Only one legend element should occur in the content
-  and if present should only be preceded by whitespace.
--->
-<!ELEMENT fieldset (#PCDATA | legend | %block; | form | %inline; | %misc;)*>
-<!ATTLIST fieldset
-  %attrs;
-  >
-
-<!ENTITY % LAlign "(top|bottom|left|right)">
-
-<!ELEMENT legend %Inline;>     <!-- fieldset label -->
-<!ATTLIST legend
-  %attrs;
-  accesskey   %Character;    #IMPLIED
-  align       %LAlign;       #IMPLIED
-  >
-
-<!--
- Content is %Flow; excluding a, form, form controls, iframe
---> 
-<!ELEMENT button %button.content;>  <!-- push button -->
-<!ATTLIST button
-  %attrs;
-  %focus;
-  name        CDATA          #IMPLIED
-  value       CDATA          #IMPLIED
-  type        (button|submit|reset) "submit"
-  disabled    (disabled)     #IMPLIED
-  >
-
-<!-- single-line text input control (DEPRECATED) -->
-<!ELEMENT isindex EMPTY>
-<!ATTLIST isindex
-  %coreattrs;
-  %i18n;
-  prompt      %Text;         #IMPLIED
-  >
-
-<!--======================= Tables =======================================-->
-
-<!-- Derived from IETF HTML table standard, see [RFC1942] -->
-
-<!--
- The border attribute sets the thickness of the frame around the
- table. The default units are screen pixels.
-
- The frame attribute specifies which parts of the frame around
- the table should be rendered. The values are not the same as
- CALS to avoid a name clash with the valign attribute.
--->
-<!ENTITY % TFrame "(void|above|below|hsides|lhs|rhs|vsides|box|border)">
-
-<!--
- The rules attribute defines which rules to draw between cells:
-
- If rules is absent then assume:
-     "none" if border is absent or border="0" otherwise "all"
--->
-
-<!ENTITY % TRules "(none | groups | rows | cols | all)">
-  
-<!-- horizontal placement of table relative to document -->
-<!ENTITY % TAlign "(left|center|right)">
-
-<!-- horizontal alignment attributes for cell contents
-
-  char        alignment char, e.g. char=':'
-  charoff     offset for alignment char
--->
-<!ENTITY % cellhalign
-  "align      (left|center|right|justify|char) #IMPLIED
-   char       %Character;    #IMPLIED
-   charoff    %Length;       #IMPLIED"
-  >
-
-<!-- vertical alignment attributes for cell contents -->
-<!ENTITY % cellvalign
-  "valign     (top|middle|bottom|baseline) #IMPLIED"
-  >
-
-<!ELEMENT table
-     (caption?, (col*|colgroup*), thead?, tfoot?, (tbody+|tr+))>
-<!ELEMENT caption  %Inline;>
-<!ELEMENT thead    (tr)+>
-<!ELEMENT tfoot    (tr)+>
-<!ELEMENT tbody    (tr)+>
-<!ELEMENT colgroup (col)*>
-<!ELEMENT col      EMPTY>
-<!ELEMENT tr       (th|td)+>
-<!ELEMENT th       %Flow;>
-<!ELEMENT td       %Flow;>
-
-<!ATTLIST table
-  %attrs;
-  summary     %Text;         #IMPLIED
-  width       %Length;       #IMPLIED
-  border      %Pixels;       #IMPLIED
-  frame       %TFrame;       #IMPLIED
-  rules       %TRules;       #IMPLIED
-  cellspacing %Length;       #IMPLIED
-  cellpadding %Length;       #IMPLIED
-  align       %TAlign;       #IMPLIED
-  bgcolor     %Color;        #IMPLIED
-  >
-
-<!ENTITY % CAlign "(top|bottom|left|right)">
-
-<!ATTLIST caption
-  %attrs;
-  align       %CAlign;       #IMPLIED
-  >
-
-<!--
-colgroup groups a set of col elements. It allows you to group
-several semantically related columns together.
--->
-<!ATTLIST colgroup
-  %attrs;
-  span        %Number;       "1"
-  width       %MultiLength;  #IMPLIED
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!--
- col elements define the alignment properties for cells in
- one or more columns.
-
- The width attribute specifies the width of the columns, e.g.
-
-     width=64        width in screen pixels
-     width=0.5*      relative width of 0.5
-
- The span attribute causes the attributes of one
- col element to apply to more than one column.
--->
-<!ATTLIST col
-  %attrs;
-  span        %Number;       "1"
-  width       %MultiLength;  #IMPLIED
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!--
-    Use thead to duplicate headers when breaking table
-    across page boundaries, or for static headers when
-    tbody sections are rendered in scrolling panel.
-
-    Use tfoot to duplicate footers when breaking table
-    across page boundaries, or for static footers when
-    tbody sections are rendered in scrolling panel.
-
-    Use multiple tbody sections when rules are needed
-    between groups of table rows.
--->
-<!ATTLIST thead
-  %attrs;
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!ATTLIST tfoot
-  %attrs;
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!ATTLIST tbody
-  %attrs;
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!ATTLIST tr
-  %attrs;
-  %cellhalign;
-  %cellvalign;
-  bgcolor     %Color;        #IMPLIED
-  >
-
-<!-- Scope is simpler than headers attribute for common tables -->
-<!ENTITY % Scope "(row|col|rowgroup|colgroup)">
-
-<!-- th is for headers, td for data and for cells acting as both -->
-
-<!ATTLIST th
-  %attrs;
-  abbr        %Text;         #IMPLIED
-  axis        CDATA          #IMPLIED
-  headers     IDREFS         #IMPLIED
-  scope       %Scope;        #IMPLIED
-  rowspan     %Number;       "1"
-  colspan     %Number;       "1"
-  %cellhalign;
-  %cellvalign;
-  nowrap      (nowrap)       #IMPLIED
-  bgcolor     %Color;        #IMPLIED
-  width       %Length;       #IMPLIED
-  height      %Length;       #IMPLIED
-  >
-
-<!ATTLIST td
-  %attrs;
-  abbr        %Text;         #IMPLIED
-  axis        CDATA          #IMPLIED
-  headers     IDREFS         #IMPLIED
-  scope       %Scope;        #IMPLIED
-  rowspan     %Number;       "1"
-  colspan     %Number;       "1"
-  %cellhalign;
-  %cellvalign;
-  nowrap      (nowrap)       #IMPLIED
-  bgcolor     %Color;        #IMPLIED
-  width       %Length;       #IMPLIED
-  height      %Length;       #IMPLIED
-  >
-
+<!--
+   Extensible HTML version 1.0 Transitional DTD
+
+   This is the same as HTML 4 Transitional except for
+   changes due to the differences between XML and SGML.
+
+   Namespace = http://www.w3.org/1999/xhtml
+
+   For further information, see: http://www.w3.org/TR/xhtml1
+
+   Copyright (c) 1998-2002 W3C (MIT, INRIA, Keio),
+   All Rights Reserved. 
+
+   This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+   PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+   SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
+
+   $Revision$
+   $Date$
+
+-->
+
+<!--================ Character mnemonic entities =========================-->
+
+<!ENTITY % HTMLlat1 PUBLIC
+   "-//W3C//ENTITIES Latin 1 for XHTML//EN"
+   "xhtml-lat1.ent">
+%HTMLlat1;
+
+<!ENTITY % HTMLsymbol PUBLIC
+   "-//W3C//ENTITIES Symbols for XHTML//EN"
+   "xhtml-symbol.ent">
+%HTMLsymbol;
+
+<!ENTITY % HTMLspecial PUBLIC
+   "-//W3C//ENTITIES Special for XHTML//EN"
+   "xhtml-special.ent">
+%HTMLspecial;
+
+<!--================== Imported Names ====================================-->
+
+<!ENTITY % ContentType "CDATA">
+    <!-- media type, as per [RFC2045] -->
+
+<!ENTITY % ContentTypes "CDATA">
+    <!-- comma-separated list of media types, as per [RFC2045] -->
+
+<!ENTITY % Charset "CDATA">
+    <!-- a character encoding, as per [RFC2045] -->
+
+<!ENTITY % Charsets "CDATA">
+    <!-- a space separated list of character encodings, as per [RFC2045] -->
+
+<!ENTITY % LanguageCode "NMTOKEN">
+    <!-- a language code, as per [RFC3066] -->
+
+<!ENTITY % Character "CDATA">
+    <!-- a single character, as per section 2.2 of [XML] -->
+
+<!ENTITY % Number "CDATA">
+    <!-- one or more digits -->
+
+<!ENTITY % LinkTypes "CDATA">
+    <!-- space-separated list of link types -->
+
+<!ENTITY % MediaDesc "CDATA">
+    <!-- single or comma-separated list of media descriptors -->
+
+<!ENTITY % URI "CDATA">
+    <!-- a Uniform Resource Identifier, see [RFC2396] -->
+
+<!ENTITY % UriList "CDATA">
+    <!-- a space separated list of Uniform Resource Identifiers -->
+
+<!ENTITY % Datetime "CDATA">
+    <!-- date and time information. ISO date format -->
+
+<!ENTITY % Script "CDATA">
+    <!-- script expression -->
+
+<!ENTITY % StyleSheet "CDATA">
+    <!-- style sheet data -->
+
+<!ENTITY % Text "CDATA">
+    <!-- used for titles etc. -->
+
+<!ENTITY % FrameTarget "NMTOKEN">
+    <!-- render in this frame -->
+
+<!ENTITY % Length "CDATA">
+    <!-- nn for pixels or nn% for percentage length -->
+
+<!ENTITY % MultiLength "CDATA">
+    <!-- pixel, percentage, or relative -->
+
+<!ENTITY % Pixels "CDATA">
+    <!-- integer representing length in pixels -->
+
+<!-- these are used for image maps -->
+
+<!ENTITY % Shape "(rect|circle|poly|default)">
+
+<!ENTITY % Coords "CDATA">
+    <!-- comma separated list of lengths -->
+
+<!-- used for object, applet, img, input and iframe -->
+<!ENTITY % ImgAlign "(top|middle|bottom|left|right)">
+
+<!-- a color using sRGB: #RRGGBB as Hex values -->
+<!ENTITY % Color "CDATA">
+
+<!-- There are also 16 widely known color names with their sRGB values:
+
+    Black  = #000000    Green  = #008000
+    Silver = #C0C0C0    Lime   = #00FF00
+    Gray   = #808080    Olive  = #808000
+    White  = #FFFFFF    Yellow = #FFFF00
+    Maroon = #800000    Navy   = #000080
+    Red    = #FF0000    Blue   = #0000FF
+    Purple = #800080    Teal   = #008080
+    Fuchsia= #FF00FF    Aqua   = #00FFFF
+-->
+
+<!--=================== Generic Attributes ===============================-->
+
+<!-- core attributes common to most elements
+  id       document-wide unique id
+  class    space separated list of classes
+  style    associated style info
+  title    advisory title/amplification
+-->
+<!ENTITY % coreattrs
+ "id          ID             #IMPLIED
+  class       CDATA          #IMPLIED
+  style       %StyleSheet;   #IMPLIED
+  title       %Text;         #IMPLIED"
+  >
+
+<!-- internationalization attributes
+  lang        language code (backwards compatible)
+  xml:lang    language code (as per XML 1.0 spec)
+  dir         direction for weak/neutral text
+-->
+<!ENTITY % i18n
+ "lang        %LanguageCode; #IMPLIED
+  xml:lang    %LanguageCode; #IMPLIED
+  dir         (ltr|rtl)      #IMPLIED"
+  >
+
+<!-- attributes for common UI events
+  onclick     a pointer button was clicked
+  ondblclick  a pointer button was double clicked
+  onmousedown a pointer button was pressed down
+  onmouseup   a pointer button was released
+  onmousemove a pointer was moved onto the element
+  onmouseout  a pointer was moved away from the element
+  onkeypress  a key was pressed and released
+  onkeydown   a key was pressed down
+  onkeyup     a key was released
+-->
+<!ENTITY % events
+ "onclick     %Script;       #IMPLIED
+  ondblclick  %Script;       #IMPLIED
+  onmousedown %Script;       #IMPLIED
+  onmouseup   %Script;       #IMPLIED
+  onmouseover %Script;       #IMPLIED
+  onmousemove %Script;       #IMPLIED
+  onmouseout  %Script;       #IMPLIED
+  onkeypress  %Script;       #IMPLIED
+  onkeydown   %Script;       #IMPLIED
+  onkeyup     %Script;       #IMPLIED"
+  >
+
+<!-- attributes for elements that can get the focus
+  accesskey   accessibility key character
+  tabindex    position in tabbing order
+  onfocus     the element got the focus
+  onblur      the element lost the focus
+-->
+<!ENTITY % focus
+ "accesskey   %Character;    #IMPLIED
+  tabindex    %Number;       #IMPLIED
+  onfocus     %Script;       #IMPLIED
+  onblur      %Script;       #IMPLIED"
+  >
+
+<!ENTITY % attrs "%coreattrs; %i18n; %events;">
+
+<!-- text alignment for p, div, h1-h6. The default is
+     align="left" for ltr headings, "right" for rtl -->
+
+<!ENTITY % TextAlign "align (left|center|right|justify) #IMPLIED">
+
+<!--=================== Text Elements ====================================-->
+
+<!ENTITY % special.extra
+   "object | applet | img | map | iframe">
+	
+<!ENTITY % special.basic
+	"br | span | bdo">
+
+<!ENTITY % special
+   "%special.basic; | %special.extra;">
+
+<!ENTITY % fontstyle.extra "big | small | font | basefont">
+
+<!ENTITY % fontstyle.basic "tt | i | b | u
+                      | s | strike ">
+
+<!ENTITY % fontstyle "%fontstyle.basic; | %fontstyle.extra;">
+
+<!ENTITY % phrase.extra "sub | sup">
+<!ENTITY % phrase.basic "em | strong | dfn | code | q |
+                   samp | kbd | var | cite | abbr | acronym">
+
+<!ENTITY % phrase "%phrase.basic; | %phrase.extra;">
+
+<!ENTITY % inline.forms "input | select | textarea | label | button">
+
+<!-- these can occur at block or inline level -->
+<!ENTITY % misc.inline "ins | del | script">
+
+<!-- these can only occur at block level -->
+<!ENTITY % misc "noscript | %misc.inline;">
+
+<!ENTITY % inline "a | %special; | %fontstyle; | %phrase; | %inline.forms;">
+
+<!-- %Inline; covers inline or "text-level" elements -->
+<!ENTITY % Inline "(#PCDATA | %inline; | %misc.inline;)*">
+
+<!--================== Block level elements ==============================-->
+
+<!ENTITY % heading "h1|h2|h3|h4|h5|h6">
+<!ENTITY % lists "ul | ol | dl | menu | dir">
+<!ENTITY % blocktext "pre | hr | blockquote | address | center | noframes">
+
+<!ENTITY % block
+    "p | %heading; | div | %lists; | %blocktext; | isindex |fieldset | table">
+
+<!-- %Flow; mixes block and inline and is used for list items etc. -->
+<!ENTITY % Flow "(#PCDATA | %block; | form | %inline; | %misc;)*">
+
+<!--================== Content models for exclusions =====================-->
+
+<!-- a elements use %Inline; excluding a -->
+
+<!ENTITY % a.content
+   "(#PCDATA | %special; | %fontstyle; | %phrase; | %inline.forms; | %misc.inline;)*">
+
+<!-- pre uses %Inline excluding img, object, applet, big, small,
+     font, or basefont -->
+
+<!ENTITY % pre.content
+   "(#PCDATA | a | %special.basic; | %fontstyle.basic; | %phrase.basic; |
+	   %inline.forms; | %misc.inline;)*">
+
+<!-- form uses %Flow; excluding form -->
+
+<!ENTITY % form.content "(#PCDATA | %block; | %inline; | %misc;)*">
+
+<!-- button uses %Flow; but excludes a, form, form controls, iframe -->
+
+<!ENTITY % button.content
+   "(#PCDATA | p | %heading; | div | %lists; | %blocktext; |
+      table | br | span | bdo | object | applet | img | map |
+      %fontstyle; | %phrase; | %misc;)*">
+
+<!--================ Document Structure ==================================-->
+
+<!-- the namespace URI designates the document profile -->
+
+<!ELEMENT html (head, body)>
+<!ATTLIST html
+  %i18n;
+  id          ID             #IMPLIED
+  xmlns       %URI;          #FIXED 'http://www.w3.org/1999/xhtml'
+  >
+
+<!--================ Document Head =======================================-->
+
+<!ENTITY % head.misc "(script|style|meta|link|object|isindex)*">
+
+<!-- content model is %head.misc; combined with a single
+     title and an optional base element in any order -->
+
+<!ELEMENT head (%head.misc;,
+     ((title, %head.misc;, (base, %head.misc;)?) |
+      (base, %head.misc;, (title, %head.misc;))))>
+
+<!ATTLIST head
+  %i18n;
+  id          ID             #IMPLIED
+  profile     %URI;          #IMPLIED
+  >
+
+<!-- The title element is not considered part of the flow of text.
+       It should be displayed, for example as the page header or
+       window title. Exactly one title is required per document.
+    -->
+<!ELEMENT title (#PCDATA)>
+<!ATTLIST title 
+  %i18n;
+  id          ID             #IMPLIED
+  >
+
+<!-- document base URI -->
+
+<!ELEMENT base EMPTY>
+<!ATTLIST base
+  id          ID             #IMPLIED
+  href        %URI;          #IMPLIED
+  target      %FrameTarget;  #IMPLIED
+  >
+
+<!-- generic metainformation -->
+<!ELEMENT meta EMPTY>
+<!ATTLIST meta
+  %i18n;
+  id          ID             #IMPLIED
+  http-equiv  CDATA          #IMPLIED
+  name        CDATA          #IMPLIED
+  content     CDATA          #REQUIRED
+  scheme      CDATA          #IMPLIED
+  >
+
+<!--
+  Relationship values can be used in principle:
+
+   a) for document specific toolbars/menus when used
+      with the link element in document head e.g.
+        start, contents, previous, next, index, end, help
+   b) to link to a separate style sheet (rel="stylesheet")
+   c) to make a link to a script (rel="script")
+   d) by stylesheets to control how collections of
+      html nodes are rendered into printed documents
+   e) to make a link to a printable version of this document
+      e.g. a PostScript or PDF version (rel="alternate" media="print")
+-->
+
+<!ELEMENT link EMPTY>
+<!ATTLIST link
+  %attrs;
+  charset     %Charset;      #IMPLIED
+  href        %URI;          #IMPLIED
+  hreflang    %LanguageCode; #IMPLIED
+  type        %ContentType;  #IMPLIED
+  rel         %LinkTypes;    #IMPLIED
+  rev         %LinkTypes;    #IMPLIED
+  media       %MediaDesc;    #IMPLIED
+  target      %FrameTarget;  #IMPLIED
+  >
+
+<!-- style info, which may include CDATA sections -->
+<!ELEMENT style (#PCDATA)>
+<!ATTLIST style
+  %i18n;
+  id          ID             #IMPLIED
+  type        %ContentType;  #REQUIRED
+  media       %MediaDesc;    #IMPLIED
+  title       %Text;         #IMPLIED
+  xml:space   (preserve)     #FIXED 'preserve'
+  >
+
+<!-- script statements, which may include CDATA sections -->
+<!ELEMENT script (#PCDATA)>
+<!ATTLIST script
+  id          ID             #IMPLIED
+  charset     %Charset;      #IMPLIED
+  type        %ContentType;  #REQUIRED
+  language    CDATA          #IMPLIED
+  src         %URI;          #IMPLIED
+  defer       (defer)        #IMPLIED
+  xml:space   (preserve)     #FIXED 'preserve'
+  >
+
+<!-- alternate content container for non script-based rendering -->
+
+<!ELEMENT noscript %Flow;>
+<!ATTLIST noscript
+  %attrs;
+  >
+
+<!--======================= Frames =======================================-->
+
+<!-- inline subwindow -->
+
+<!ELEMENT iframe %Flow;>
+<!ATTLIST iframe
+  %coreattrs;
+  longdesc    %URI;          #IMPLIED
+  name        NMTOKEN        #IMPLIED
+  src         %URI;          #IMPLIED
+  frameborder (1|0)          "1"
+  marginwidth %Pixels;       #IMPLIED
+  marginheight %Pixels;      #IMPLIED
+  scrolling   (yes|no|auto)  "auto"
+  align       %ImgAlign;     #IMPLIED
+  height      %Length;       #IMPLIED
+  width       %Length;       #IMPLIED
+  >
+
+<!-- alternate content container for non frame-based rendering -->
+
+<!ELEMENT noframes %Flow;>
+<!ATTLIST noframes
+  %attrs;
+  >
+
+<!--=================== Document Body ====================================-->
+
+<!ELEMENT body %Flow;>
+<!ATTLIST body
+  %attrs;
+  onload      %Script;       #IMPLIED
+  onunload    %Script;       #IMPLIED
+  background  %URI;          #IMPLIED
+  bgcolor     %Color;        #IMPLIED
+  text        %Color;        #IMPLIED
+  link        %Color;        #IMPLIED
+  vlink       %Color;        #IMPLIED
+  alink       %Color;        #IMPLIED
+  >
+
+<!ELEMENT div %Flow;>  <!-- generic language/style container -->
+<!ATTLIST div
+  %attrs;
+  %TextAlign;
+  >
+
+<!--=================== Paragraphs =======================================-->
+
+<!ELEMENT p %Inline;>
+<!ATTLIST p
+  %attrs;
+  %TextAlign;
+  >
+
+<!--=================== Headings =========================================-->
+
+<!--
+  There are six levels of headings from h1 (the most important)
+  to h6 (the least important).
+-->
+
+<!ELEMENT h1  %Inline;>
+<!ATTLIST h1
+  %attrs;
+  %TextAlign;
+  >
+
+<!ELEMENT h2 %Inline;>
+<!ATTLIST h2
+  %attrs;
+  %TextAlign;
+  >
+
+<!ELEMENT h3 %Inline;>
+<!ATTLIST h3
+  %attrs;
+  %TextAlign;
+  >
+
+<!ELEMENT h4 %Inline;>
+<!ATTLIST h4
+  %attrs;
+  %TextAlign;
+  >
+
+<!ELEMENT h5 %Inline;>
+<!ATTLIST h5
+  %attrs;
+  %TextAlign;
+  >
+
+<!ELEMENT h6 %Inline;>
+<!ATTLIST h6
+  %attrs;
+  %TextAlign;
+  >
+
+<!--=================== Lists ============================================-->
+
+<!-- Unordered list bullet styles -->
+
+<!ENTITY % ULStyle "(disc|square|circle)">
+
+<!-- Unordered list -->
+
+<!ELEMENT ul (li)+>
+<!ATTLIST ul
+  %attrs;
+  type        %ULStyle;     #IMPLIED
+  compact     (compact)     #IMPLIED
+  >
+
+<!-- Ordered list numbering style
+
+    1   arabic numbers      1, 2, 3, ...
+    a   lower alpha         a, b, c, ...
+    A   upper alpha         A, B, C, ...
+    i   lower roman         i, ii, iii, ...
+    I   upper roman         I, II, III, ...
+
+    The style is applied to the sequence number which by default
+    is reset to 1 for the first list item in an ordered list.
+-->
+<!ENTITY % OLStyle "CDATA">
+
+<!-- Ordered (numbered) list -->
+
+<!ELEMENT ol (li)+>
+<!ATTLIST ol
+  %attrs;
+  type        %OLStyle;      #IMPLIED
+  compact     (compact)      #IMPLIED
+  start       %Number;       #IMPLIED
+  >
+
+<!-- single column list (DEPRECATED) --> 
+<!ELEMENT menu (li)+>
+<!ATTLIST menu
+  %attrs;
+  compact     (compact)     #IMPLIED
+  >
+
+<!-- multiple column list (DEPRECATED) --> 
+<!ELEMENT dir (li)+>
+<!ATTLIST dir
+  %attrs;
+  compact     (compact)     #IMPLIED
+  >
+
+<!-- LIStyle is constrained to: "(%ULStyle;|%OLStyle;)" -->
+<!ENTITY % LIStyle "CDATA">
+
+<!-- list item -->
+
+<!ELEMENT li %Flow;>
+<!ATTLIST li
+  %attrs;
+  type        %LIStyle;      #IMPLIED
+  value       %Number;       #IMPLIED
+  >
+
+<!-- definition lists - dt for term, dd for its definition -->
+
+<!ELEMENT dl (dt|dd)+>
+<!ATTLIST dl
+  %attrs;
+  compact     (compact)      #IMPLIED
+  >
+
+<!ELEMENT dt %Inline;>
+<!ATTLIST dt
+  %attrs;
+  >
+
+<!ELEMENT dd %Flow;>
+<!ATTLIST dd
+  %attrs;
+  >
+
+<!--=================== Address ==========================================-->
+
+<!-- information on author -->
+
+<!ELEMENT address (#PCDATA | %inline; | %misc.inline; | p)*>
+<!ATTLIST address
+  %attrs;
+  >
+
+<!--=================== Horizontal Rule ==================================-->
+
+<!ELEMENT hr EMPTY>
+<!ATTLIST hr
+  %attrs;
+  align       (left|center|right) #IMPLIED
+  noshade     (noshade)      #IMPLIED
+  size        %Pixels;       #IMPLIED
+  width       %Length;       #IMPLIED
+  >
+
+<!--=================== Preformatted Text ================================-->
+
+<!-- content is %Inline; excluding 
+        "img|object|applet|big|small|sub|sup|font|basefont" -->
+
+<!ELEMENT pre %pre.content;>
+<!ATTLIST pre
+  %attrs;
+  width       %Number;      #IMPLIED
+  xml:space   (preserve)    #FIXED 'preserve'
+  >
+
+<!--=================== Block-like Quotes ================================-->
+
+<!ELEMENT blockquote %Flow;>
+<!ATTLIST blockquote
+  %attrs;
+  cite        %URI;          #IMPLIED
+  >
+
+<!--=================== Text alignment ===================================-->
+
+<!-- center content -->
+<!ELEMENT center %Flow;>
+<!ATTLIST center
+  %attrs;
+  >
+
+<!--=================== Inserted/Deleted Text ============================-->
+
+<!--
+  ins/del are allowed in block and inline content, but its
+  inappropriate to include block content within an ins element
+  occurring in inline content.
+-->
+<!ELEMENT ins %Flow;>
+<!ATTLIST ins
+  %attrs;
+  cite        %URI;          #IMPLIED
+  datetime    %Datetime;     #IMPLIED
+  >
+
+<!ELEMENT del %Flow;>
+<!ATTLIST del
+  %attrs;
+  cite        %URI;          #IMPLIED
+  datetime    %Datetime;     #IMPLIED
+  >
+
+<!--================== The Anchor Element ================================-->
+
+<!-- content is %Inline; except that anchors shouldn't be nested -->
+
+<!ELEMENT a %a.content;>
+<!ATTLIST a
+  %attrs;
+  %focus;
+  charset     %Charset;      #IMPLIED
+  type        %ContentType;  #IMPLIED
+  name        NMTOKEN        #IMPLIED
+  href        %URI;          #IMPLIED
+  hreflang    %LanguageCode; #IMPLIED
+  rel         %LinkTypes;    #IMPLIED
+  rev         %LinkTypes;    #IMPLIED
+  shape       %Shape;        "rect"
+  coords      %Coords;       #IMPLIED
+  target      %FrameTarget;  #IMPLIED
+  >
+
+<!--===================== Inline Elements ================================-->
+
+<!ELEMENT span %Inline;> <!-- generic language/style container -->
+<!ATTLIST span
+  %attrs;
+  >
+
+<!ELEMENT bdo %Inline;>  <!-- I18N BiDi over-ride -->
+<!ATTLIST bdo
+  %coreattrs;
+  %events;
+  lang        %LanguageCode; #IMPLIED
+  xml:lang    %LanguageCode; #IMPLIED
+  dir         (ltr|rtl)      #REQUIRED
+  >
+
+<!ELEMENT br EMPTY>   <!-- forced line break -->
+<!ATTLIST br
+  %coreattrs;
+  clear       (left|all|right|none) "none"
+  >
+
+<!ELEMENT em %Inline;>   <!-- emphasis -->
+<!ATTLIST em %attrs;>
+
+<!ELEMENT strong %Inline;>   <!-- strong emphasis -->
+<!ATTLIST strong %attrs;>
+
+<!ELEMENT dfn %Inline;>   <!-- definitional -->
+<!ATTLIST dfn %attrs;>
+
+<!ELEMENT code %Inline;>   <!-- program code -->
+<!ATTLIST code %attrs;>
+
+<!ELEMENT samp %Inline;>   <!-- sample -->
+<!ATTLIST samp %attrs;>
+
+<!ELEMENT kbd %Inline;>  <!-- something user would type -->
+<!ATTLIST kbd %attrs;>
+
+<!ELEMENT var %Inline;>   <!-- variable -->
+<!ATTLIST var %attrs;>
+
+<!ELEMENT cite %Inline;>   <!-- citation -->
+<!ATTLIST cite %attrs;>
+
+<!ELEMENT abbr %Inline;>   <!-- abbreviation -->
+<!ATTLIST abbr %attrs;>
+
+<!ELEMENT acronym %Inline;>   <!-- acronym -->
+<!ATTLIST acronym %attrs;>
+
+<!ELEMENT q %Inline;>   <!-- inlined quote -->
+<!ATTLIST q
+  %attrs;
+  cite        %URI;          #IMPLIED
+  >
+
+<!ELEMENT sub %Inline;> <!-- subscript -->
+<!ATTLIST sub %attrs;>
+
+<!ELEMENT sup %Inline;> <!-- superscript -->
+<!ATTLIST sup %attrs;>
+
+<!ELEMENT tt %Inline;>   <!-- fixed pitch font -->
+<!ATTLIST tt %attrs;>
+
+<!ELEMENT i %Inline;>   <!-- italic font -->
+<!ATTLIST i %attrs;>
+
+<!ELEMENT b %Inline;>   <!-- bold font -->
+<!ATTLIST b %attrs;>
+
+<!ELEMENT big %Inline;>   <!-- bigger font -->
+<!ATTLIST big %attrs;>
+
+<!ELEMENT small %Inline;>   <!-- smaller font -->
+<!ATTLIST small %attrs;>
+
+<!ELEMENT u %Inline;>   <!-- underline -->
+<!ATTLIST u %attrs;>
+
+<!ELEMENT s %Inline;>   <!-- strike-through -->
+<!ATTLIST s %attrs;>
+
+<!ELEMENT strike %Inline;>   <!-- strike-through -->
+<!ATTLIST strike %attrs;>
+
+<!ELEMENT basefont EMPTY>  <!-- base font size -->
+<!ATTLIST basefont
+  id          ID             #IMPLIED
+  size        CDATA          #REQUIRED
+  color       %Color;        #IMPLIED
+  face        CDATA          #IMPLIED
+  >
+
+<!ELEMENT font %Inline;> <!-- local change to font -->
+<!ATTLIST font
+  %coreattrs;
+  %i18n;
+  size        CDATA          #IMPLIED
+  color       %Color;        #IMPLIED
+  face        CDATA          #IMPLIED
+  >
+
+<!--==================== Object ======================================-->
+<!--
+  object is used to embed objects as part of HTML pages.
+  param elements should precede other content. Parameters
+  can also be expressed as attribute/value pairs on the
+  object element itself when brevity is desired.
+-->
+
+<!ELEMENT object (#PCDATA | param | %block; | form | %inline; | %misc;)*>
+<!ATTLIST object
+  %attrs;
+  declare     (declare)      #IMPLIED
+  classid     %URI;          #IMPLIED
+  codebase    %URI;          #IMPLIED
+  data        %URI;          #IMPLIED
+  type        %ContentType;  #IMPLIED
+  codetype    %ContentType;  #IMPLIED
+  archive     %UriList;      #IMPLIED
+  standby     %Text;         #IMPLIED
+  height      %Length;       #IMPLIED
+  width       %Length;       #IMPLIED
+  usemap      %URI;          #IMPLIED
+  name        NMTOKEN        #IMPLIED
+  tabindex    %Number;       #IMPLIED
+  align       %ImgAlign;     #IMPLIED
+  border      %Pixels;       #IMPLIED
+  hspace      %Pixels;       #IMPLIED
+  vspace      %Pixels;       #IMPLIED
+  >
+
+<!--
+  param is used to supply a named property value.
+  In XML it would seem natural to follow RDF and support an
+  abbreviated syntax where the param elements are replaced
+  by attribute value pairs on the object start tag.
+-->
+<!ELEMENT param EMPTY>
+<!ATTLIST param
+  id          ID             #IMPLIED
+  name        CDATA          #REQUIRED
+  value       CDATA          #IMPLIED
+  valuetype   (data|ref|object) "data"
+  type        %ContentType;  #IMPLIED
+  >
+
+<!--=================== Java applet ==================================-->
+<!--
+  One of code or object attributes must be present.
+  Place param elements before other content.
+-->
+<!ELEMENT applet (#PCDATA | param | %block; | form | %inline; | %misc;)*>
+<!ATTLIST applet
+  %coreattrs;
+  codebase    %URI;          #IMPLIED
+  archive     CDATA          #IMPLIED
+  code        CDATA          #IMPLIED
+  object      CDATA          #IMPLIED
+  alt         %Text;         #IMPLIED
+  name        NMTOKEN        #IMPLIED
+  width       %Length;       #REQUIRED
+  height      %Length;       #REQUIRED
+  align       %ImgAlign;     #IMPLIED
+  hspace      %Pixels;       #IMPLIED
+  vspace      %Pixels;       #IMPLIED
+  >
+
+<!--=================== Images ===========================================-->
+
+<!--
+   To avoid accessibility problems for people who aren't
+   able to see the image, you should provide a text
+   description using the alt and longdesc attributes.
+   In addition, avoid the use of server-side image maps.
+-->
+
+<!ELEMENT img EMPTY>
+<!ATTLIST img
+  %attrs;
+  src         %URI;          #REQUIRED
+  alt         %Text;         #REQUIRED
+  name        NMTOKEN        #IMPLIED
+  longdesc    %URI;          #IMPLIED
+  height      %Length;       #IMPLIED
+  width       %Length;       #IMPLIED
+  usemap      %URI;          #IMPLIED
+  ismap       (ismap)        #IMPLIED
+  align       %ImgAlign;     #IMPLIED
+  border      %Length;       #IMPLIED
+  hspace      %Pixels;       #IMPLIED
+  vspace      %Pixels;       #IMPLIED
+  >
+
+<!-- usemap points to a map element which may be in this document
+  or an external document, although the latter is not widely supported -->
+
+<!--================== Client-side image maps ============================-->
+
+<!-- These can be placed in the same document or grouped in a
+     separate document although this isn't yet widely supported -->
+
+<!ELEMENT map ((%block; | form | %misc;)+ | area+)>
+<!ATTLIST map
+  %i18n;
+  %events;
+  id          ID             #REQUIRED
+  class       CDATA          #IMPLIED
+  style       %StyleSheet;   #IMPLIED
+  title       %Text;         #IMPLIED
+  name        CDATA          #IMPLIED
+  >
+
+<!ELEMENT area EMPTY>
+<!ATTLIST area
+  %attrs;
+  %focus;
+  shape       %Shape;        "rect"
+  coords      %Coords;       #IMPLIED
+  href        %URI;          #IMPLIED
+  nohref      (nohref)       #IMPLIED
+  alt         %Text;         #REQUIRED
+  target      %FrameTarget;  #IMPLIED
+  >
+
+<!--================ Forms ===============================================-->
+
+<!ELEMENT form %form.content;>   <!-- forms shouldn't be nested -->
+
+<!ATTLIST form
+  %attrs;
+  action      %URI;          #REQUIRED
+  method      (get|post)     "get"
+  name        NMTOKEN        #IMPLIED
+  enctype     %ContentType;  "application/x-www-form-urlencoded"
+  onsubmit    %Script;       #IMPLIED
+  onreset     %Script;       #IMPLIED
+  accept      %ContentTypes; #IMPLIED
+  accept-charset %Charsets;  #IMPLIED
+  target      %FrameTarget;  #IMPLIED
+  >
+
+<!--
+  Each label must not contain more than ONE field
+  Label elements shouldn't be nested.
+-->
+<!ELEMENT label %Inline;>
+<!ATTLIST label
+  %attrs;
+  for         IDREF          #IMPLIED
+  accesskey   %Character;    #IMPLIED
+  onfocus     %Script;       #IMPLIED
+  onblur      %Script;       #IMPLIED
+  >
+
+<!ENTITY % InputType
+  "(text | password | checkbox |
+    radio | submit | reset |
+    file | hidden | image | button)"
+   >
+
+<!-- the name attribute is required for all but submit & reset -->
+
+<!ELEMENT input EMPTY>     <!-- form control -->
+<!ATTLIST input
+  %attrs;
+  %focus;
+  type        %InputType;    "text"
+  name        CDATA          #IMPLIED
+  value       CDATA          #IMPLIED
+  checked     (checked)      #IMPLIED
+  disabled    (disabled)     #IMPLIED
+  readonly    (readonly)     #IMPLIED
+  size        CDATA          #IMPLIED
+  maxlength   %Number;       #IMPLIED
+  src         %URI;          #IMPLIED
+  alt         CDATA          #IMPLIED
+  usemap      %URI;          #IMPLIED
+  onselect    %Script;       #IMPLIED
+  onchange    %Script;       #IMPLIED
+  accept      %ContentTypes; #IMPLIED
+  align       %ImgAlign;     #IMPLIED
+  >
+
+<!ELEMENT select (optgroup|option)+>  <!-- option selector -->
+<!ATTLIST select
+  %attrs;
+  name        CDATA          #IMPLIED
+  size        %Number;       #IMPLIED
+  multiple    (multiple)     #IMPLIED
+  disabled    (disabled)     #IMPLIED
+  tabindex    %Number;       #IMPLIED
+  onfocus     %Script;       #IMPLIED
+  onblur      %Script;       #IMPLIED
+  onchange    %Script;       #IMPLIED
+  >
+
+<!ELEMENT optgroup (option)+>   <!-- option group -->
+<!ATTLIST optgroup
+  %attrs;
+  disabled    (disabled)     #IMPLIED
+  label       %Text;         #REQUIRED
+  >
+
+<!ELEMENT option (#PCDATA)>     <!-- selectable choice -->
+<!ATTLIST option
+  %attrs;
+  selected    (selected)     #IMPLIED
+  disabled    (disabled)     #IMPLIED
+  label       %Text;         #IMPLIED
+  value       CDATA          #IMPLIED
+  >
+
+<!ELEMENT textarea (#PCDATA)>     <!-- multi-line text field -->
+<!ATTLIST textarea
+  %attrs;
+  %focus;
+  name        CDATA          #IMPLIED
+  rows        %Number;       #REQUIRED
+  cols        %Number;       #REQUIRED
+  disabled    (disabled)     #IMPLIED
+  readonly    (readonly)     #IMPLIED
+  onselect    %Script;       #IMPLIED
+  onchange    %Script;       #IMPLIED
+  >
+
+<!--
+  The fieldset element is used to group form fields.
+  Only one legend element should occur in the content
+  and if present should only be preceded by whitespace.
+-->
+<!ELEMENT fieldset (#PCDATA | legend | %block; | form | %inline; | %misc;)*>
+<!ATTLIST fieldset
+  %attrs;
+  >
+
+<!ENTITY % LAlign "(top|bottom|left|right)">
+
+<!ELEMENT legend %Inline;>     <!-- fieldset label -->
+<!ATTLIST legend
+  %attrs;
+  accesskey   %Character;    #IMPLIED
+  align       %LAlign;       #IMPLIED
+  >
+
+<!--
+ Content is %Flow; excluding a, form, form controls, iframe
+--> 
+<!ELEMENT button %button.content;>  <!-- push button -->
+<!ATTLIST button
+  %attrs;
+  %focus;
+  name        CDATA          #IMPLIED
+  value       CDATA          #IMPLIED
+  type        (button|submit|reset) "submit"
+  disabled    (disabled)     #IMPLIED
+  >
+
+<!-- single-line text input control (DEPRECATED) -->
+<!ELEMENT isindex EMPTY>
+<!ATTLIST isindex
+  %coreattrs;
+  %i18n;
+  prompt      %Text;         #IMPLIED
+  >
+
+<!--======================= Tables =======================================-->
+
+<!-- Derived from IETF HTML table standard, see [RFC1942] -->
+
+<!--
+ The border attribute sets the thickness of the frame around the
+ table. The default units are screen pixels.
+
+ The frame attribute specifies which parts of the frame around
+ the table should be rendered. The values are not the same as
+ CALS to avoid a name clash with the valign attribute.
+-->
+<!ENTITY % TFrame "(void|above|below|hsides|lhs|rhs|vsides|box|border)">
+
+<!--
+ The rules attribute defines which rules to draw between cells:
+
+ If rules is absent then assume:
+     "none" if border is absent or border="0" otherwise "all"
+-->
+
+<!ENTITY % TRules "(none | groups | rows | cols | all)">
+  
+<!-- horizontal placement of table relative to document -->
+<!ENTITY % TAlign "(left|center|right)">
+
+<!-- horizontal alignment attributes for cell contents
+
+  char        alignment char, e.g. char=':'
+  charoff     offset for alignment char
+-->
+<!ENTITY % cellhalign
+  "align      (left|center|right|justify|char) #IMPLIED
+   char       %Character;    #IMPLIED
+   charoff    %Length;       #IMPLIED"
+  >
+
+<!-- vertical alignment attributes for cell contents -->
+<!ENTITY % cellvalign
+  "valign     (top|middle|bottom|baseline) #IMPLIED"
+  >
+
+<!ELEMENT table
+     (caption?, (col*|colgroup*), thead?, tfoot?, (tbody+|tr+))>
+<!ELEMENT caption  %Inline;>
+<!ELEMENT thead    (tr)+>
+<!ELEMENT tfoot    (tr)+>
+<!ELEMENT tbody    (tr)+>
+<!ELEMENT colgroup (col)*>
+<!ELEMENT col      EMPTY>
+<!ELEMENT tr       (th|td)+>
+<!ELEMENT th       %Flow;>
+<!ELEMENT td       %Flow;>
+
+<!ATTLIST table
+  %attrs;
+  summary     %Text;         #IMPLIED
+  width       %Length;       #IMPLIED
+  border      %Pixels;       #IMPLIED
+  frame       %TFrame;       #IMPLIED
+  rules       %TRules;       #IMPLIED
+  cellspacing %Length;       #IMPLIED
+  cellpadding %Length;       #IMPLIED
+  align       %TAlign;       #IMPLIED
+  bgcolor     %Color;        #IMPLIED
+  >
+
+<!ENTITY % CAlign "(top|bottom|left|right)">
+
+<!ATTLIST caption
+  %attrs;
+  align       %CAlign;       #IMPLIED
+  >
+
+<!--
+colgroup groups a set of col elements. It allows you to group
+several semantically related columns together.
+-->
+<!ATTLIST colgroup
+  %attrs;
+  span        %Number;       "1"
+  width       %MultiLength;  #IMPLIED
+  %cellhalign;
+  %cellvalign;
+  >
+
+<!--
+ col elements define the alignment properties for cells in
+ one or more columns.
+
+ The width attribute specifies the width of the columns, e.g.
+
+     width=64        width in screen pixels
+     width=0.5*      relative width of 0.5
+
+ The span attribute causes the attributes of one
+ col element to apply to more than one column.
+-->
+<!ATTLIST col
+  %attrs;
+  span        %Number;       "1"
+  width       %MultiLength;  #IMPLIED
+  %cellhalign;
+  %cellvalign;
+  >
+
+<!--
+    Use thead to duplicate headers when breaking table
+    across page boundaries, or for static headers when
+    tbody sections are rendered in scrolling panel.
+
+    Use tfoot to duplicate footers when breaking table
+    across page boundaries, or for static footers when
+    tbody sections are rendered in scrolling panel.
+
+    Use multiple tbody sections when rules are needed
+    between groups of table rows.
+-->
+<!ATTLIST thead
+  %attrs;
+  %cellhalign;
+  %cellvalign;
+  >
+
+<!ATTLIST tfoot
+  %attrs;
+  %cellhalign;
+  %cellvalign;
+  >
+
+<!ATTLIST tbody
+  %attrs;
+  %cellhalign;
+  %cellvalign;
+  >
+
+<!ATTLIST tr
+  %attrs;
+  %cellhalign;
+  %cellvalign;
+  bgcolor     %Color;        #IMPLIED
+  >
+
+<!-- Scope is simpler than headers attribute for common tables -->
+<!ENTITY % Scope "(row|col|rowgroup|colgroup)">
+
+<!-- th is for headers, td for data and for cells acting as both -->
+
+<!ATTLIST th
+  %attrs;
+  abbr        %Text;         #IMPLIED
+  axis        CDATA          #IMPLIED
+  headers     IDREFS         #IMPLIED
+  scope       %Scope;        #IMPLIED
+  rowspan     %Number;       "1"
+  colspan     %Number;       "1"
+  %cellhalign;
+  %cellvalign;
+  nowrap      (nowrap)       #IMPLIED
+  bgcolor     %Color;        #IMPLIED
+  width       %Length;       #IMPLIED
+  height      %Length;       #IMPLIED
+  >
+
+<!ATTLIST td
+  %attrs;
+  abbr        %Text;         #IMPLIED
+  axis        CDATA          #IMPLIED
+  headers     IDREFS         #IMPLIED
+  scope       %Scope;        #IMPLIED
+  rowspan     %Number;       "1"
+  colspan     %Number;       "1"
+  %cellhalign;
+  %cellvalign;
+  nowrap      (nowrap)       #IMPLIED
+  bgcolor     %Color;        #IMPLIED
+  width       %Length;       #IMPLIED
+  height      %Length;       #IMPLIED
+  >
+

Modified: xmlbeans/trunk/test/cases/xbean/extensions/interfaceFeature/averageCase/po.xsd
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/extensions/interfaceFeature/averageCase/po.xsd?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/extensions/interfaceFeature/averageCase/po.xsd&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/extensions/interfaceFeature/averageCase/po.xsd&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/extensions/interfaceFeature/averageCase/po.xsd	(original)
+++ xmlbeans/trunk/test/cases/xbean/extensions/interfaceFeature/averageCase/po.xsd	Wed Dec  8 08:54:26 2004
@@ -1,62 +1,62 @@
-<!-- edited with XMLSPY v5 rel. 2 U (http://www.xmlspy.com) by Michael Kintzer (BEA Systems) -->
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-xmlns:po="http://xbean.interface_feature/averageCase/PurchaseOrder"
-targetNamespace="http://xbean.interface_feature/averageCase/PurchaseOrder"
-elementFormDefault="qualified"
->
-	<xsd:annotation>
-		<xsd:documentation xml:lang="en">
-   Purchase order schema for Example.com.
-   Copyright 2000 Example.com. All rights reserved.
-  </xsd:documentation>
-	</xsd:annotation>
-	<xsd:element name="purchaseOrder" type="po:PurchaseOrderType"/>
-	<xsd:element name="comment" type="xsd:string"/>
-	<xsd:complexType name="PurchaseOrderType">
-		<xsd:sequence>
-			<xsd:element name="shipTo" type="po:USAddress"/>
-			<xsd:element name="billTo" type="po:USAddress"/>
-			<xsd:element ref="po:comment" minOccurs="0"/>
-			<xsd:element name="items" type="po:Items"/>
-		</xsd:sequence>
-		<xsd:attribute name="orderDate" type="xsd:date"/>
-	</xsd:complexType>
-	<xsd:complexType name="USAddress">
-		<xsd:sequence>
-			<xsd:element name="name" type="xsd:string" nillable="true"/>
-			<xsd:element name="street" type="xsd:string"/>
-			<xsd:element name="city" type="xsd:string"/>
-			<xsd:element name="state" type="xsd:string"/>
-			<xsd:element name="zip" type="xsd:decimal"/>
-		</xsd:sequence>
-		<xsd:attribute name="country" type="xsd:NMTOKEN" fixed="US"/>
-	</xsd:complexType>
-	<xsd:complexType name="Items">
-		<xsd:sequence>
-			<xsd:element name="item" minOccurs="0" maxOccurs="unbounded">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="productName" type="xsd:string"/>
-						<xsd:element name="quantity">
-							<xsd:simpleType>
-								<xsd:restriction base="xsd:positiveInteger">
-									<xsd:maxExclusive value="100"/>
-								</xsd:restriction>
-							</xsd:simpleType>
-						</xsd:element>
-						<xsd:element name="USPrice" type="xsd:decimal"/>
-						<xsd:element ref="po:comment" minOccurs="0"/>
-						<xsd:element name="shipDate" type="xsd:date" minOccurs="0"/>
-					</xsd:sequence>
-					<xsd:attribute name="partNum" type="po:SKU" use="required"/>
-				</xsd:complexType>
-			</xsd:element>
-		</xsd:sequence>
-	</xsd:complexType>
-	<!-- Stock Keeping Unit, a code for identifying products -->
-	<xsd:simpleType name="SKU">
-		<xsd:restriction base="xsd:string">
-			<xsd:pattern value="\d{3}-[A-Z]{2}"/>
-		</xsd:restriction>
-	</xsd:simpleType>
-</xsd:schema>
+<!-- edited with XMLSPY v5 rel. 2 U (http://www.xmlspy.com) by Michael Kintzer (BEA Systems) -->
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+xmlns:po="http://xbean.interface_feature/averageCase/PurchaseOrder"
+targetNamespace="http://xbean.interface_feature/averageCase/PurchaseOrder"
+elementFormDefault="qualified"
+>
+	<xsd:annotation>
+		<xsd:documentation xml:lang="en">
+   Purchase order schema for Example.com.
+   Copyright 2000 Example.com. All rights reserved.
+  </xsd:documentation>
+	</xsd:annotation>
+	<xsd:element name="purchaseOrder" type="po:PurchaseOrderType"/>
+	<xsd:element name="comment" type="xsd:string"/>
+	<xsd:complexType name="PurchaseOrderType">
+		<xsd:sequence>
+			<xsd:element name="shipTo" type="po:USAddress"/>
+			<xsd:element name="billTo" type="po:USAddress"/>
+			<xsd:element ref="po:comment" minOccurs="0"/>
+			<xsd:element name="items" type="po:Items"/>
+		</xsd:sequence>
+		<xsd:attribute name="orderDate" type="xsd:date"/>
+	</xsd:complexType>
+	<xsd:complexType name="USAddress">
+		<xsd:sequence>
+			<xsd:element name="name" type="xsd:string" nillable="true"/>
+			<xsd:element name="street" type="xsd:string"/>
+			<xsd:element name="city" type="xsd:string"/>
+			<xsd:element name="state" type="xsd:string"/>
+			<xsd:element name="zip" type="xsd:decimal"/>
+		</xsd:sequence>
+		<xsd:attribute name="country" type="xsd:NMTOKEN" fixed="US"/>
+	</xsd:complexType>
+	<xsd:complexType name="Items">
+		<xsd:sequence>
+			<xsd:element name="item" minOccurs="0" maxOccurs="unbounded">
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:element name="productName" type="xsd:string"/>
+						<xsd:element name="quantity">
+							<xsd:simpleType>
+								<xsd:restriction base="xsd:positiveInteger">
+									<xsd:maxExclusive value="100"/>
+								</xsd:restriction>
+							</xsd:simpleType>
+						</xsd:element>
+						<xsd:element name="USPrice" type="xsd:decimal"/>
+						<xsd:element ref="po:comment" minOccurs="0"/>
+						<xsd:element name="shipDate" type="xsd:date" minOccurs="0"/>
+					</xsd:sequence>
+					<xsd:attribute name="partNum" type="po:SKU" use="required"/>
+				</xsd:complexType>
+			</xsd:element>
+		</xsd:sequence>
+	</xsd:complexType>
+	<!-- Stock Keeping Unit, a code for identifying products -->
+	<xsd:simpleType name="SKU">
+		<xsd:restriction base="xsd:string">
+			<xsd:pattern value="\d{3}-[A-Z]{2}"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+</xsd:schema>

Modified: xmlbeans/trunk/test/cases/xbean/extensions/interfaceFeature/averageCase/po.xsdconfig
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/extensions/interfaceFeature/averageCase/po.xsdconfig?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/extensions/interfaceFeature/averageCase/po.xsdconfig&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/extensions/interfaceFeature/averageCase/po.xsdconfig&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/extensions/interfaceFeature/averageCase/po.xsdconfig	(original)
+++ xmlbeans/trunk/test/cases/xbean/extensions/interfaceFeature/averageCase/po.xsdconfig	Wed Dec  8 08:54:26 2004
@@ -1,23 +1,23 @@
-<!-- Copyright 2004 The Apache Software Foundation
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License. -->
-<xb:config xmlns:xb="http://xml.apache.org/xmlbeans/2004/02/xbean/config">
-
-    <xb:extension for="*">
-        <xb:interface name="xmlobject.extensions.interfaceFeature.averageCase.existing.IFoo">
-            <xb:staticHandler>xmlobject.extensions.interfaceFeature.averageCase.existing.FooHandler</xb:staticHandler>
-        </xb:interface>
-       
-    </xb:extension>
-
+<!-- Copyright 2004 The Apache Software Foundation
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License. -->
+<xb:config xmlns:xb="http://xml.apache.org/xmlbeans/2004/02/xbean/config">
+
+    <xb:extension for="*">
+        <xb:interface name="xmlobject.extensions.interfaceFeature.averageCase.existing.IFoo">
+            <xb:staticHandler>xmlobject.extensions.interfaceFeature.averageCase.existing.FooHandler</xb:staticHandler>
+        </xb:interface>
+       
+    </xb:extension>
+
 </xb:config>

Modified: xmlbeans/trunk/test/cases/xbean/extensions/interfaceFeature/methodNameCollision/company.xsd
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/extensions/interfaceFeature/methodNameCollision/company.xsd?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/extensions/interfaceFeature/methodNameCollision/company.xsd&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/extensions/interfaceFeature/methodNameCollision/company.xsd&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/extensions/interfaceFeature/methodNameCollision/company.xsd	(original)
+++ xmlbeans/trunk/test/cases/xbean/extensions/interfaceFeature/methodNameCollision/company.xsd	Wed Dec  8 08:54:26 2004
@@ -1,38 +1,38 @@
-<!--this is schema company.xsd stripped down and modified to have a value restriction on the employees age-->
-
-<xsd:schema 
-targetNamespace="interfaceFeature/xbean/methodNameCollision/company" 
-xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:company="interfaceFeature/xbean/methodNameCollision/company">
-	<xsd:element name="company" type="company:CompanyType"/>
-	<xsd:complexType name="CompanyType">
-		<xsd:sequence>
-			<xsd:element name="departments" type="company:DepartmentType" maxOccurs="unbounded"/>
-		</xsd:sequence>
-		
-		<xsd:anyAttribute namespace="http://www.omg.org/XMI" processContents="lax"/>
-	</xsd:complexType>
-	<xsd:element name="department" type="company:DepartmentType"/>
-	<xsd:complexType name="DepartmentType">
-		<xsd:sequence>
-			<xsd:element name="consultant" type="company:ConsultantType" maxOccurs="unbounded"/>
-		</xsd:sequence>
-		<xsd:anyAttribute namespace="http://www.omg.org/XMI" processContents="lax"/>
-	</xsd:complexType>
-	<xsd:complexType name="ConsultantType">
-		
-		<xsd:attribute name="name" type="xsd:string"/>
-	      <xsd:attribute name="age" type="company:age"/>
-		<xsd:anyAttribute namespace="http://www.omg.org/XMI" processContents="lax"/>
-	   
-	</xsd:complexType>
-
-	
-               <xsd:simpleType name="age">
-                  <xsd:restriction base="xsd:integer">
-                         <xsd:minInclusive value="0"/>
-                         <xsd:maxInclusive value="100"/>
-                  </xsd:restriction>
-               </xsd:simpleType>
-   
-</xsd:schema>
+<!--this is schema company.xsd stripped down and modified to have a value restriction on the employees age-->
+
+<xsd:schema 
+targetNamespace="interfaceFeature/xbean/methodNameCollision/company" 
+xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:company="interfaceFeature/xbean/methodNameCollision/company">
+	<xsd:element name="company" type="company:CompanyType"/>
+	<xsd:complexType name="CompanyType">
+		<xsd:sequence>
+			<xsd:element name="departments" type="company:DepartmentType" maxOccurs="unbounded"/>
+		</xsd:sequence>
+		
+		<xsd:anyAttribute namespace="http://www.omg.org/XMI" processContents="lax"/>
+	</xsd:complexType>
+	<xsd:element name="department" type="company:DepartmentType"/>
+	<xsd:complexType name="DepartmentType">
+		<xsd:sequence>
+			<xsd:element name="consultant" type="company:ConsultantType" maxOccurs="unbounded"/>
+		</xsd:sequence>
+		<xsd:anyAttribute namespace="http://www.omg.org/XMI" processContents="lax"/>
+	</xsd:complexType>
+	<xsd:complexType name="ConsultantType">
+		
+		<xsd:attribute name="name" type="xsd:string"/>
+	      <xsd:attribute name="age" type="company:age"/>
+		<xsd:anyAttribute namespace="http://www.omg.org/XMI" processContents="lax"/>
+	   
+	</xsd:complexType>
+
+	
+               <xsd:simpleType name="age">
+                  <xsd:restriction base="xsd:integer">
+                         <xsd:minInclusive value="0"/>
+                         <xsd:maxInclusive value="100"/>
+                  </xsd:restriction>
+               </xsd:simpleType>
+   
+</xsd:schema>

Modified: xmlbeans/trunk/test/cases/xbean/extensions/interfaceFeature/methodNameCollision/company.xsdconfig
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/extensions/interfaceFeature/methodNameCollision/company.xsdconfig?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/extensions/interfaceFeature/methodNameCollision/company.xsdconfig&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/extensions/interfaceFeature/methodNameCollision/company.xsdconfig&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/extensions/interfaceFeature/methodNameCollision/company.xsdconfig	(original)
+++ xmlbeans/trunk/test/cases/xbean/extensions/interfaceFeature/methodNameCollision/company.xsdconfig	Wed Dec  8 08:54:26 2004
@@ -1,23 +1,23 @@
-<!-- Copyright 2004 The Apache Software Foundation
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License. -->
-<xb:config xmlns:xb="http://xml.apache.org/xmlbeans/2004/02/xbean/config">
-
-    <xb:extension for="*">
-        <xb:interface name="xmlobject.extensions.interfaceFeature.methodNameCollision.existing.IFoo">
-            <xb:staticHandler>xmlobject.extensions.interfaceFeature.methodNameCollision.existing.FooHandler</xb:staticHandler>
-        </xb:interface>  
-   </xb:extension> 
-
-
+<!-- Copyright 2004 The Apache Software Foundation
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License. -->
+<xb:config xmlns:xb="http://xml.apache.org/xmlbeans/2004/02/xbean/config">
+
+    <xb:extension for="*">
+        <xb:interface name="xmlobject.extensions.interfaceFeature.methodNameCollision.existing.IFoo">
+            <xb:staticHandler>xmlobject.extensions.interfaceFeature.methodNameCollision.existing.FooHandler</xb:staticHandler>
+        </xb:interface>  
+   </xb:extension> 
+
+
 </xb:config>

Modified: xmlbeans/trunk/test/cases/xbean/extensions/interfaceFeature/multInterfaces/po.xsd
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/extensions/interfaceFeature/multInterfaces/po.xsd?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/extensions/interfaceFeature/multInterfaces/po.xsd&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/extensions/interfaceFeature/multInterfaces/po.xsd&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/extensions/interfaceFeature/multInterfaces/po.xsd	(original)
+++ xmlbeans/trunk/test/cases/xbean/extensions/interfaceFeature/multInterfaces/po.xsd	Wed Dec  8 08:54:26 2004
@@ -1,62 +1,62 @@
-<!-- edited with XMLSPY v5 rel. 2 U (http://www.xmlspy.com) by Michael Kintzer (BEA Systems) -->
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-xmlns:po="http://xbean.interface_feature/multInterfaces/PurchaseOrder"
-targetNamespace="http://xbean.interface_feature/multInterfaces/PurchaseOrder"
-elementFormDefault="qualified"
->
-	<xsd:annotation>
-		<xsd:documentation xml:lang="en">
-   Purchase order schema for Example.com.
-   Copyright 2000 Example.com. All rights reserved.
-  </xsd:documentation>
-	</xsd:annotation>
-	<xsd:element name="purchaseOrder" type="po:PurchaseOrderType"/>
-	<xsd:element name="comment" type="xsd:string"/>
-	<xsd:complexType name="PurchaseOrderType">
-		<xsd:sequence>
-			<xsd:element name="shipTo" type="po:USAddress"/>
-			<xsd:element name="billTo" type="po:USAddress"/>
-			<xsd:element ref="po:comment" minOccurs="0"/>
-			<xsd:element name="items" type="po:Items"/>
-		</xsd:sequence>
-		<xsd:attribute name="orderDate" type="xsd:date"/>
-	</xsd:complexType>
-	<xsd:complexType name="USAddress">
-		<xsd:sequence>
-			<xsd:element name="name" type="xsd:string" nillable="true"/>
-			<xsd:element name="street" type="xsd:string"/>
-			<xsd:element name="city" type="xsd:string"/>
-			<xsd:element name="state" type="xsd:string"/>
-			<xsd:element name="zip" type="xsd:decimal"/>
-		</xsd:sequence>
-		<xsd:attribute name="country" type="xsd:NMTOKEN" fixed="US"/>
-	</xsd:complexType>
-	<xsd:complexType name="Items">
-		<xsd:sequence>
-			<xsd:element name="item" minOccurs="0" maxOccurs="unbounded">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="productName" type="xsd:string"/>
-						<xsd:element name="quantity">
-							<xsd:simpleType>
-								<xsd:restriction base="xsd:positiveInteger">
-									<xsd:maxExclusive value="100"/>
-								</xsd:restriction>
-							</xsd:simpleType>
-						</xsd:element>
-						<xsd:element name="USPrice" type="xsd:decimal" fixed="30" />
-						<xsd:element ref="po:comment" minOccurs="0"/>
-						<xsd:element name="shipDate" type="xsd:date" minOccurs="0"/>
-					</xsd:sequence>
-					<xsd:attribute name="partNum" type="po:SKU" use="required"/>
-				</xsd:complexType>
-			</xsd:element>
-		</xsd:sequence>
-	</xsd:complexType>
-	<!-- Stock Keeping Unit, a code for identifying products -->
-	<xsd:simpleType name="SKU">
-		<xsd:restriction base="xsd:string">
-			<xsd:pattern value="\d{3}-[A-Z]{2}"/>
-		</xsd:restriction>
-	</xsd:simpleType>
-</xsd:schema>
+<!-- edited with XMLSPY v5 rel. 2 U (http://www.xmlspy.com) by Michael Kintzer (BEA Systems) -->
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+xmlns:po="http://xbean.interface_feature/multInterfaces/PurchaseOrder"
+targetNamespace="http://xbean.interface_feature/multInterfaces/PurchaseOrder"
+elementFormDefault="qualified"
+>
+	<xsd:annotation>
+		<xsd:documentation xml:lang="en">
+   Purchase order schema for Example.com.
+   Copyright 2000 Example.com. All rights reserved.
+  </xsd:documentation>
+	</xsd:annotation>
+	<xsd:element name="purchaseOrder" type="po:PurchaseOrderType"/>
+	<xsd:element name="comment" type="xsd:string"/>
+	<xsd:complexType name="PurchaseOrderType">
+		<xsd:sequence>
+			<xsd:element name="shipTo" type="po:USAddress"/>
+			<xsd:element name="billTo" type="po:USAddress"/>
+			<xsd:element ref="po:comment" minOccurs="0"/>
+			<xsd:element name="items" type="po:Items"/>
+		</xsd:sequence>
+		<xsd:attribute name="orderDate" type="xsd:date"/>
+	</xsd:complexType>
+	<xsd:complexType name="USAddress">
+		<xsd:sequence>
+			<xsd:element name="name" type="xsd:string" nillable="true"/>
+			<xsd:element name="street" type="xsd:string"/>
+			<xsd:element name="city" type="xsd:string"/>
+			<xsd:element name="state" type="xsd:string"/>
+			<xsd:element name="zip" type="xsd:decimal"/>
+		</xsd:sequence>
+		<xsd:attribute name="country" type="xsd:NMTOKEN" fixed="US"/>
+	</xsd:complexType>
+	<xsd:complexType name="Items">
+		<xsd:sequence>
+			<xsd:element name="item" minOccurs="0" maxOccurs="unbounded">
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:element name="productName" type="xsd:string"/>
+						<xsd:element name="quantity">
+							<xsd:simpleType>
+								<xsd:restriction base="xsd:positiveInteger">
+									<xsd:maxExclusive value="100"/>
+								</xsd:restriction>
+							</xsd:simpleType>
+						</xsd:element>
+						<xsd:element name="USPrice" type="xsd:decimal" fixed="30" />
+						<xsd:element ref="po:comment" minOccurs="0"/>
+						<xsd:element name="shipDate" type="xsd:date" minOccurs="0"/>
+					</xsd:sequence>
+					<xsd:attribute name="partNum" type="po:SKU" use="required"/>
+				</xsd:complexType>
+			</xsd:element>
+		</xsd:sequence>
+	</xsd:complexType>
+	<!-- Stock Keeping Unit, a code for identifying products -->
+	<xsd:simpleType name="SKU">
+		<xsd:restriction base="xsd:string">
+			<xsd:pattern value="\d{3}-[A-Z]{2}"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+</xsd:schema>

Modified: xmlbeans/trunk/test/cases/xbean/extensions/interfaceFeature/multInterfaces/po.xsdconfig
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/extensions/interfaceFeature/multInterfaces/po.xsdconfig?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/extensions/interfaceFeature/multInterfaces/po.xsdconfig&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/extensions/interfaceFeature/multInterfaces/po.xsdconfig&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/extensions/interfaceFeature/multInterfaces/po.xsdconfig	(original)
+++ xmlbeans/trunk/test/cases/xbean/extensions/interfaceFeature/multInterfaces/po.xsdconfig	Wed Dec  8 08:54:26 2004
@@ -1,23 +1,23 @@
-<!-- Copyright 2004 The Apache Software Foundation
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License. -->
-<xb:config xmlns:xb="http://xml.apache.org/xmlbeans/2004/02/xbean/config">
-
-    <xb:extension for="*">
-        <xb:interface name="xmlobject.extensions.interfaceFeature.multInterfaces.existing.IReport">
-            <xb:staticHandler>xmlobject.extensions.interfaceFeature.multInterfaces.existing.ReportHandler</xb:staticHandler>
-        </xb:interface>
-
-    </xb:extension>
-
+<!-- Copyright 2004 The Apache Software Foundation
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License. -->
+<xb:config xmlns:xb="http://xml.apache.org/xmlbeans/2004/02/xbean/config">
+
+    <xb:extension for="*">
+        <xb:interface name="xmlobject.extensions.interfaceFeature.multInterfaces.existing.IReport">
+            <xb:staticHandler>xmlobject.extensions.interfaceFeature.multInterfaces.existing.ReportHandler</xb:staticHandler>
+        </xb:interface>
+
+    </xb:extension>
+
 </xb:config>

Modified: xmlbeans/trunk/test/cases/xbean/extensions/interfaceFeature/readOnlyBean/po.xsd
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/extensions/interfaceFeature/readOnlyBean/po.xsd?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/extensions/interfaceFeature/readOnlyBean/po.xsd&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/extensions/interfaceFeature/readOnlyBean/po.xsd&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/extensions/interfaceFeature/readOnlyBean/po.xsd	(original)
+++ xmlbeans/trunk/test/cases/xbean/extensions/interfaceFeature/readOnlyBean/po.xsd	Wed Dec  8 08:54:26 2004
@@ -1,62 +1,62 @@
-<!-- edited with XMLSPY v5 rel. 2 U (http://www.xmlspy.com) by Michael Kintzer (BEA Systems) -->
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-xmlns:po="http://xbean.interface_feature/readOnlyBean/PurchaseOrder"
-targetNamespace="http://xbean.interface_feature/readOnlyBean/PurchaseOrder"
-elementFormDefault="qualified"
->
-	<xsd:annotation>
-		<xsd:documentation xml:lang="en">
-   Purchase order schema for Example.com.
-   Copyright 2000 Example.com. All rights reserved.
-  </xsd:documentation>
-	</xsd:annotation>
-	<xsd:element name="purchaseOrder" type="po:PurchaseOrderType"/>
-	<xsd:element name="comment" type="xsd:string"/>
-	<xsd:complexType name="PurchaseOrderType">
-		<xsd:sequence>
-			<xsd:element name="shipTo" type="po:USAddress"/>
-			<xsd:element name="billTo" type="po:USAddress"/>
-			<xsd:element ref="po:comment" minOccurs="0"/>
-			<xsd:element name="items" type="po:Items"/>
-		</xsd:sequence>
-		<xsd:attribute name="orderDate" type="xsd:date"/>
-	</xsd:complexType>
-	<xsd:complexType name="USAddress">
-		<xsd:sequence>
-			<xsd:element name="name" type="xsd:string" nillable="true"/>
-			<xsd:element name="street" type="xsd:string"/>
-			<xsd:element name="city" type="xsd:string"/>
-			<xsd:element name="state" type="xsd:string"/>
-			<xsd:element name="zip" type="xsd:decimal"/>
-		</xsd:sequence>
-		<xsd:attribute name="country" type="xsd:NMTOKEN" fixed="US"/>
-	</xsd:complexType>
-	<xsd:complexType name="Items">
-		<xsd:sequence>
-			<xsd:element name="item" minOccurs="0" maxOccurs="unbounded">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="productName" type="xsd:string"/>
-						<xsd:element name="quantity">
-							<xsd:simpleType>
-								<xsd:restriction base="xsd:positiveInteger">
-									<xsd:maxExclusive value="100"/>
-								</xsd:restriction>
-							</xsd:simpleType>
-						</xsd:element>
-						<xsd:element name="USPrice" type="xsd:decimal" fixed="30" />
-						<xsd:element ref="po:comment" minOccurs="0"/>
-						<xsd:element name="shipDate" type="xsd:date" minOccurs="0"/>
-					</xsd:sequence>
-					<xsd:attribute name="partNum" type="po:SKU" use="required"/>
-				</xsd:complexType>
-			</xsd:element>
-		</xsd:sequence>
-	</xsd:complexType>
-	<!-- Stock Keeping Unit, a code for identifying products -->
-	<xsd:simpleType name="SKU">
-		<xsd:restriction base="xsd:string">
-			<xsd:pattern value="\d{3}-[A-Z]{2}"/>
-		</xsd:restriction>
-	</xsd:simpleType>
-</xsd:schema>
+<!-- edited with XMLSPY v5 rel. 2 U (http://www.xmlspy.com) by Michael Kintzer (BEA Systems) -->
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+xmlns:po="http://xbean.interface_feature/readOnlyBean/PurchaseOrder"
+targetNamespace="http://xbean.interface_feature/readOnlyBean/PurchaseOrder"
+elementFormDefault="qualified"
+>
+	<xsd:annotation>
+		<xsd:documentation xml:lang="en">
+   Purchase order schema for Example.com.
+   Copyright 2000 Example.com. All rights reserved.
+  </xsd:documentation>
+	</xsd:annotation>
+	<xsd:element name="purchaseOrder" type="po:PurchaseOrderType"/>
+	<xsd:element name="comment" type="xsd:string"/>
+	<xsd:complexType name="PurchaseOrderType">
+		<xsd:sequence>
+			<xsd:element name="shipTo" type="po:USAddress"/>
+			<xsd:element name="billTo" type="po:USAddress"/>
+			<xsd:element ref="po:comment" minOccurs="0"/>
+			<xsd:element name="items" type="po:Items"/>
+		</xsd:sequence>
+		<xsd:attribute name="orderDate" type="xsd:date"/>
+	</xsd:complexType>
+	<xsd:complexType name="USAddress">
+		<xsd:sequence>
+			<xsd:element name="name" type="xsd:string" nillable="true"/>
+			<xsd:element name="street" type="xsd:string"/>
+			<xsd:element name="city" type="xsd:string"/>
+			<xsd:element name="state" type="xsd:string"/>
+			<xsd:element name="zip" type="xsd:decimal"/>
+		</xsd:sequence>
+		<xsd:attribute name="country" type="xsd:NMTOKEN" fixed="US"/>
+	</xsd:complexType>
+	<xsd:complexType name="Items">
+		<xsd:sequence>
+			<xsd:element name="item" minOccurs="0" maxOccurs="unbounded">
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:element name="productName" type="xsd:string"/>
+						<xsd:element name="quantity">
+							<xsd:simpleType>
+								<xsd:restriction base="xsd:positiveInteger">
+									<xsd:maxExclusive value="100"/>
+								</xsd:restriction>
+							</xsd:simpleType>
+						</xsd:element>
+						<xsd:element name="USPrice" type="xsd:decimal" fixed="30" />
+						<xsd:element ref="po:comment" minOccurs="0"/>
+						<xsd:element name="shipDate" type="xsd:date" minOccurs="0"/>
+					</xsd:sequence>
+					<xsd:attribute name="partNum" type="po:SKU" use="required"/>
+				</xsd:complexType>
+			</xsd:element>
+		</xsd:sequence>
+	</xsd:complexType>
+	<!-- Stock Keeping Unit, a code for identifying products -->
+	<xsd:simpleType name="SKU">
+		<xsd:restriction base="xsd:string">
+			<xsd:pattern value="\d{3}-[A-Z]{2}"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+</xsd:schema>

Modified: xmlbeans/trunk/test/cases/xbean/extensions/interfaceFeature/readOnlyBean/po.xsdconfig
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/extensions/interfaceFeature/readOnlyBean/po.xsdconfig?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/extensions/interfaceFeature/readOnlyBean/po.xsdconfig&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/extensions/interfaceFeature/readOnlyBean/po.xsdconfig&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/extensions/interfaceFeature/readOnlyBean/po.xsdconfig	(original)
+++ xmlbeans/trunk/test/cases/xbean/extensions/interfaceFeature/readOnlyBean/po.xsdconfig	Wed Dec  8 08:54:26 2004
@@ -1,23 +1,23 @@
-<!-- Copyright 2004 The Apache Software Foundation
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License. -->
-<xb:config xmlns:xb="http://xml.apache.org/xmlbeans/2004/02/xbean/config">
-
-    <xb:extension for="*">
-        <xb:interface name="xmlobject.extensions.interfaceFeature.readOnlyBean.existing.IFoo">
-            <xb:staticHandler>xmlobject.extensions.interfaceFeature.readOnlyBean.existing.FooHandler</xb:staticHandler>
-        </xb:interface>
-       
-    </xb:extension>
-
+<!-- Copyright 2004 The Apache Software Foundation
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License. -->
+<xb:config xmlns:xb="http://xml.apache.org/xmlbeans/2004/02/xbean/config">
+
+    <xb:extension for="*">
+        <xb:interface name="xmlobject.extensions.interfaceFeature.readOnlyBean.existing.IFoo">
+            <xb:staticHandler>xmlobject.extensions.interfaceFeature.readOnlyBean.existing.FooHandler</xb:staticHandler>
+        </xb:interface>
+       
+    </xb:extension>
+
 </xb:config>

Modified: xmlbeans/trunk/test/cases/xbean/extensions/prePostFeature/ValueRestriction/company.xsd
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/extensions/prePostFeature/ValueRestriction/company.xsd?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/extensions/prePostFeature/ValueRestriction/company.xsd&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/extensions/prePostFeature/ValueRestriction/company.xsd&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/extensions/prePostFeature/ValueRestriction/company.xsd	(original)
+++ xmlbeans/trunk/test/cases/xbean/extensions/prePostFeature/ValueRestriction/company.xsd	Wed Dec  8 08:54:26 2004
@@ -1,38 +1,38 @@
-<!--this is schema company.xsd stripped down and modified to have a value restriction on the employees age-->
-
-<xsd:schema 
-targetNamespace="http://xbean.prePostFeature/ValueRestriction/company" 
-xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-xmlns:company="http://xbean.prePostFeature/ValueRestriction/company">
-	<xsd:element name="company" type="company:CompanyType"/>
-	<xsd:complexType name="CompanyType">
-		<xsd:sequence>
-			<xsd:element name="departments" type="company:DepartmentType" maxOccurs="unbounded"/>
-		</xsd:sequence>
-		
-		<xsd:anyAttribute namespace="http://www.omg.org/XMI" processContents="lax"/>
-	</xsd:complexType>
-	<xsd:element name="department" type="company:DepartmentType"/>
-	<xsd:complexType name="DepartmentType">
-		<xsd:sequence>
-			<xsd:element name="consultant" type="company:ConsultantType" maxOccurs="unbounded"/>
-		</xsd:sequence>
-		<xsd:anyAttribute namespace="http://www.omg.org/XMI" processContents="lax"/>
-	</xsd:complexType>
-	<xsd:complexType name="ConsultantType">
-		
-		<xsd:attribute name="name" type="xsd:string"/>
-	      <xsd:attribute name="age" type="company:age"/>
-		<xsd:anyAttribute namespace="http://www.omg.org/XMI" processContents="lax"/>
-	   
-	</xsd:complexType>
-
-	
-               <xsd:simpleType name="age">
-                  <xsd:restriction base="xsd:integer">
-                         <xsd:minInclusive value="0"/>
-                         <xsd:maxInclusive value="100"/>
-                  </xsd:restriction>
-               </xsd:simpleType>
-   
-</xsd:schema>
+<!--this is schema company.xsd stripped down and modified to have a value restriction on the employees age-->
+
+<xsd:schema 
+targetNamespace="http://xbean.prePostFeature/ValueRestriction/company" 
+xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+xmlns:company="http://xbean.prePostFeature/ValueRestriction/company">
+	<xsd:element name="company" type="company:CompanyType"/>
+	<xsd:complexType name="CompanyType">
+		<xsd:sequence>
+			<xsd:element name="departments" type="company:DepartmentType" maxOccurs="unbounded"/>
+		</xsd:sequence>
+		
+		<xsd:anyAttribute namespace="http://www.omg.org/XMI" processContents="lax"/>
+	</xsd:complexType>
+	<xsd:element name="department" type="company:DepartmentType"/>
+	<xsd:complexType name="DepartmentType">
+		<xsd:sequence>
+			<xsd:element name="consultant" type="company:ConsultantType" maxOccurs="unbounded"/>
+		</xsd:sequence>
+		<xsd:anyAttribute namespace="http://www.omg.org/XMI" processContents="lax"/>
+	</xsd:complexType>
+	<xsd:complexType name="ConsultantType">
+		
+		<xsd:attribute name="name" type="xsd:string"/>
+	      <xsd:attribute name="age" type="company:age"/>
+		<xsd:anyAttribute namespace="http://www.omg.org/XMI" processContents="lax"/>
+	   
+	</xsd:complexType>
+
+	
+               <xsd:simpleType name="age">
+                  <xsd:restriction base="xsd:integer">
+                         <xsd:minInclusive value="0"/>
+                         <xsd:maxInclusive value="100"/>
+                  </xsd:restriction>
+               </xsd:simpleType>
+   
+</xsd:schema>

Modified: xmlbeans/trunk/test/cases/xbean/extensions/prePostFeature/ValueRestriction/company.xsdconfig
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/extensions/prePostFeature/ValueRestriction/company.xsdconfig?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/extensions/prePostFeature/ValueRestriction/company.xsdconfig&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/extensions/prePostFeature/ValueRestriction/company.xsdconfig&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/extensions/prePostFeature/ValueRestriction/company.xsdconfig	(original)
+++ xmlbeans/trunk/test/cases/xbean/extensions/prePostFeature/ValueRestriction/company.xsdconfig	Wed Dec  8 08:54:26 2004
@@ -1,26 +1,26 @@
-<!-- Copyright 2004 The Apache Software Foundation
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License. -->
-<xb:config xmlns:xb="http://xml.apache.org/xmlbeans/2004/02/xbean/config">
-
-    <xb:extension for="*">
-        <xb:interface name="xmlobject.extensions.prePostFeature.ValueRestriction.existing.ISetter">
-            <xb:staticHandler>xmlobject.extensions.prePostFeature.ValueRestriction.existing.SetterHandler</xb:staticHandler>
-        </xb:interface>  
-       <xb:prePostSet> 
-            <xb:staticHandler>xmlobject.extensions.prePostFeature.ValueRestriction.existing.SetterHandler</xb:staticHandler> 
-      </xb:prePostSet> 
-   </xb:extension> 
-
-
+<!-- Copyright 2004 The Apache Software Foundation
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License. -->
+<xb:config xmlns:xb="http://xml.apache.org/xmlbeans/2004/02/xbean/config">
+
+    <xb:extension for="*">
+        <xb:interface name="xmlobject.extensions.prePostFeature.ValueRestriction.existing.ISetter">
+            <xb:staticHandler>xmlobject.extensions.prePostFeature.ValueRestriction.existing.SetterHandler</xb:staticHandler>
+        </xb:interface>  
+       <xb:prePostSet> 
+            <xb:staticHandler>xmlobject.extensions.prePostFeature.ValueRestriction.existing.SetterHandler</xb:staticHandler> 
+      </xb:prePostSet> 
+   </xb:extension> 
+
+
 </xb:config>

Modified: xmlbeans/trunk/test/cases/xbean/extensions/prePostFeature/readOnlyBean/po.xsd
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/extensions/prePostFeature/readOnlyBean/po.xsd?view=diff&rev=111285&p1=xmlbeans/trunk/v2/test/cases/xbean/extensions/prePostFeature/readOnlyBean/po.xsd&r1=111277&p2=xmlbeans/trunk/test/cases/xbean/extensions/prePostFeature/readOnlyBean/po.xsd&r2=111285
==============================================================================
--- xmlbeans/trunk/v2/test/cases/xbean/extensions/prePostFeature/readOnlyBean/po.xsd	(original)
+++ xmlbeans/trunk/test/cases/xbean/extensions/prePostFeature/readOnlyBean/po.xsd	Wed Dec  8 08:54:26 2004
@@ -1,62 +1,62 @@
-<!-- edited with XMLSPY v5 rel. 2 U (http://www.xmlspy.com) by Michael Kintzer (BEA Systems) -->
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-xmlns:po="http://xbean.prePost_feature/readOnlyBean/PurchaseOrder"
-targetNamespace="http://xbean.prePost_feature/readOnlyBean/PurchaseOrder"
-elementFormDefault="qualified"
->
-	<x