Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Emmanuel Bernard 2010-03-10 08:42:18 +00:00
parent 438a975bff
commit 863f378602
19 changed files with 56 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
annotations/src/main/docbook/en/modules/xml-overriding.xml
View File

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

4
annotations/src/test/resources/org/hibernate/test/annotations/configuration/orm.xml
View File

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

4
annotations/src/test/resources/org/hibernate/test/annotations/idclass/xml/HabitatSpeciesLink.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" <entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd"
version="1.0"> version="2.0">
<entity class="org.hibernate.test.annotations.idclass.xml.HabitatSpeciesLink" access="FIELD"> <entity class="org.hibernate.test.annotations.idclass.xml.HabitatSpeciesLink" access="FIELD">
<table name="HABITAT_SPECIES_LINK"/> <table name="HABITAT_SPECIES_LINK"/>
<id-class <id-class

4
annotations/src/test/resources/org/hibernate/test/annotations/reflection/metadata-complete.xml
View File

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

4
annotations/src/test/resources/org/hibernate/test/annotations/reflection/orm.xml
View File

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

1
annotations/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm2.xml
View File

@ -5,6 +5,7 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd"
version="1.0" version="1.0"
> >
<!-- use orm_1_0 on purpose (backward compatibility test -->
<package>org.hibernate.test.annotations.xml.ejb3</package> <package>org.hibernate.test.annotations.xml.ejb3</package>
<entity class="Light" access="FIELD" metadata-complete="true"> <entity class="Light" access="FIELD" metadata-complete="true">
<attributes> <attributes>

29
entitymanager/src/main/docbook/en/modules/listeners.xml
View File

@ -1,4 +1,4 @@
<?xml version='1.0' encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
~ Hibernate, Relational Persistence for Idiomatic Java ~ Hibernate, Relational Persistence for Idiomatic Java
~ ~
@ -22,8 +22,8 @@
~ 51 Franklin Street, Fifth Floor ~ 51 Franklin Street, Fifth Floor
~ Boston, MA 02110-1301 USA ~ Boston, MA 02110-1301 USA
--> -->
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
<chapter id="listeners"> <chapter id="listeners">
<title>Entity listeners and Callback methods</title> <title>Entity listeners and Callback methods</title>
@ -33,7 +33,7 @@
<para>It is often useful for the application to react to certain events <para>It is often useful for the application to react to certain events
that occur inside the persistence mechanism. This allows the that occur inside the persistence mechanism. This allows the
implementation of certain kinds of generic functionality, and extension of 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> mechanisms for this purpose.</para>
<para>A method of the entity may be designated as a callback method to <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 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 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 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> listener has the signature <code>void &lt;METHOD&gt;(Object)</code> where
where Object is of the actual entity type (note that Hibernate Entity Object is of the actual entity type (note that Hibernate Entity Manager
Manager relaxed this constraint and allows <literal>Object</literal> of relaxed this constraint and allows <literal>Object</literal> of
<literal>java.lang.Object</literal> type (allowing sharing of listeners <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 <para>A callback method can raise a
<classname>RuntimeException</classname>. The current transaction, if any, <classname>RuntimeException</classname>. The current transaction, if any,
@ -163,7 +163,7 @@ public class LastUpdateListener {
<row> <row>
<entry>@PostLoad</entry> <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> persistence context or an entity has been refreshed.</entry>
</row> </row>
</tbody> </tbody>
@ -217,16 +217,16 @@ public class LastUpdateListener {
<section> <section>
<title>XML definition</title> <title>XML definition</title>
<para>The EJB3 specification allows annotation overriding through EJB3 <para>The JPA specification allows annotation overriding through JPA
deployment descriptor. There is also an additional feature that can be deployment descriptors. There is also an additional feature that can be
useful: default event listeners.</para> useful: default event listeners.</para>
<programlisting>&lt;?xml version="1.0" encoding="UTF-8"?&gt; <programlisting>&lt;?xml version="1.0" encoding="UTF-8"?&gt;
&lt;entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" &lt;entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_2_0.xsd"
version="1.0" version="2.0"
&gt; &gt;
&lt;persistence-unit-metadata&gt; &lt;persistence-unit-metadata&gt;
&lt;persistence-unit-defaults&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 <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 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 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> &lt;exclude-default-listeners/&gt;).</para>
</section> </section>
</chapter> </chapter>

4
entitymanager/src/test/bundles/defaultpar/META-INF/orm.xml
View File

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

1
entitymanager/src/test/bundles/defaultpar_1_0/META-INF/orm.xml
View File

@ -5,6 +5,7 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd"
version="1.0" version="1.0"
> >
<!-- use orm_1_0 on purpose (backward compatibility test -->
<persistence-unit-metadata> <persistence-unit-metadata>
<persistence-unit-defaults> <persistence-unit-defaults>
<entity-listeners> <entity-listeners>

4
entitymanager/src/test/bundles/excludehbmpar/META-INF/orm2.xml
View File

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

4
entitymanager/src/test/bundles/explicitpar/META-INF/orm.xml
View File

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

4
entitymanager/src/test/bundles/externaljar/META-INF/orm.xml
View File

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

4
entitymanager/src/test/bundles/war/WEB-INF/classes/META-INF/orm.xml
View File

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

4
entitymanager/src/test/resources/org/hibernate/ejb/test/xml/orm.xml
View File

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

4
entitymanager/src/test/resources/org/hibernate/ejb/test/xml/orm2.xml
View File

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

4
entitymanager/src/test/resources/org/hibernate/ejb/test/xml/orm3.xml
View File

@ -2,8 +2,8 @@
<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" <entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd"
version="1.0"> version="2.0">
<persistence-unit-metadata> <persistence-unit-metadata>
<persistence-unit-defaults> <persistence-unit-defaults>

4
entitymanager/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm.xml
View File

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

4
entitymanager/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm2.xml
View File

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

4
entitymanager/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm3.xml
View File

@ -2,8 +2,8 @@
<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" <entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd"
version="1.0"> version="2.0">
<entity class="org.hibernate.ejb.test.xml.sequences.Employee" metadata-complete="false" access="FIELD"> <entity class="org.hibernate.ejb.test.xml.sequences.Employee" metadata-complete="false" access="FIELD">
<attributes> <attributes>