HHH-4933 Move all orm.xml files to orm_2_0.xml except on a few tests for backward compatiblilty

git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@18951 1b8cb986-b30d-0410-93ca-fae66ebed9b2
2010-03-10 08:42:18 +00:00 · 2010-03-10 08:42:18 +00:00 · 863f378602
parent 438a975bff
commit 863f378602
19 changed files with 56 additions and 53 deletions
--- a/annotations/src/main/docbook/en/modules/xml-overriding.xml
+++ b/annotations/src/main/docbook/en/modules/xml-overriding.xml
@ -58,8 +58,8 @@
 &lt;entity-mappings 
  xmlns="http://java.sun.com/xml/ns/persistence/orm"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd"
-  version="1.0"&gt;
+  xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_2_0.xsd"
+  version="2.0"&gt;

    &lt;persistence-unit-metadata&gt;
        &lt;xml-mapping-metadata-complete/&gt;
@ -117,8 +117,8 @@
 &lt;entity-mappings 
  xmlns="http://java.sun.com/xml/ns/persistence/orm"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd"
-  version="1.0"&gt;
+  xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_2_0.xsd"
+  version="2.0"&gt;

    &lt;package&gt;org.hibernate.test.annotations.reflection&lt;/package&gt;
    &lt;entity class="Administration" access="PROPERTY" metadata-complete="true"&gt;
@ -254,8 +254,8 @@
 &lt;entity-mappings 
  xmlns="http://java.sun.com/xml/ns/persistence/orm"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd"
-  version="1.0"&gt;
+  xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_2_0.xsd"
+  version="2.0"&gt;

    &lt;package&gt;org.hibernate.test.annotations.reflection&lt;/package&gt;
    &lt;entity class="Music" access="PROPERTY" metadata-complete="true"&gt;
@ -424,4 +424,4 @@
      informations in the chapter describing annotations.</para>
    </section>
  </section>
-</chapter>
+</chapter>
--- a/annotations/src/test/resources/org/hibernate/test/annotations/configuration/orm.xml
+++ b/annotations/src/test/resources/org/hibernate/test/annotations/configuration/orm.xml
@ -2,6 +2,6 @@
 <entity-mappings
    xmlns="http://java.sun.com/xml/ns/persistence/orm"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd"
-    version="1.0">
+    xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_2_0.xsd"
+    version="2.0">
 </entity-mappings>
--- a/annotations/src/test/resources/org/hibernate/test/annotations/idclass/xml/HabitatSpeciesLink.xml
+++ b/annotations/src/test/resources/org/hibernate/test/annotations/idclass/xml/HabitatSpeciesLink.xml
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm"
                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                 xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd"
-                 version="1.0">
+                 xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd"
+                 version="2.0">
    <entity class="org.hibernate.test.annotations.idclass.xml.HabitatSpeciesLink" access="FIELD">
        <table name="HABITAT_SPECIES_LINK"/>
        <id-class
--- a/annotations/src/test/resources/org/hibernate/test/annotations/reflection/metadata-complete.xml
+++ b/annotations/src/test/resources/org/hibernate/test/annotations/reflection/metadata-complete.xml
@ -2,8 +2,8 @@

 <entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm"
                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                 xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd"
-                 version="1.0"
+                 xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_2_0.xsd"
+                 version="2.0"
        >
    <persistence-unit-metadata>
        <xml-mapping-metadata-complete/>
--- a/annotations/src/test/resources/org/hibernate/test/annotations/reflection/orm.xml
+++ b/annotations/src/test/resources/org/hibernate/test/annotations/reflection/orm.xml
@ -2,8 +2,8 @@

 <entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm"
                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                 xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd"
-                 version="1.0"
+                 xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_2_0.xsd"
+                 version="2.0"
        >
    <persistence-unit-metadata>
        <persistence-unit-defaults>
--- a/annotations/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm2.xml
+++ b/annotations/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm2.xml
@ -5,6 +5,7 @@
                 xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd"
                 version="1.0"
        >
+    <!-- use orm_1_0 on purpose (backward compatibility test -->
    <package>org.hibernate.test.annotations.xml.ejb3</package>
    <entity class="Light" access="FIELD" metadata-complete="true">
        <attributes>
--- a/entitymanager/src/main/docbook/en/modules/listeners.xml
+++ b/entitymanager/src/main/docbook/en/modules/listeners.xml
@ -1,4 +1,4 @@
-<?xml version='1.0' encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
  ~ Hibernate, Relational Persistence for Idiomatic Java
  ~
@ -22,8 +22,8 @@
  ~ 51 Franklin Street, Fifth Floor
  ~ Boston, MA  02110-1301  USA
  -->
-
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <chapter id="listeners">
  <title>Entity listeners and Callback methods</title>

@ -33,7 +33,7 @@
    <para>It is often useful for the application to react to certain events
    that occur inside the persistence mechanism. This allows the
    implementation of certain kinds of generic functionality, and extension of
-    built-in functionality. The EJB3 specification provides two related
+    built-in functionality. The JPA specification provides two related
    mechanisms for this purpose.</para>

    <para>A method of the entity may be designated as a callback method to
@ -89,11 +89,11 @@ public class LastUpdateListener {
    have two methods being annotated by the same callback annotation whether
    it is a callback method or an entity listener method. A callback method is
    a no-arg method with no return type and any arbitrary name. An entity
-    listener has the signature <code>void &lt;METHOD&gt;(Object)</code>
-    where Object is of the actual entity type (note that Hibernate Entity
-    Manager relaxed this constraint and allows <literal>Object</literal> of
+    listener has the signature <code>void &lt;METHOD&gt;(Object)</code> where
+    Object is of the actual entity type (note that Hibernate Entity Manager
+    relaxed this constraint and allows <literal>Object</literal> of
    <literal>java.lang.Object</literal> type (allowing sharing of listeners
-    accross several entities.)</para>
+    across several entities.)</para>

    <para>A callback method can raise a
    <classname>RuntimeException</classname>. The current transaction, if any,
@ -163,7 +163,7 @@ public class LastUpdateListener {
          <row>
            <entry>@PostLoad</entry>

-            <entry>Eexecuted after an entity has been loaded into the current
+            <entry>Executed after an entity has been loaded into the current
            persistence context or an entity has been refreshed.</entry>
          </row>
        </tbody>
@ -179,7 +179,7 @@ public class LastUpdateListener {
    <title>Callbacks and listeners inheritance</title>

    <para>You can define several entity listeners per entity at different
-    level of the hierarchy.You can also define several callbacks at different
+    level of the hierarchy. You can also define several callbacks at different
    level of the hierarchy. But you cannot define two listeners for the same
    event in the same entity or the same entity listener.</para>

@ -217,16 +217,16 @@ public class LastUpdateListener {
  <section>
    <title>XML definition</title>

-    <para>The EJB3 specification allows annotation overriding through EJB3
-    deployment descriptor. There is also an additional feature that can be
+    <para>The JPA specification allows annotation overriding through JPA
+    deployment descriptors. There is also an additional feature that can be
    useful: default event listeners.</para>

    <programlisting>&lt;?xml version="1.0" encoding="UTF-8"?&gt;

 &lt;entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm"
                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                 xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd"
-                 version="1.0"
+                 xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_2_0.xsd"
+                 version="2.0"
        &gt;
    &lt;persistence-unit-metadata&gt;
        &lt;persistence-unit-defaults&gt;
@ -258,7 +258,8 @@ public class LastUpdateListener {
    <para>Last but not least, you can define some default entity listeners
    that will apply first on the entity listener stack of all the mapped
    entities of a given persistence unit. If you don't want an entity to
-    inherit the default listeners, you can use @ExcludeDefaultListeners (or
+    inherit the default listeners, you can use
+    <classname>@ExcludeDefaultListeners</classname> (or
    &lt;exclude-default-listeners/&gt;).</para>
  </section>
-</chapter>
+</chapter>
--- a/entitymanager/src/test/bundles/defaultpar/META-INF/orm.xml
+++ b/entitymanager/src/test/bundles/defaultpar/META-INF/orm.xml
@ -2,8 +2,8 @@

 <entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm"
                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                 xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd"
-                 version="1.0"
+                 xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_2_0.xsd"
+                 version="2.0"
        >
    <persistence-unit-metadata>
        <persistence-unit-defaults>
--- a/entitymanager/src/test/bundles/defaultpar_1_0/META-INF/orm.xml
+++ b/entitymanager/src/test/bundles/defaultpar_1_0/META-INF/orm.xml
@ -5,6 +5,7 @@
                 xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd"
                 version="1.0"
        >
+    <!-- use orm_1_0 on purpose (backward compatibility test -->
    <persistence-unit-metadata>
        <persistence-unit-defaults>
            <entity-listeners>
--- a/entitymanager/src/test/bundles/excludehbmpar/META-INF/orm2.xml
+++ b/entitymanager/src/test/bundles/excludehbmpar/META-INF/orm2.xml
@ -2,8 +2,8 @@

 <entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm"
                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                 xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd"
-                 version="1.0"
+                 xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_2_0.xsd"
+                 version="2.0"
        >
    <package>org.hibernate.ejb.test.xml</package>
    <entity class="Light" access="FIELD" metadata-complete="true">
--- a/entitymanager/src/test/bundles/explicitpar/META-INF/orm.xml
+++ b/entitymanager/src/test/bundles/explicitpar/META-INF/orm.xml
@ -2,8 +2,8 @@

 <entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm"
                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                 xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd"
-                 version="1.0"
+                 xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_2_0.xsd"
+                 version="2.0"
        >
    <package>org.hibernate.ejb.test.pack.various</package>
    <entity class="Seat" access="PROPERTY" metadata-complete="true">
--- a/entitymanager/src/test/bundles/externaljar/META-INF/orm.xml
+++ b/entitymanager/src/test/bundles/externaljar/META-INF/orm.xml
@ -2,8 +2,8 @@

 <entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm"
                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                 xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd"
-                 version="1.0"
+                 xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_2_0.xsd"
+                 version="2.0"
        >
    <package>org.hibernate.ejb.test.pack.various</package>
    <entity class="Airplane" metadata-complete="true" access="PROPERTY">
--- a/entitymanager/src/test/bundles/war/WEB-INF/classes/META-INF/orm.xml
+++ b/entitymanager/src/test/bundles/war/WEB-INF/classes/META-INF/orm.xml
@ -2,8 +2,8 @@

 <entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm"
                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                 xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd"
-                 version="1.0"
+                 xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_2_0.xsd"
+                 version="2.0"
        >
    <persistence-unit-metadata>
        <persistence-unit-defaults>
--- a/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/orm.xml
+++ b/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/orm.xml
@ -2,8 +2,8 @@

 <entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm"
                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                 xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd"
-                 version="1.0"
+                 xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_2_0.xsd"
+                 version="2.0"
        >
    <persistence-unit-metadata>
        <persistence-unit-defaults>
--- a/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/orm2.xml
+++ b/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/orm2.xml
@ -2,8 +2,8 @@

 <entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm"
                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                 xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd"
-                 version="1.0"
+                 xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_2_0.xsd"
+                 version="2.0"
        >
    <entity class="org.hibernate.ejb.test.xml.Lighter" name="ALighter" access="FIELD" metadata-complete="true">
        <attributes>
--- a/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/orm3.xml
+++ b/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/orm3.xml
@ -2,8 +2,8 @@

 <entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd"
-    version="1.0">
+    xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd"
+    version="2.0">

    <persistence-unit-metadata>
        <persistence-unit-defaults>
--- a/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm.xml
+++ b/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm.xml
@ -2,8 +2,8 @@

 <entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm"
                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                 xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd"
-                 version="1.0"
+                 xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_2_0.xsd"
+                 version="2.0"
        >
    <persistence-unit-metadata>
        <persistence-unit-defaults>
--- a/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm2.xml
+++ b/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm2.xml
@ -2,8 +2,8 @@

 <entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm"
                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                 xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd"
-                 version="1.0"
+                 xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_2_0.xsd"
+                 version="2.0"
        >
    <entity class="org.hibernate.ejb.test.xml.sequences.Lighter" name="ALighter" access="FIELD" metadata-complete="true">
        <attributes>
--- a/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm3.xml
+++ b/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm3.xml
@ -2,8 +2,8 @@

 <entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd"
-    version="1.0">
+    xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd"
+    version="2.0">

    <entity class="org.hibernate.ejb.test.xml.sequences.Employee" metadata-complete="false" access="FIELD">
        <attributes>