[hibernate-commits] Hibernate SVN: r18951 - in core/trunk: annotations/src/test/resources/org/hibernate/test/annotations/configuration and 12 other directories.

hibernate-commits at lists.jboss.org hibernate-commits at lists.jboss.org
Wed Mar 10 03:42:20 EST 2010


Author: epbernard
Date: 2010-03-10 03:42:18 -0500 (Wed, 10 Mar 2010)
New Revision: 18951

Modified:
   core/trunk/annotations/src/main/docbook/en/modules/xml-overriding.xml
   core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/configuration/orm.xml
   core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/idclass/xml/HabitatSpeciesLink.xml
   core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/reflection/metadata-complete.xml
   core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/reflection/orm.xml
   core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm2.xml
   core/trunk/entitymanager/src/main/docbook/en/modules/listeners.xml
   core/trunk/entitymanager/src/test/bundles/defaultpar/META-INF/orm.xml
   core/trunk/entitymanager/src/test/bundles/defaultpar_1_0/META-INF/orm.xml
   core/trunk/entitymanager/src/test/bundles/excludehbmpar/META-INF/orm2.xml
   core/trunk/entitymanager/src/test/bundles/explicitpar/META-INF/orm.xml
   core/trunk/entitymanager/src/test/bundles/externaljar/META-INF/orm.xml
   core/trunk/entitymanager/src/test/bundles/war/WEB-INF/classes/META-INF/orm.xml
   core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/orm.xml
   core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/orm2.xml
   core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/orm3.xml
   core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm.xml
   core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm2.xml
   core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm3.xml
Log:
HHH-4933 Move all orm.xml files to orm_2_0.xml except on a few tests for backward compatiblilty

Modified: core/trunk/annotations/src/main/docbook/en/modules/xml-overriding.xml
===================================================================
--- core/trunk/annotations/src/main/docbook/en/modules/xml-overriding.xml	2010-03-10 08:23:04 UTC (rev 18950)
+++ core/trunk/annotations/src/main/docbook/en/modules/xml-overriding.xml	2010-03-10 08:42:18 UTC (rev 18951)
@@ -58,8 +58,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/>
@@ -117,8 +117,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.test.annotations.reflection</package>
     <entity class="Administration" access="PROPERTY" metadata-complete="true">
@@ -254,8 +254,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.test.annotations.reflection</package>
     <entity class="Music" access="PROPERTY" metadata-complete="true">
@@ -424,4 +424,4 @@
       informations in the chapter describing annotations.</para>
     </section>
   </section>
-</chapter>
\ No newline at end of file
+</chapter>

Modified: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/configuration/orm.xml
===================================================================
--- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/configuration/orm.xml	2010-03-10 08:23:04 UTC (rev 18950)
+++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/configuration/orm.xml	2010-03-10 08:42:18 UTC (rev 18951)
@@ -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>

Modified: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/idclass/xml/HabitatSpeciesLink.xml
===================================================================
--- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/idclass/xml/HabitatSpeciesLink.xml	2010-03-10 08:23:04 UTC (rev 18950)
+++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/idclass/xml/HabitatSpeciesLink.xml	2010-03-10 08:42:18 UTC (rev 18951)
@@ -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

Modified: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/reflection/metadata-complete.xml
===================================================================
--- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/reflection/metadata-complete.xml	2010-03-10 08:23:04 UTC (rev 18950)
+++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/reflection/metadata-complete.xml	2010-03-10 08:42:18 UTC (rev 18951)
@@ -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/>

Modified: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/reflection/orm.xml
===================================================================
--- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/reflection/orm.xml	2010-03-10 08:23:04 UTC (rev 18950)
+++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/reflection/orm.xml	2010-03-10 08:42:18 UTC (rev 18951)
@@ -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>

Modified: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm2.xml
===================================================================
--- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm2.xml	2010-03-10 08:23:04 UTC (rev 18950)
+++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm2.xml	2010-03-10 08:42:18 UTC (rev 18951)
@@ -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>

Modified: core/trunk/entitymanager/src/main/docbook/en/modules/listeners.xml
===================================================================
--- core/trunk/entitymanager/src/main/docbook/en/modules/listeners.xml	2010-03-10 08:23:04 UTC (rev 18950)
+++ core/trunk/entitymanager/src/main/docbook/en/modules/listeners.xml	2010-03-10 08:42:18 UTC (rev 18951)
@@ -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 @@
     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 @@
           <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 @@
     <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 @@
   <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 @@
     <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>
\ No newline at end of file
+</chapter>

Modified: core/trunk/entitymanager/src/test/bundles/defaultpar/META-INF/orm.xml
===================================================================
--- core/trunk/entitymanager/src/test/bundles/defaultpar/META-INF/orm.xml	2010-03-10 08:23:04 UTC (rev 18950)
+++ core/trunk/entitymanager/src/test/bundles/defaultpar/META-INF/orm.xml	2010-03-10 08:42:18 UTC (rev 18951)
@@ -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>

Modified: core/trunk/entitymanager/src/test/bundles/defaultpar_1_0/META-INF/orm.xml
===================================================================
--- core/trunk/entitymanager/src/test/bundles/defaultpar_1_0/META-INF/orm.xml	2010-03-10 08:23:04 UTC (rev 18950)
+++ core/trunk/entitymanager/src/test/bundles/defaultpar_1_0/META-INF/orm.xml	2010-03-10 08:42:18 UTC (rev 18951)
@@ -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>

Modified: core/trunk/entitymanager/src/test/bundles/excludehbmpar/META-INF/orm2.xml
===================================================================
--- core/trunk/entitymanager/src/test/bundles/excludehbmpar/META-INF/orm2.xml	2010-03-10 08:23:04 UTC (rev 18950)
+++ core/trunk/entitymanager/src/test/bundles/excludehbmpar/META-INF/orm2.xml	2010-03-10 08:42:18 UTC (rev 18951)
@@ -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">

Modified: core/trunk/entitymanager/src/test/bundles/explicitpar/META-INF/orm.xml
===================================================================
--- core/trunk/entitymanager/src/test/bundles/explicitpar/META-INF/orm.xml	2010-03-10 08:23:04 UTC (rev 18950)
+++ core/trunk/entitymanager/src/test/bundles/explicitpar/META-INF/orm.xml	2010-03-10 08:42:18 UTC (rev 18951)
@@ -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">

Modified: core/trunk/entitymanager/src/test/bundles/externaljar/META-INF/orm.xml
===================================================================
--- core/trunk/entitymanager/src/test/bundles/externaljar/META-INF/orm.xml	2010-03-10 08:23:04 UTC (rev 18950)
+++ core/trunk/entitymanager/src/test/bundles/externaljar/META-INF/orm.xml	2010-03-10 08:42:18 UTC (rev 18951)
@@ -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">

Modified: core/trunk/entitymanager/src/test/bundles/war/WEB-INF/classes/META-INF/orm.xml
===================================================================
--- core/trunk/entitymanager/src/test/bundles/war/WEB-INF/classes/META-INF/orm.xml	2010-03-10 08:23:04 UTC (rev 18950)
+++ core/trunk/entitymanager/src/test/bundles/war/WEB-INF/classes/META-INF/orm.xml	2010-03-10 08:42:18 UTC (rev 18951)
@@ -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>

Modified: core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/orm.xml
===================================================================
--- core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/orm.xml	2010-03-10 08:23:04 UTC (rev 18950)
+++ core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/orm.xml	2010-03-10 08:42:18 UTC (rev 18951)
@@ -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>

Modified: core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/orm2.xml
===================================================================
--- core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/orm2.xml	2010-03-10 08:23:04 UTC (rev 18950)
+++ core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/orm2.xml	2010-03-10 08:42:18 UTC (rev 18951)
@@ -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>

Modified: core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/orm3.xml
===================================================================
--- core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/orm3.xml	2010-03-10 08:23:04 UTC (rev 18950)
+++ core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/orm3.xml	2010-03-10 08:42:18 UTC (rev 18951)
@@ -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>

Modified: core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm.xml
===================================================================
--- core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm.xml	2010-03-10 08:23:04 UTC (rev 18950)
+++ core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm.xml	2010-03-10 08:42:18 UTC (rev 18951)
@@ -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>

Modified: core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm2.xml
===================================================================
--- core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm2.xml	2010-03-10 08:23:04 UTC (rev 18950)
+++ core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm2.xml	2010-03-10 08:42:18 UTC (rev 18951)
@@ -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>

Modified: core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm3.xml
===================================================================
--- core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm3.xml	2010-03-10 08:23:04 UTC (rev 18950)
+++ core/trunk/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm3.xml	2010-03-10 08:42:18 UTC (rev 18951)
@@ -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>



More information about the hibernate-commits mailing list