You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by mb...@apache.org on 2006/02/23 21:48:15 UTC
svn commit: r380222 - in /db/jdo/trunk/api20: src/schema/javax/jdo/ test/java/javax/jdo/schema/ test/schema/

Author: mbo
Date: Thu Feb 23 12:48:12 2006
New Revision: 380222

URL: http://svn.apache.org/viewcvs?rev=380222&view=rev
Log:
Change jdo xsd, XMLTest and test .jdo to make use of namespaces

Modified:
    db/jdo/trunk/api20/src/schema/javax/jdo/jdo.xsd
    db/jdo/trunk/api20/src/schema/javax/jdo/jdoquery.xsd
    db/jdo/trunk/api20/src/schema/javax/jdo/orm.xsd
    db/jdo/trunk/api20/test/java/javax/jdo/schema/XMLTest.java
    db/jdo/trunk/api20/test/schema/Negative0-xsd.jdo
    db/jdo/trunk/api20/test/schema/Positive0-xsd.jdo
    db/jdo/trunk/api20/test/schema/Positive1-xsd.jdo
    db/jdo/trunk/api20/test/schema/Positive99-xsd.jdo

Modified: db/jdo/trunk/api20/src/schema/javax/jdo/jdo.xsd
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/src/schema/javax/jdo/jdo.xsd?rev=380222&r1=380221&r2=380222&view=diff
==============================================================================
--- db/jdo/trunk/api20/src/schema/javax/jdo/jdo.xsd (original)
+++ db/jdo/trunk/api20/src/schema/javax/jdo/jdo.xsd Thu Feb 23 12:48:12 2006
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+<xs:schema targetNamespace="http://java.sun.com/xml/ns/jdo/jdo"
+           xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+           xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           version="1.0">
     <xs:element name="jdo">
         <xs:complexType>
             <xs:sequence>

Modified: db/jdo/trunk/api20/src/schema/javax/jdo/jdoquery.xsd
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/src/schema/javax/jdo/jdoquery.xsd?rev=380222&r1=380221&r2=380222&view=diff
==============================================================================
--- db/jdo/trunk/api20/src/schema/javax/jdo/jdoquery.xsd (original)
+++ db/jdo/trunk/api20/src/schema/javax/jdo/jdoquery.xsd Thu Feb 23 12:48:12 2006
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+<xs:schema  targetNamespace="http://java.sun.com/xml/ns/jdo/jdoquery"
+           xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+           xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           version="1.0">
     <xs:element name="jdoquery">
         <xs:complexType>
             <xs:sequence>

Modified: db/jdo/trunk/api20/src/schema/javax/jdo/orm.xsd
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/src/schema/javax/jdo/orm.xsd?rev=380222&r1=380221&r2=380222&view=diff
==============================================================================
--- db/jdo/trunk/api20/src/schema/javax/jdo/orm.xsd (original)
+++ db/jdo/trunk/api20/src/schema/javax/jdo/orm.xsd Thu Feb 23 12:48:12 2006
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+<xs:schema targetNamespace="http://java.sun.com/xml/ns/jdo/orm"
+           xmlns="http://java.sun.com/xml/ns/jdo/orm"
+           xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           version="1.0">
     <xs:element name="orm">
         <xs:complexType>
             <xs:sequence>

Modified: db/jdo/trunk/api20/test/java/javax/jdo/schema/XMLTest.java
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/test/java/javax/jdo/schema/XMLTest.java?rev=380222&r1=380221&r2=380222&view=diff
==============================================================================
--- db/jdo/trunk/api20/test/java/javax/jdo/schema/XMLTest.java (original)
+++ db/jdo/trunk/api20/test/java/javax/jdo/schema/XMLTest.java Thu Feb 23 12:48:12 2006
@@ -56,8 +56,20 @@
 
     /** */
     protected static final String SCHEMA_LOCATION_PROP =
-        "http://apache.org/xml/properties/schema/external-noNamespaceSchemaLocation";
+        "http://apache.org/xml/properties/schema/external-schemaLocation";
     
+    /** jdo namespace */
+    protected static final String JDO_XSD_NS = 
+        "http://java.sun.com/xml/ns/jdo/jdo";
+
+    /** orm namespace */
+    protected static final String ORM_XSD_NS = 
+        "http://java.sun.com/xml/ns/jdo/orm";
+
+    /** jdoquery namespace */
+    protected static final String JDOQL_XSD_NS = 
+        "http://java.sun.com/xml/ns/jdo/jdoquery";
+
     /** */
     protected static final File JDO_XSD_FILE = 
         new File(BASEDIR + "/target/classes/javax/jdo/jdo.xsd");
@@ -133,13 +145,13 @@
     public void testXSDBased() {
         // create XSD parser
         DocumentBuilder builder = null;
-        builder = createBuilder(JDO_XSD_FILE.toURI().toString());
+        builder = createBuilder(JDO_XSD_NS + " " + JDO_XSD_FILE.toURI().toString());
         checkXML(builder, positiveXSDJDO, true);
         checkXML(builder, negativeXSDJDO, false);
-        builder = createBuilder(ORM_XSD_FILE.toURI().toString());
+        builder = createBuilder(ORM_XSD_NS + " " + ORM_XSD_FILE.toURI().toString());
         checkXML(builder, positiveXSDORM, true);
         checkXML(builder, negativeXSDORM, false);
-        builder = createBuilder(JDOQL_XSD_FILE.toURI().toString());
+        builder = createBuilder(JDOQL_XSD_NS + " " + JDOQL_XSD_FILE.toURI().toString());
         checkXML(builder, positiveXSDJDOQL, true);
         checkXML(builder, negativeXSDJDOQL, false);
         String messages = retrieveMessages();

Modified: db/jdo/trunk/api20/test/schema/Negative0-xsd.jdo
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/test/schema/Negative0-xsd.jdo?rev=380222&r1=380221&r2=380222&view=diff
==============================================================================
--- db/jdo/trunk/api20/test/schema/Negative0-xsd.jdo (original)
+++ db/jdo/trunk/api20/test/schema/Negative0-xsd.jdo Thu Feb 23 12:48:12 2006
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!-- Negative test: empty jdo element --> 
-<jdo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:noNamespaceSchemaLocation="http://java.sun.com/xml/ns/jdo">
+<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
+                         http://java.sun.com/xml/ns/jdo/jdo_2_0.xsd">
 </jdo>

Modified: db/jdo/trunk/api20/test/schema/Positive0-xsd.jdo
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/test/schema/Positive0-xsd.jdo?rev=380222&r1=380221&r2=380222&view=diff
==============================================================================
--- db/jdo/trunk/api20/test/schema/Positive0-xsd.jdo (original)
+++ db/jdo/trunk/api20/test/schema/Positive0-xsd.jdo Thu Feb 23 12:48:12 2006
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<jdo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:noNamespaceSchemaLocation="http://java.sun.com/xml/ns/jdo">
+<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
+                         http://java.sun.com/xml/ns/jdo/jdo_2_0.xsd">
     <package name="simple">
         <class name="TestClass"/>
     </package>

Modified: db/jdo/trunk/api20/test/schema/Positive1-xsd.jdo
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/test/schema/Positive1-xsd.jdo?rev=380222&r1=380221&r2=380222&view=diff
==============================================================================
--- db/jdo/trunk/api20/test/schema/Positive1-xsd.jdo (original)
+++ db/jdo/trunk/api20/test/schema/Positive1-xsd.jdo Thu Feb 23 12:48:12 2006
@@ -3,8 +3,10 @@
 This file contains the schema information when an implementation
 has application identity.
 -->
-<jdo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:noNamespaceSchemaLocation="http://java.sun.com/xml/ns/jdo">
+<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
+                         http://java.sun.com/xml/ns/jdo/jdo_2_0.xsd">
     <package name="org.apache.jdo.tck.pc.company">
 
         <class name="Address" embedded-only="true" requires-extent="false"/>

Modified: db/jdo/trunk/api20/test/schema/Positive99-xsd.jdo
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/test/schema/Positive99-xsd.jdo?rev=380222&r1=380221&r2=380222&view=diff
==============================================================================
--- db/jdo/trunk/api20/test/schema/Positive99-xsd.jdo (original)
+++ db/jdo/trunk/api20/test/schema/Positive99-xsd.jdo Thu Feb 23 12:48:12 2006
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<jdo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:noNamespaceSchemaLocation="http://java.sun.com/xml/ns/jdo">
+<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
+                         http://java.sun.com/xml/ns/jdo/jdo_2_0.xsd">
   <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
   <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
   <package