JDO-807: Update schema descriptor of JDO Metadata file to use latest …

…3.2 xsd definition (#39)
apache · Mar 24, 2022 · 682b704 · 682b704
1 parent 065e9a7
commit 682b704
Show file tree

Hide file tree

Showing 321 changed files with 930 additions and 923 deletions.
diff --git a/api/src/test/java/javax/jdo/util/XMLTestUtil.java b/api/src/test/java/javax/jdo/util/XMLTestUtil.java
@@ -36,10 +36,16 @@
 import java.util.StringTokenizer;
 
 import javax.jdo.JDOFatalException;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
 
-import javax.xml.parsers.*;
 import org.w3c.dom.Document;
-import org.xml.sax.*;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
 
 /**
  * Tests schema files.
@@ -76,15 +82,15 @@ public class XMLTestUtil {
 
     /** jdo xsd file */
     protected static final File JDO_XSD_FILE = 
-        new File(BASEDIR + "/target/classes/javax/jdo/jdo_2_2.xsd");
+        new File(BASEDIR + "/target/classes/javax/jdo/jdo_3_2.xsd");
 
     /** orm xsd file */
     protected static final File ORM_XSD_FILE = 
-        new File(BASEDIR + "/target/classes/javax/jdo/orm_2_2.xsd");
+        new File(BASEDIR + "/target/classes/javax/jdo/orm_3_2.xsd");
 
     /** jdoquery xsd file */
     protected static final File JDOQUERY_XSD_FILE = 
-        new File(BASEDIR + "/target/classes/javax/jdo/jdoquery_2_2.xsd");
+        new File(BASEDIR + "/target/classes/javax/jdo/jdoquery_3_2.xsd");
 
     /** Entity resolver */
     protected static final EntityResolver resolver = new JDOEntityResolver();
@@ -107,7 +113,7 @@ public class XMLTestUtil {
     protected static final String NL = System.getProperty("line.separator");
 
     /** XSD builder for jdo namespace. */
-    private final DocumentBuilder jdoXsdBuilder = 
+    private final DocumentBuilder jdoXsdBuilder =
         createBuilder(JDO_XSD_NS + " " + JDO_XSD_FILE.toURI().toString());
 
     /** XSD builder for orm namespace. */
@@ -357,29 +363,29 @@ private static class JDOEntityResolver
         implements EntityResolver {
 
         private static final String RECOGNIZED_JDO_PUBLIC_ID = 
-            "-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 2.2//EN";
+            "-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 3.2//EN";
         private static final String RECOGNIZED_JDO_SYSTEM_ID = 
-            "file:/javax/jdo/jdo_2_2.dtd";
+            "file:/javax/jdo/jdo_3_2.dtd";
         private static final String RECOGNIZED_JDO_SYSTEM_ID2 = 
-            "http://xmlns.jcp.org/dtd/jdo_2_2.dtd";
+            "http://xmlns.jcp.org/dtd/jdo_3_2.dtd";
         private static final String RECOGNIZED_ORM_PUBLIC_ID = 
-            "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.2//EN";
+            "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.2//EN";
         private static final String RECOGNIZED_ORM_SYSTEM_ID = 
-            "file:/javax/jdo/orm_2_2.dtd";
+            "file:/javax/jdo/orm_3_2.dtd";
         private static final String RECOGNIZED_ORM_SYSTEM_ID2 = 
-            "http://xmlns.jcp.org/dtd/orm_2_2.dtd";
+            "http://xmlns.jcp.org/dtd/orm_3_2.dtd";
         private static final String RECOGNIZED_JDOQUERY_PUBLIC_ID = 
-            "-//Sun Microsystems, Inc.//DTD Java Data Objects Query Metadata 2.2//EN";
+            "-//Sun Microsystems, Inc.//DTD Java Data Objects Query Metadata 3.2//EN";
         private static final String RECOGNIZED_JDOQUERY_SYSTEM_ID = 
-            "file:/javax/jdo/jdoquery_2_2.dtd";
+            "file:/javax/jdo/jdoquery_3_2.dtd";
         private static final String RECOGNIZED_JDOQUERY_SYSTEM_ID2 = 
-            "http://xmlns.jcp.org/dtd/jdoquery_2_2.dtd";
+            "http://xmlns.jcp.org/dtd/jdoquery_3_2.dtd";
         private static final String JDO_DTD_FILENAME = 
-            "javax/jdo/jdo_2_2.dtd";
+            "javax/jdo/jdo_3_2.dtd";
         private static final String ORM_DTD_FILENAME = 
-            "javax/jdo/orm_2_2.dtd";
+            "javax/jdo/orm_3_2.dtd";
         private static final String JDOQUERY_DTD_FILENAME = 
-            "javax/jdo/jdoquery_2_2.dtd";
+            "javax/jdo/jdoquery_3_2.dtd";
 
         static Map<String,String> publicIds = new HashMap<String,String>();
         static Map<String,String> systemIds = new HashMap<String,String>();

diff --git a/api/src/test/resources/Negative0-dtd.jdo b/api/src/test/resources/Negative0-dtd.jdo
@@ -17,7 +17,7 @@
 -->
 <!-- Negative test: empty jdo element --> 
 <!DOCTYPE jdo PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 2.2//EN"
-        "http://xmlns.jcp.org/dtd/jdo_2_2.dtd">
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 3.2//EN"
+        "http://xmlns.jcp.org/dtd/jdo_3_2.dtd">
 <jdo>
 </jdo>
diff --git a/api/src/test/resources/Negative0-dtd.jdoquery b/api/src/test/resources/Negative0-dtd.jdoquery
@@ -17,7 +17,7 @@
 -->
 <!-- Negative test: empty jdoquery element --> 
 <!DOCTYPE jdo PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Query Metadata 2.2//EN"
-        "http://xmlns.jcp.org/dtd/jdoquery_2_2.dtd">
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Query Metadata 3.2//EN"
+        "http://xmlns.jcp.org/dtd/jdoquery_3_2.dtd">
 <jdoquery>
 </jdoquery>
diff --git a/api/src/test/resources/Negative0-dtd.orm b/api/src/test/resources/Negative0-dtd.orm
@@ -17,7 +17,7 @@
 -->
 <!-- Negative test: empty orm element --> 
 <!DOCTYPE orm PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.2//EN"
-        "http://xmlns.jcp.org/dtd/orm_2_2.dtd">
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.2//EN"
+        "http://xmlns.jcp.org/dtd/orm_3_2.dtd">
 <orm>
 </orm>
diff --git a/api/src/test/resources/Negative0-xsd.jdo b/api/src/test/resources/Negative0-xsd.jdo
@@ -18,6 +18,6 @@
 <!-- Negative test: empty jdo element --> 
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo 
-                         http://xmlns.jcp.org/xml/ns/jdo/jdo_2_2.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 </jdo>
diff --git a/api/src/test/resources/Negative0-xsd.jdoquery b/api/src/test/resources/Negative0-xsd.jdoquery
@@ -18,7 +18,7 @@
 <!-- Negative test: empty jdoquery element --> 
 <jdoquery xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoquery"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdoquery 
-                         http://xmlns.jcp.org/xml/ns/jdo/jdoquery_2_2.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdoquery
+     http://xmlns.jcp.org/xml/ns/jdo/jdoquery_3_2.xsd">
 
 </jdoquery>
diff --git a/api/src/test/resources/Negative0-xsd.orm b/api/src/test/resources/Negative0-xsd.orm
@@ -18,6 +18,6 @@
 <!-- Negative test: empty orm element --> 
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm 
-                         http://xmlns.jcp.org/xml/ns/jdo/orm_2_2.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
 </orm>
diff --git a/api/src/test/resources/Positive0-dtd.jdo b/api/src/test/resources/Positive0-dtd.jdo
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 <!DOCTYPE jdo PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 2.2//EN"
-        "http://xmlns.jcp.org/dtd/jdo_2_2.dtd">
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 3.2//EN"
+        "http://xmlns.jcp.org/dtd/jdo_3_2.dtd">
 <jdo>
     <package name="simple">
         <class name="TestClass"/>

diff --git a/api/src/test/resources/Positive0-dtd.jdoquery b/api/src/test/resources/Positive0-dtd.jdoquery
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 <!DOCTYPE jdoquery  PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Query Metadata 2.2//EN"
-        "http://xmlns.jcp.org/dtd/jdoquery_2_2.dtd">
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Query Metadata 3.2//EN"
+        "http://xmlns.jcp.org/dtd/jdoquery_3_2.dtd">
 <jdoquery>
     <package name="simple">
         <class name="TestClass">

diff --git a/api/src/test/resources/Positive0-dtd.orm b/api/src/test/resources/Positive0-dtd.orm
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 <!DOCTYPE orm PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.2//EN"
-        "http://xmlns.jcp.org/schema/orm_2_2.dtd">
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.2//EN"
+        "http://xmlns.jcp.org/schema/orm_3_2.dtd">
 <orm>
     <package name="simple">
         <class name="TestClass"/>

diff --git a/api/src/test/resources/Positive0-xsd.jdo b/api/src/test/resources/Positive0-xsd.jdo
@@ -17,8 +17,8 @@
 -->
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo 
-                         http://xmlns.jcp.org/xml/ns/jdo/jdo_2_2.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
     <package name="simple">
         <class name="TestClass"/>
     </package>

diff --git a/api/src/test/resources/Positive0-xsd.jdoquery b/api/src/test/resources/Positive0-xsd.jdoquery
@@ -17,8 +17,8 @@
 -->
 <jdoquery xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoquery"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdoquery 
-                         http://xmlns.jcp.org/xml/ns/jdo/jdoquery_2_2.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdoquery
+     http://xmlns.jcp.org/xml/ns/jdo/jdoquery_3_2.xsd">
     <package name="simple">
         <class name="TestClass">
             <query

diff --git a/api/src/test/resources/Positive0-xsd.orm b/api/src/test/resources/Positive0-xsd.orm
@@ -17,8 +17,8 @@
 -->
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm 
-                         http://xmlns.jcp.org/xml/ns/jdo/orm_2_2.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="simple">
         <class name="TestClass"/>
     </package>

diff --git a/api/src/test/resources/Positive1-dtd.jdo b/api/src/test/resources/Positive1-dtd.jdo
@@ -15,8 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE jdo PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 2.2//EN" 
-  "http://xmlns.jcp.org/dtd/jdo_2_2.dtd">
+<!DOCTYPE jdo PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 3.2//EN"
+  "http://xmlns.jcp.org/dtd/jdo_3_2.dtd">
 <!--
 This file contains the schema information when an implementation
 has application identity.

diff --git a/api/src/test/resources/Positive1-dtd.orm b/api/src/test/resources/Positive1-dtd.orm
@@ -15,7 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE orm PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.2//EN" "http://xmlns.jcp.org/dtd/orm_2_2.dtd">
+<!DOCTYPE orm PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.2//EN"
+  "http://xmlns.jcp.org/dtd/orm_2_2.dtd">
 <!--
 This file contains the schema information when an implementation
 has application identity.

diff --git a/api/src/test/resources/Positive1-xsd.jdo b/api/src/test/resources/Positive1-xsd.jdo
@@ -21,8 +21,8 @@ has application identity.
 -->
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo 
-                         http://xmlns.jcp.org/xml/ns/jdo/jdo_2_2.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.company">
 
         <class name="Address" embedded-only="true" requires-extent="false"/>

diff --git a/api/src/test/resources/Positive1-xsd.orm b/api/src/test/resources/Positive1-xsd.orm
@@ -21,8 +21,8 @@ has application identity.
 -->
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm 
-                         http://xmlns.jcp.org/xml/ns/jdo/orm_2_2.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.company">
 
         <class name="Address"/>

diff --git a/api/src/test/resources/Positive15.1-dtd.orm b/api/src/test/resources/Positive15.1-dtd.orm
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 <!DOCTYPE orm PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.2//EN"
-        "http://xmlns.jcp.org/schema/orm_2_2.dtd">
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.2//EN"
+        "http://xmlns.jcp.org/schema/orm_3_2.dtd">
 <orm>
     <package name="com.xyz">
         <class name="Address" table="ADDR">

diff --git a/api/src/test/resources/Positive15.1-xsd.orm b/api/src/test/resources/Positive15.1-xsd.orm
@@ -17,8 +17,8 @@
 -->
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm 
-                         http://xmlns.jcp.org/xml/ns/jdo/orm_2_2.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="com.xyz">
         <class name="Address" table="ADDR">
             <field name="street" column="STREET"/>

diff --git a/api/src/test/resources/Positive15.2.1-dtd.orm b/api/src/test/resources/Positive15.2.1-dtd.orm
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 <!DOCTYPE orm PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.2//EN"
-        "http://xmlns.jcp.org/schema/orm_2_2.dtd">
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.2//EN"
+        "http://xmlns.jcp.org/schema/orm_3_2.dtd">
 <orm>
 	<package name="com.xyz">
 		<class name="Address" table="ADDR">

diff --git a/api/src/test/resources/Positive15.2.1-xsd.orm b/api/src/test/resources/Positive15.2.1-xsd.orm
@@ -17,8 +17,8 @@
 -->
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm 
-                         http://xmlns.jcp.org/xml/ns/jdo/orm_2_2.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
 	<package name="com.xyz">
 		<class name="Address" table="ADDR">
 			<!-- shared join condition used by fields in DELIV -->

diff --git a/api/src/test/resources/Positive15.2.2-dtd.orm b/api/src/test/resources/Positive15.2.2-dtd.orm
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 <!DOCTYPE orm PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.2//EN"
-        "http://xmlns.jcp.org/schema/orm_2_2.dtd">
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.2//EN"
+        "http://xmlns.jcp.org/schema/orm_3_2.dtd">
 <orm>
 	<package name="com.xyz">
 		<class name="Address" table="ADDR">

diff --git a/api/src/test/resources/Positive15.2.2-xsd.orm b/api/src/test/resources/Positive15.2.2-xsd.orm
@@ -17,8 +17,8 @@
 -->
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm 
-                         http://xmlns.jcp.org/xml/ns/jdo/orm_2_2.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
 	<package name="com.xyz">
 		<class name="Address" table="ADDR">
 			<field name="street" column="STREET"/>

diff --git a/api/src/test/resources/Positive15.3.1-dtd.orm b/api/src/test/resources/Positive15.3.1-dtd.orm
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 <!DOCTYPE orm PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.2//EN"
-        "http://xmlns.jcp.org/schema/orm_2_2.dtd">
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.2//EN"
+        "http://xmlns.jcp.org/schema/orm_3_2.dtd">
 <orm>
 	<package name="com.xyz">
 		<class name="Employee" table="EMP">

diff --git a/api/src/test/resources/Positive15.3.1-xsd.orm b/api/src/test/resources/Positive15.3.1-xsd.orm
@@ -17,8 +17,8 @@
 -->
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm 
-                         http://xmlns.jcp.org/xml/ns/jdo/orm_2_2.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
 	<package name="com.xyz">
 		<class name="Employee" table="EMP">
 			<field name="ssn" column="SSN"/>

diff --git a/api/src/test/resources/Positive15.3.2-dtd.orm b/api/src/test/resources/Positive15.3.2-dtd.orm
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 <!DOCTYPE orm PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.2//EN"
-        "http://xmlns.jcp.org/schema/orm_2_2.dtd">
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.2//EN"
+        "http://xmlns.jcp.org/schema/orm_3_2.dtd">
 <orm>
 	<package name="com.xyz">
 		<class name="Department" table="DEP">

diff --git a/api/src/test/resources/Positive15.3.2-xsd.orm b/api/src/test/resources/Positive15.3.2-xsd.orm
@@ -17,8 +17,8 @@
 -->
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm 
-                         http://xmlns.jcp.org/xml/ns/jdo/orm_2_2.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
 	<package name="com.xyz">
 		<class name="Department" table="DEP">
  			<field name="name" column="NAME"/>

diff --git a/api/src/test/resources/Positive15.3.3-dtd.orm b/api/src/test/resources/Positive15.3.3-dtd.orm
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 <!DOCTYPE orm PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.2//EN"
-        "http://xmlns.jcp.org/schema/orm_2_2.dtd">
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.2//EN"
+        "http://xmlns.jcp.org/schema/orm_3_2.dtd">
 <orm>
 	<package name="com.xyz">
 		<class name="Employee" table="EMP">

diff --git a/api/src/test/resources/Positive15.3.3-xsd.orm b/api/src/test/resources/Positive15.3.3-xsd.orm
@@ -17,8 +17,8 @@
 -->
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm 
-                         http://xmlns.jcp.org/xml/ns/jdo/orm_2_2.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
 	<package name="com.xyz">
 		<class name="Employee" table="EMP">
 			<field name="ssn" column="SSN"/>

diff --git a/api/src/test/resources/Positive15.3.4-dtd.orm b/api/src/test/resources/Positive15.3.4-dtd.orm
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 <!DOCTYPE orm PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.2//EN"
-        "http://xmlns.jcp.org/schema/orm_2_2.dtd">
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.2//EN"
+        "http://xmlns.jcp.org/schema/orm_3_2.dtd">
 <orm>
 	<package name="com.xyz">
 		<class name="Employee" table="EMP">