[hibernate-commits] Hibernate SVN: r17779 - in core/trunk/annotations/src/test: java/org/hibernate/test/annotations/bytecode and 24 other directories.

hibernate-commits at lists.jboss.org hibernate-commits at lists.jboss.org
Fri Oct 16 09:22:31 EDT 2009


Author: hardy.ferentschik
Date: 2009-10-16 09:22:28 -0400 (Fri, 16 Oct 2009)
New Revision: 17779

Added:
   core/trunk/annotations/src/test/resources/org/
   core/trunk/annotations/src/test/resources/org/hibernate/
   core/trunk/annotations/src/test/resources/org/hibernate/test/
   core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/
   core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/Boat.hbm.xml
   core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/Ferry.hbm.xml
   core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/bytecode/
   core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/bytecode/Hammer.hbm.xml
   core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/configuration/
   core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/configuration/orm.xml
   core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/duplicatedgenerator/
   core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/duplicatedgenerator/orm.xml
   core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/hibernate.cfg.xml
   core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/inheritance/
   core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/inheritance/joined/
   core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/inheritance/joined/Asset.hbm.xml
   core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/loader/
   core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/loader/Loader.hbm.xml
   core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/orm.xml
   core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/query/
   core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/query/orm.xml
   core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/reflection/
   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/
   core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/ejb3/
   core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm.xml
   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/orm3.xml
   core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/hbm/
   core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/hbm/A.hbm.xml
   core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/hbm/B.hbm.xml
   core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/hbm/CloudType.hbm.xml
   core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/hbm/Government.hbm.xml
Removed:
   core/trunk/annotations/src/test/java/org/hibernate/test/annotations/Boat.hbm.xml
   core/trunk/annotations/src/test/java/org/hibernate/test/annotations/Ferry.hbm.xml
   core/trunk/annotations/src/test/java/org/hibernate/test/annotations/bytecode/Hammer.hbm.xml
   core/trunk/annotations/src/test/java/org/hibernate/test/annotations/configuration/orm.xml
   core/trunk/annotations/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/orm.xml
   core/trunk/annotations/src/test/java/org/hibernate/test/annotations/hibernate.cfg.xml
   core/trunk/annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/Asset.hbm.xml
   core/trunk/annotations/src/test/java/org/hibernate/test/annotations/loader/Loader.hbm.xml
   core/trunk/annotations/src/test/java/org/hibernate/test/annotations/orm.xml
   core/trunk/annotations/src/test/java/org/hibernate/test/annotations/query/orm.xml
   core/trunk/annotations/src/test/java/org/hibernate/test/annotations/reflection/metadata-complete.xml
   core/trunk/annotations/src/test/java/org/hibernate/test/annotations/reflection/orm.xml
   core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/ejb3/orm.xml
   core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/ejb3/orm2.xml
   core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/ejb3/orm3.xml
   core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/A.hbm.xml
   core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/B.hbm.xml
   core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/CloudType.hbm.xml
   core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/Government.hbm.xml
Modified:
   core/trunk/annotations/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/DuplicateTest.java
   core/trunk/annotations/src/test/java/org/hibernate/test/annotations/reflection/JPAOverridenAnnotationReaderTest.java
   core/trunk/annotations/src/test/java/org/hibernate/test/annotations/reflection/XMLContextTest.java
   core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java
Log:
HHH-4498

Deleted: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/Boat.hbm.xml
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/Boat.hbm.xml	2009-10-16 13:02:53 UTC (rev 17778)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/Boat.hbm.xml	2009-10-16 13:22:28 UTC (rev 17779)
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
-        "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-        "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<!--
-
-  Used to demonstrate the declarative configuration
-  of both hbm files and annotated classes
-  See hibernate.cfg.xml and ConfigurationTest
-
--->
-
-<hibernate-mapping package="org.hibernate.test.annotations">
-
-    <class name="Boat" table="BoatInXml">
-
-        <id name="id">
-            <generator class="native"/>
-        </id>
-
-        <property name="size" column="boat_size"/>
-
-    </class>
-
-</hibernate-mapping>
\ No newline at end of file

Deleted: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/Ferry.hbm.xml
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/Ferry.hbm.xml	2009-10-16 13:02:53 UTC (rev 17778)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/Ferry.hbm.xml	2009-10-16 13:22:28 UTC (rev 17779)
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
-        "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-        "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<!--
-
-  Used to test the interaction of hbm files with a subclass
-  extends attribute and annotated classes.
-
-  See ConfigurationTest
-
--->
-
-<hibernate-mapping package="org.hibernate.test.annotations">
-
-    <joined-subclass name="Ferry" table="FerryJoined" extends="org.hibernate.test.annotations.Boat">
-        <key column="id"/>
-        <property name="sea"/>
-
-    </joined-subclass>
-
-</hibernate-mapping>
\ No newline at end of file

Deleted: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/bytecode/Hammer.hbm.xml
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/bytecode/Hammer.hbm.xml	2009-10-16 13:02:53 UTC (rev 17778)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/bytecode/Hammer.hbm.xml	2009-10-16 13:22:28 UTC (rev 17779)
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
-        "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-        "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping package="org.hibernate.test.annotations.bytecode">
-    <class name="Hammer">
-        <id name="id" type="java.lang.Long">
-            <generator class="increment"/>
-        </id>
-    </class>
-</hibernate-mapping>
\ No newline at end of file

Deleted: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/configuration/orm.xml
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/configuration/orm.xml	2009-10-16 13:02:53 UTC (rev 17778)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/configuration/orm.xml	2009-10-16 13:22:28 UTC (rev 17779)
@@ -1,7 +0,0 @@
-<?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 orm_1_0.xsd"
-    version="1.0">
-</entity-mappings>

Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/DuplicateTest.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/DuplicateTest.java	2009-10-16 13:02:53 UTC (rev 17778)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/DuplicateTest.java	2009-10-16 13:22:28 UTC (rev 17779)
@@ -16,8 +16,8 @@
 		try {
 			cfg.addAnnotatedClass( Flight.class );
 			cfg.addAnnotatedClass( org.hibernate.test.annotations.Flight.class );
-			cfg.addResource( "org/hibernate/test/annotations/orm.xml");
-			cfg.addResource( "org/hibernate/test/annotations/duplicatedgenerator/orm.xml");
+			cfg.addResource( "org/hibernate/test/annotations/orm.xml" );
+			cfg.addResource( "org/hibernate/test/annotations/duplicatedgenerator/orm.xml" );
 			cfg.buildSessionFactory();
 			fail( "Should not be able to map the same entity name twice" );
 		}

Deleted: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/orm.xml
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/orm.xml	2009-10-16 13:02:53 UTC (rev 17778)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/orm.xml	2009-10-16 13:22:28 UTC (rev 17779)
@@ -1,10 +0,0 @@
-<?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"
-                 version="1.0"
-        >
-    <table-generator name="EMP_GEN" table="GENERATOR_TABLE"
-                     pk-column-name="pkey" pk-column-value="EMP"
-                     value-column-name="hi" allocation-size="20"/>
-</entity-mappings>
\ No newline at end of file

Deleted: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/hibernate.cfg.xml
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/hibernate.cfg.xml	2009-10-16 13:02:53 UTC (rev 17778)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/hibernate.cfg.xml	2009-10-16 13:22:28 UTC (rev 17779)
@@ -1,11 +0,0 @@
-<!DOCTYPE hibernate-configuration PUBLIC
-        "-//Hibernate/Hibernate Configuration DTD 3.0//EN"
-        "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
-
-<hibernate-configuration>
-    <session-factory>
-        <mapping resource="org/hibernate/test/annotations/Boat.hbm.xml"/>
-        <mapping package="org.hibernate.test.annotations"/>
-        <mapping class="org.hibernate.test.annotations.Plane"/>
-    </session-factory>
-</hibernate-configuration>
\ No newline at end of file

Deleted: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/Asset.hbm.xml
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/Asset.hbm.xml	2009-10-16 13:02:53 UTC (rev 17778)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/Asset.hbm.xml	2009-10-16 13:22:28 UTC (rev 17779)
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
-        "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-        "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping package="org.hibernate.test.annotations.inheritance.joined">
-
-    <class name="Parent">
-        <id name="id">
-            <generator class="native"/>
-        </id>
-        <set name="financialAssets" fetch="join" cascade="refresh" inverse="true">
-            <key column="PARENT_ID"/>
-            <one-to-many class="FinancialAsset"/>
-        </set>
-        <set name="propertyAssets" fetch="join" cascade="refresh" inverse="true">
-            <key column="PARENT_ID"/>
-            <one-to-many class="PropertyAsset"/>
-        </set>
-    </class>
-    <class name="Asset">
-        <id name="id">
-            <generator class="native"/>
-        </id>
-        <many-to-one name="parent" column="PARENT_ID" property-ref="parent"/>
-        <joined-subclass name="FinancialAsset">
-            <key column="ID"/>
-            <property name="price"/>
-        </joined-subclass>
-        <joined-subclass name="PropertyAsset">
-            <key column="ID"/>
-            <property name="price"/>
-        </joined-subclass>
-    </class>
-
-</hibernate-mapping>
\ No newline at end of file

Deleted: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/loader/Loader.hbm.xml
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/loader/Loader.hbm.xml	2009-10-16 13:02:53 UTC (rev 17778)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/loader/Loader.hbm.xml	2009-10-16 13:22:28 UTC (rev 17779)
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
-        "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-        "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<!--
-
-  Used to demonstrate the declarative configuration
-  of both hbm files and annotated classes
-  See hibernate.cfg.xml and ConfigurationTest
-
--->
-
-<hibernate-mapping package="org.hibernate.test.annotations.loader">
-
-    <sql-query name="loadByTeam">
-        <load-collection alias="p" role="Team.players"/>
-        select {p.*} from Player p where p.team_id = ?
-    </sql-query>
-
-</hibernate-mapping>
\ No newline at end of file

Deleted: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/orm.xml
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/orm.xml	2009-10-16 13:02:53 UTC (rev 17778)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/orm.xml	2009-10-16 13:22:28 UTC (rev 17779)
@@ -1,11 +0,0 @@
-<?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"
-                 version="1.0"
-        >
-    <sequence-generator name="SEQ_GEN" sequence-name="my_sequence"/>
-    <table-generator name="EMP_GEN" table="GENERATOR_TABLE"
-                     pk-column-name="pkey" pk-column-value="EMP"
-                     value-column-name="hi" allocation-size="20"/>
-</entity-mappings>
\ No newline at end of file

Deleted: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/query/orm.xml
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/query/orm.xml	2009-10-16 13:02:53 UTC (rev 17778)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/query/orm.xml	2009-10-16 13:22:28 UTC (rev 17779)
@@ -1,24 +0,0 @@
-<?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"
-                 version="1.0"
-        >
-    <named-query name="plane.getAll">
-        <query>select p from Plane p</query>
-    </named-query>
-    <named-native-query name="night.getAll.bySQL" result-set-mapping="sqlmapping">
-        <query>select id, night_duration, night_date as dte, area_id from Night where night_duration > ?</query>
-    </named-native-query>
-    <named-native-query name="getAreaByNative" result-class="org.hibernate.test.annotations.query.Area">
-        <query>select * from tbl_area</query>
-    </named-native-query>
-    <sql-result-set-mapping name="sqlmapping">
-        <entity-result entity-class="org.hibernate.test.annotations.query.Night">
-            <field-result name="id" column="id"/>
-            <field-result name="duration" column="night_duration"/>
-            <field-result name="date" column="dte"/>
-            <field-result name="area" column="area_id"/>
-        </entity-result>
-    </sql-result-set-mapping>
-</entity-mappings>
\ No newline at end of file

Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/reflection/JPAOverridenAnnotationReaderTest.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/reflection/JPAOverridenAnnotationReaderTest.java	2009-10-16 13:02:53 UTC (rev 17778)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/reflection/JPAOverridenAnnotationReaderTest.java	2009-10-16 13:22:28 UTC (rev 17779)
@@ -75,7 +75,8 @@
 public class JPAOverridenAnnotationReaderTest extends TestCase {
 	public void testMappedSuperclassAnnotations() throws Exception {
 		XMLContext context = buildContext(
-				"org/hibernate/test/annotations/reflection/metadata-complete.xml" );
+				"org/hibernate/test/annotations/reflection/metadata-complete.xml"
+		);
 		JPAOverridenAnnotationReader reader = new JPAOverridenAnnotationReader( Organization.class, context );
 		assertTrue( reader.isAnnotationPresent( MappedSuperclass.class ) );
 	}
@@ -212,7 +213,8 @@
 
 	public void testEntityRelatedAnnotationsMetadataComplete() throws Exception {
 		XMLContext context = buildContext(
-				"org/hibernate/test/annotations/reflection/metadata-complete.xml" );
+				"org/hibernate/test/annotations/reflection/metadata-complete.xml"
+		);
 		JPAOverridenAnnotationReader reader = new JPAOverridenAnnotationReader( Administration.class, context );
 		assertNotNull( reader.getAnnotation( Entity.class ) );
 		assertEquals(
@@ -269,7 +271,8 @@
 		assertEquals( TemporalType.DATE, reader.getAnnotation( Temporal.class ).value() );
 
 		context = buildContext(
-				"org/hibernate/test/annotations/reflection/metadata-complete.xml" );
+				"org/hibernate/test/annotations/reflection/metadata-complete.xml"
+		);
 		method = Administration.class.getDeclaredMethod( "getId" );
 		reader = new JPAOverridenAnnotationReader( method, context );
 		assertNotNull(
@@ -295,7 +298,8 @@
 
 	public void testBasicRelatedAnnotations() throws Exception {
 		XMLContext context = buildContext(
-				"org/hibernate/test/annotations/reflection/metadata-complete.xml" );
+				"org/hibernate/test/annotations/reflection/metadata-complete.xml"
+		);
 		Field field = BusTrip.class.getDeclaredField( "status" );
 		JPAOverridenAnnotationReader reader = new JPAOverridenAnnotationReader( field, context );
 		assertNotNull( reader.getAnnotation( Enumerated.class ) );
@@ -354,7 +358,8 @@
 		assertEquals( "test", reader.getAnnotation( OneToOne.class ).mappedBy() );
 
 		context = buildContext(
-				"org/hibernate/test/annotations/reflection/metadata-complete.xml" );
+				"org/hibernate/test/annotations/reflection/metadata-complete.xml"
+		);
 		field = BusTrip.class.getDeclaredField( "players" );
 		reader = new JPAOverridenAnnotationReader( field, context );
 		assertNotNull( reader.getAnnotation( OneToMany.class ) );

Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/reflection/XMLContextTest.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/reflection/XMLContextTest.java	2009-10-16 13:02:53 UTC (rev 17778)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/reflection/XMLContextTest.java	2009-10-16 13:22:28 UTC (rev 17779)
@@ -23,7 +23,8 @@
 		XMLHelper xmlHelper = new XMLHelper();
 		ClassLoader cl = Thread.currentThread().getContextClassLoader();
 		InputStream is = cl.getResourceAsStream(
-				"org/hibernate/test/annotations/reflection/orm.xml" );
+				"org/hibernate/test/annotations/reflection/orm.xml"
+		);
 		assertNotNull( "ORM.xml not found", is );
 		XMLContext context = new XMLContext();
 		List errors = new ArrayList();

Deleted: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/reflection/metadata-complete.xml
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/reflection/metadata-complete.xml	2009-10-16 13:02:53 UTC (rev 17778)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/reflection/metadata-complete.xml	2009-10-16 13:22:28 UTC (rev 17779)
@@ -1,76 +0,0 @@
-<?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 orm_1_0.xsd"
-                 version="1.0"
-        >
-    <persistence-unit-metadata>
-        <xml-mapping-metadata-complete/>
-        <persistence-unit-defaults>
-            <schema>myschema</schema>
-            <catalog>mycatalog</catalog>
-            <cascade-persist/>
-        </persistence-unit-defaults>
-    </persistence-unit-metadata>
-    <package>org.hibernate.test.annotations.reflection</package>
-    <mapped-superclass class="Organization">
-        <attributes>
-            <basic name="organizationId"/>
-        </attributes>
-    </mapped-superclass>
-    <entity class="Administration">
-        <attributes>
-            <id name="id"/>
-        </attributes>
-    </entity>
-    <entity class="Match">
-    </entity>
-    <entity class="SocialSecurityMoralAccount"/>
-    <entity class="BusTrip" access="FIELD">
-        <attributes>
-            <embedded-id name="id">
-                <attribute-override name="busDriver">
-                    <column name="fld_busdriver"/>
-                </attribute-override>
-            </embedded-id>
-            <basic name="status" optional="false">
-                <enumerated>STRING</enumerated>
-            </basic>
-            <basic name="serial" optional="true">
-                <column name="serialbytes"/>
-                <lob/>
-            </basic>
-            <basic name="terminusTime" fetch="LAZY">
-                <temporal>TIMESTAMP</temporal>
-            </basic>
-            <one-to-many name="players">
-                <map-key name="name"/>
-                <join-column name="driver"/>
-                <join-column name="number"/>
-            </one-to-many>
-            <many-to-many name="roads" target-entity="Administration">
-                <order-by>maxSpeed</order-by>
-                <join-table name="bus_road">
-                    <join-column name="driver"/>
-                    <join-column name="number"/>
-                    <inverse-join-column name="road_id"/>
-                    <unique-constraint>
-                        <column-name>driver</column-name>
-                        <column-name>number</column-name>
-                    </unique-constraint>
-                </join-table>
-            </many-to-many>
-        </attributes>
-    </entity>
-    <embeddable class="BusTripPk" access="FIELD">
-        <attributes>
-            <basic name="busDriver">
-                <column name="busdriver"/>
-            </basic>
-            <basic name="busNumber">
-                <column name="busnumber"/>
-            </basic>
-        </attributes>
-    </embeddable>
-</entity-mappings>
\ No newline at end of file

Deleted: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/reflection/orm.xml
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/reflection/orm.xml	2009-10-16 13:02:53 UTC (rev 17778)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/reflection/orm.xml	2009-10-16 13:22:28 UTC (rev 17779)
@@ -1,117 +0,0 @@
-<?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 orm_1_0.xsd"
-                 version="1.0"
-        >
-    <persistence-unit-metadata>
-        <persistence-unit-defaults>
-            <schema>myschema</schema>
-            <catalog>mycatalog</catalog>
-            <cascade-persist/>
-            <entity-listeners>
-                <entity-listener class="org.hibernate.test.annotations.reflection.OtherLogListener">
-                    <post-update method-name="log"/>
-                </entity-listener>
-            </entity-listeners>
-        </persistence-unit-defaults>
-    </persistence-unit-metadata>
-    <package>org.hibernate.test.annotations.reflection</package>
-    <entity class="Administration">
-        <table name="tbl_admin">
-            <unique-constraint>
-                <column-name>firstname</column-name>
-                <column-name>lastname</column-name>
-            </unique-constraint>
-        </table>
-        <secondary-table name="admin2">
-            <primary-key-join-column name="admin_id" referenced-column-name="id"/>
-            <unique-constraint>
-                <column-name>address</column-name>
-            </unique-constraint>
-        </secondary-table>
-        <sequence-generator name="seqhilo" sequence-name="seqhilo"/>
-        <table-generator name="table" table="tablehilo"/>
-        <entity-listeners>
-            <entity-listener class="LogListener">
-                <pre-persist method-name="log"/>
-                <post-load method-name="noLog"/>
-            </entity-listener>
-        </entity-listeners>
-        <pre-persist method-name="calculate"/>
-        <attributes>
-            <id name="id">
-                <column name="fld_id"/>
-                <generated-value generator="generator" strategy="SEQUENCE"/>
-                <temporal>DATE</temporal>
-                <sequence-generator name="generator" sequence-name="seq"/>
-            </id>
-            <version name="version"/>
-            <one-to-one name="defaultBusTrip" fetch="LAZY" mapped-by="test">
-                <primary-key-join-column name="pk"/>
-                <cascade>
-                    <cascade-all/>
-                    <cascade-persist/>
-                    <cascade-merge/>
-                    <cascade-remove/>
-                    <cascade-refresh/>
-                </cascade>
-            </one-to-one>
-            <transient name="transientField"/>
-        </attributes>
-    </entity>
-    <entity class="Match">
-        <inheritance strategy="JOINED"/>
-        <named-query name="allmatches">
-            <query>select m from Match m</query>
-            <hint name="org.hibernate.timeout" value="200"/>
-        </named-query>
-        <named-query name="matchbyid">
-            <query>select m from Match m where m.id = :id</query>
-            <hint name="org.hibernate.timeout" value="200"/>
-        </named-query>
-        <named-native-query name="allmatches" result-set-mapping="matchrs">
-            <query>select m from Match m</query>
-            <hint name="org.hibernate.timeout" value="200"/>
-        </named-native-query>
-        <named-native-query name="matchbyid" result-set-mapping="matchrs">
-            <query>select m from Match m where m.id = :id</query>
-            <hint name="org.hibernate.timeout" value="200"/>
-        </named-native-query>
-        <sql-result-set-mapping name="matchrs">
-            <entity-result entity-class="org.hibernate.test.annotations.reflection.Match">
-                <field-result name="competitor1Point" column="competitor1Point"/>
-            </entity-result>
-            <column-result name="competitor1Point"/>
-        </sql-result-set-mapping>
-        <exclude-default-listeners/>
-        <exclude-superclass-listeners/>
-        <entity-listeners>
-            <entity-listener class="LogListener">
-                <pre-persist method-name="log"/>
-                <post-load method-name="noLog"/>
-            </entity-listener>
-        </entity-listeners>
-        <attributes>
-            <embedded name="playerASSN"/>
-        </attributes>
-    </entity>
-    <entity class="TennisMatch">
-        <primary-key-join-column name="id"/>
-        <attribute-override name="net">
-            <column name="fld_net"/>
-        </attribute-override>
-        <attribute-override name="ground">
-            <column name="fld_ground" unique="true" scale="2"/>
-        </attribute-override>
-        <association-override name="referer">
-            <join-column name="referer_id" referenced-column-name="id"/>
-        </association-override>
-    </entity>
-    <entity class="SocialSecurityPhysicalAccount">
-        <id-class class="org.hibernate.test.annotations.reflection.SocialSecurityNumber"/>
-        <discriminator-value>Physical</discriminator-value>
-        <discriminator-column length="34"/>
-    </entity>
-</entity-mappings>
\ No newline at end of file

Deleted: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/ejb3/orm.xml
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/ejb3/orm.xml	2009-10-16 13:02:53 UTC (rev 17778)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/ejb3/orm.xml	2009-10-16 13:22:28 UTC (rev 17779)
@@ -1,56 +0,0 @@
-<?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"
-                 version="1.0"
-        >
-    <!-- no grammar specified should pass -->
-    <persistence-unit-metadata>
-        <persistence-unit-defaults>
-            <cascade-persist/>
-        </persistence-unit-defaults>
-    </persistence-unit-metadata>
-    <package>org.hibernate.test.annotations.xml.ejb3</package>
-    <table-generator name="generator" table="table_id"/>
-    <named-query name="manufacturer.findAll">
-        <query>select m from Manufacturer m</query>
-    </named-query>
-    <entity class="Model" access="PROPERTY" name="ModelZ" metadata-complete="true">
-        <table name="ModelZ">
-        </table>
-        <inheritance strategy="JOINED"/>
-        <attributes>
-            <id name="id">
-                <column name="fld_id"/>
-                <generated-value strategy="TABLE" generator="generator"/>
-            </id>
-            <basic name="unknownProperty"/>
-            <many-to-one name="manufacturer" fetch="LAZY">
-                <join-column name="manufacturer_pk"/>
-            </many-to-one>
-        </attributes>
-    </entity>
-    <entity class="CarModel" metadata-complete="true">
-        <primary-key-join-column name="model_id"/>
-        <inheritance strategy="JOINED"/>
-        <named-query name="allModelsPerManufacturer">
-            <query>from ModelZ m where m.manufacturer = :manufacturer</query>
-            <hint name="org.hibernate.timeout" value="200"/>
-        </named-query>
-        <exclude-default-listeners/>
-        <exclude-superclass-listeners/>
-        <attributes>
-            <basic name="year" optional="false">
-                <temporal>DATE</temporal>
-            </basic>
-        </attributes>
-    </entity>
-    <entity class="Manufacturer">
-        <attributes>
-            <id name="id">
-                <generated-value strategy="AUTO"/>
-            </id>
-            <one-to-many name="models" mapped-by="manufacturer"/>
-        </attributes>
-    </entity>
-</entity-mappings>
\ No newline at end of file

Deleted: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/ejb3/orm2.xml
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/ejb3/orm2.xml	2009-10-16 13:02:53 UTC (rev 17778)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/ejb3/orm2.xml	2009-10-16 13:22:28 UTC (rev 17779)
@@ -1,17 +0,0 @@
-<?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 orm_1_0.xsd"
-                 version="1.0"
-        >
-    <package>org.hibernate.test.annotations.xml.ejb3</package>
-    <entity class="Light" access="FIELD" metadata-complete="true">
-        <attributes>
-            <id name="name">
-                <column name="fld_id"/>
-            </id>
-            <basic name="power"></basic>
-        </attributes>
-    </entity>
-</entity-mappings>
\ No newline at end of file

Deleted: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/ejb3/orm3.xml
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/ejb3/orm3.xml	2009-10-16 13:02:53 UTC (rev 17778)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/ejb3/orm3.xml	2009-10-16 13:22:28 UTC (rev 17779)
@@ -1,17 +0,0 @@
-<?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 orm_1_0.xsd"
-                 version="1.0"
-        >
-    <package>org.hibernate.test.annotations.xml.ejb3</package>
-    <entity class="Lighter" access="FIELD" metadata-complete="true">
-        <attributes>
-            <id name="name">
-                <column name="fld_id"/>
-            </id>
-            <basic name="power"></basic>
-        </attributes>
-    </entity>
-</entity-mappings>
\ No newline at end of file

Deleted: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/A.hbm.xml
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/A.hbm.xml	2009-10-16 13:02:53 UTC (rev 17778)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/A.hbm.xml	2009-10-16 13:22:28 UTC (rev 17779)
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-        "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-<!-- Generated Nov 9, 2006 6:27:53 PM by Hibernate Tools 3.2.0.beta7 -->
-<hibernate-mapping>
-    <class name="org.hibernate.test.annotations.xml.hbm.AImpl" table="A"
-           proxy="org.hibernate.test.annotations.xml.hbm.A">
-        <id name="AId" column="aID" type="java.lang.Integer">
-            <generator class="identity"/>
-        </id>
-    </class>
-</hibernate-mapping>
\ No newline at end of file

Deleted: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/B.hbm.xml
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/B.hbm.xml	2009-10-16 13:02:53 UTC (rev 17778)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/B.hbm.xml	2009-10-16 13:22:28 UTC (rev 17779)
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-        "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-<!-- Generated Nov 9, 2006 6:27:53 PM by Hibernate Tools 3.2.0.beta7 -->
-<hibernate-mapping>
-    <joined-subclass name="org.hibernate.test.annotations.xml.hbm.BImpl" table="B"
-                     proxy="org.hibernate.test.annotations.xml.hbm.B"
-                     extends="org.hibernate.test.annotations.xml.hbm.AImpl">
-        <key column="aID"/>
-        <property name="BId" column="bID" type="java.lang.Integer"
-                  not-null="true"/>
-    </joined-subclass>
-</hibernate-mapping>
\ No newline at end of file

Deleted: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/CloudType.hbm.xml
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/CloudType.hbm.xml	2009-10-16 13:02:53 UTC (rev 17778)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/CloudType.hbm.xml	2009-10-16 13:22:28 UTC (rev 17779)
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
-        "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-        "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping package="org.hibernate.test.annotations.xml.hbm">
-
-    <class name="CloudType">
-        <id name="id">
-            <generator class="native"/>
-        </id>
-        <property name="name"/>
-    </class>
-
-</hibernate-mapping>
\ No newline at end of file

Deleted: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/Government.hbm.xml
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/Government.hbm.xml	2009-10-16 13:02:53 UTC (rev 17778)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/Government.hbm.xml	2009-10-16 13:22:28 UTC (rev 17779)
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
-        "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-        "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping package="org.hibernate.test.annotations.xml.hbm">
-
-    <class name="Government">
-        <id name="id">
-            <generator class="native"/>
-        </id>
-        <property name="name"/>
-        <many-to-one name="primeMinister" column="primeMinister_id"/>
-    </class>
-
-</hibernate-mapping>
\ No newline at end of file

Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java	2009-10-16 13:02:53 UTC (rev 17778)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java	2009-10-16 13:22:28 UTC (rev 17779)
@@ -8,6 +8,7 @@
  * @author Emmanuel Bernard
  */
 public class HbmWithIdentityTest extends TestCase {
+
 	public void testManyToOneAndInterface() throws Exception {
 		Session s = openSession();
 		s.getTransaction().begin();
@@ -21,16 +22,14 @@
 		s.getTransaction().rollback();
 		s.close();
 	}
-	
+
 	@Override
 	protected boolean runForCurrentDialect() {
 		return super.runForCurrentDialect() && getDialect().supportsIdentityColumns();
 	}
 
-
-
 	protected Class[] getMappings() {
-		return new Class[]{
+		return new Class[] {
 				Sky.class,
 				ZImpl.class
 
@@ -39,9 +38,10 @@
 
 	@Override
 	protected String[] getXmlFiles() {
-		return new String[]{
+		return new String[] {
 				"org/hibernate/test/annotations/xml/hbm/A.hbm.xml",
-				"org/hibernate/test/annotations/xml/hbm/B.hbm.xml"
+				"org/hibernate/test/annotations/xml/hbm/B.hbm.xml",
+				"org/hibernate/test/annotations/xml/hbm/CloudType.hbm.xml"
 		};
 	}
 }

Copied: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/Boat.hbm.xml (from rev 17773, core/trunk/annotations/src/test/java/org/hibernate/test/annotations/Boat.hbm.xml)
===================================================================
--- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/Boat.hbm.xml	                        (rev 0)
+++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/Boat.hbm.xml	2009-10-16 13:22:28 UTC (rev 17779)
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+        "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+        "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<!--
+
+  Used to demonstrate the declarative configuration
+  of both hbm files and annotated classes
+  See hibernate.cfg.xml and ConfigurationTest
+
+-->
+
+<hibernate-mapping package="org.hibernate.test.annotations">
+
+    <class name="Boat" table="BoatInXml">
+
+        <id name="id">
+            <generator class="native"/>
+        </id>
+
+        <property name="size" column="boat_size"/>
+
+    </class>
+
+</hibernate-mapping>
\ No newline at end of file


Property changes on: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/Boat.hbm.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/Ferry.hbm.xml (from rev 17773, core/trunk/annotations/src/test/java/org/hibernate/test/annotations/Ferry.hbm.xml)
===================================================================
--- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/Ferry.hbm.xml	                        (rev 0)
+++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/Ferry.hbm.xml	2009-10-16 13:22:28 UTC (rev 17779)
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+        "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+        "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<!--
+
+  Used to test the interaction of hbm files with a subclass
+  extends attribute and annotated classes.
+
+  See ConfigurationTest
+
+-->
+
+<hibernate-mapping package="org.hibernate.test.annotations">
+
+    <joined-subclass name="Ferry" table="FerryJoined" extends="org.hibernate.test.annotations.Boat">
+        <key column="id"/>
+        <property name="sea"/>
+
+    </joined-subclass>
+
+</hibernate-mapping>
\ No newline at end of file


Property changes on: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/Ferry.hbm.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/bytecode/Hammer.hbm.xml (from rev 17773, core/trunk/annotations/src/test/java/org/hibernate/test/annotations/bytecode/Hammer.hbm.xml)
===================================================================
--- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/bytecode/Hammer.hbm.xml	                        (rev 0)
+++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/bytecode/Hammer.hbm.xml	2009-10-16 13:22:28 UTC (rev 17779)
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+        "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+        "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping package="org.hibernate.test.annotations.bytecode">
+    <class name="Hammer">
+        <id name="id" type="java.lang.Long">
+            <generator class="increment"/>
+        </id>
+    </class>
+</hibernate-mapping>
\ No newline at end of file

Copied: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/configuration/orm.xml (from rev 17773, core/trunk/annotations/src/test/java/org/hibernate/test/annotations/configuration/orm.xml)
===================================================================
--- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/configuration/orm.xml	                        (rev 0)
+++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/configuration/orm.xml	2009-10-16 13:22:28 UTC (rev 17779)
@@ -0,0 +1,7 @@
+<?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 orm_1_0.xsd"
+    version="1.0">
+</entity-mappings>

Copied: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/duplicatedgenerator/orm.xml (from rev 17773, core/trunk/annotations/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/orm.xml)
===================================================================
--- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/duplicatedgenerator/orm.xml	                        (rev 0)
+++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/duplicatedgenerator/orm.xml	2009-10-16 13:22:28 UTC (rev 17779)
@@ -0,0 +1,10 @@
+<?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"
+                 version="1.0"
+        >
+    <table-generator name="EMP_GEN" table="GENERATOR_TABLE"
+                     pk-column-name="pkey" pk-column-value="EMP"
+                     value-column-name="hi" allocation-size="20"/>
+</entity-mappings>
\ No newline at end of file

Copied: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/hibernate.cfg.xml (from rev 17773, core/trunk/annotations/src/test/java/org/hibernate/test/annotations/hibernate.cfg.xml)
===================================================================
--- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/hibernate.cfg.xml	                        (rev 0)
+++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/hibernate.cfg.xml	2009-10-16 13:22:28 UTC (rev 17779)
@@ -0,0 +1,11 @@
+<!DOCTYPE hibernate-configuration PUBLIC
+        "-//Hibernate/Hibernate Configuration DTD 3.0//EN"
+        "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+
+<hibernate-configuration>
+    <session-factory>
+        <mapping resource="org/hibernate/test/annotations/Boat.hbm.xml"/>
+        <mapping package="org.hibernate.test.annotations"/>
+        <mapping class="org.hibernate.test.annotations.Plane"/>
+    </session-factory>
+</hibernate-configuration>
\ No newline at end of file


Property changes on: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/hibernate.cfg.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/inheritance/joined/Asset.hbm.xml (from rev 17773, core/trunk/annotations/src/test/java/org/hibernate/test/annotations/inheritance/joined/Asset.hbm.xml)
===================================================================
--- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/inheritance/joined/Asset.hbm.xml	                        (rev 0)
+++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/inheritance/joined/Asset.hbm.xml	2009-10-16 13:22:28 UTC (rev 17779)
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+        "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+        "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping package="org.hibernate.test.annotations.inheritance.joined">
+
+    <class name="Parent">
+        <id name="id">
+            <generator class="native"/>
+        </id>
+        <set name="financialAssets" fetch="join" cascade="refresh" inverse="true">
+            <key column="PARENT_ID"/>
+            <one-to-many class="FinancialAsset"/>
+        </set>
+        <set name="propertyAssets" fetch="join" cascade="refresh" inverse="true">
+            <key column="PARENT_ID"/>
+            <one-to-many class="PropertyAsset"/>
+        </set>
+    </class>
+    <class name="Asset">
+        <id name="id">
+            <generator class="native"/>
+        </id>
+        <many-to-one name="parent" column="PARENT_ID" property-ref="parent"/>
+        <joined-subclass name="FinancialAsset">
+            <key column="ID"/>
+            <property name="price"/>
+        </joined-subclass>
+        <joined-subclass name="PropertyAsset">
+            <key column="ID"/>
+            <property name="price"/>
+        </joined-subclass>
+    </class>
+
+</hibernate-mapping>
\ No newline at end of file

Copied: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/loader/Loader.hbm.xml (from rev 17773, core/trunk/annotations/src/test/java/org/hibernate/test/annotations/loader/Loader.hbm.xml)
===================================================================
--- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/loader/Loader.hbm.xml	                        (rev 0)
+++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/loader/Loader.hbm.xml	2009-10-16 13:22:28 UTC (rev 17779)
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+        "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+        "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<!--
+
+  Used to demonstrate the declarative configuration
+  of both hbm files and annotated classes
+  See hibernate.cfg.xml and ConfigurationTest
+
+-->
+
+<hibernate-mapping package="org.hibernate.test.annotations.loader">
+
+    <sql-query name="loadByTeam">
+        <load-collection alias="p" role="Team.players"/>
+        select {p.*} from Player p where p.team_id = ?
+    </sql-query>
+
+</hibernate-mapping>
\ No newline at end of file

Copied: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/orm.xml (from rev 17773, core/trunk/annotations/src/test/java/org/hibernate/test/annotations/orm.xml)
===================================================================
--- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/orm.xml	                        (rev 0)
+++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/orm.xml	2009-10-16 13:22:28 UTC (rev 17779)
@@ -0,0 +1,11 @@
+<?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"
+                 version="1.0"
+        >
+    <sequence-generator name="SEQ_GEN" sequence-name="my_sequence"/>
+    <table-generator name="EMP_GEN" table="GENERATOR_TABLE"
+                     pk-column-name="pkey" pk-column-value="EMP"
+                     value-column-name="hi" allocation-size="20"/>
+</entity-mappings>
\ No newline at end of file

Copied: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/query/orm.xml (from rev 17773, core/trunk/annotations/src/test/java/org/hibernate/test/annotations/query/orm.xml)
===================================================================
--- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/query/orm.xml	                        (rev 0)
+++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/query/orm.xml	2009-10-16 13:22:28 UTC (rev 17779)
@@ -0,0 +1,24 @@
+<?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"
+                 version="1.0"
+        >
+    <named-query name="plane.getAll">
+        <query>select p from Plane p</query>
+    </named-query>
+    <named-native-query name="night.getAll.bySQL" result-set-mapping="sqlmapping">
+        <query>select id, night_duration, night_date as dte, area_id from Night where night_duration > ?</query>
+    </named-native-query>
+    <named-native-query name="getAreaByNative" result-class="org.hibernate.test.annotations.query.Area">
+        <query>select * from tbl_area</query>
+    </named-native-query>
+    <sql-result-set-mapping name="sqlmapping">
+        <entity-result entity-class="org.hibernate.test.annotations.query.Night">
+            <field-result name="id" column="id"/>
+            <field-result name="duration" column="night_duration"/>
+            <field-result name="date" column="dte"/>
+            <field-result name="area" column="area_id"/>
+        </entity-result>
+    </sql-result-set-mapping>
+</entity-mappings>
\ No newline at end of file

Copied: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/reflection/metadata-complete.xml (from rev 17773, core/trunk/annotations/src/test/java/org/hibernate/test/annotations/reflection/metadata-complete.xml)
===================================================================
--- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/reflection/metadata-complete.xml	                        (rev 0)
+++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/reflection/metadata-complete.xml	2009-10-16 13:22:28 UTC (rev 17779)
@@ -0,0 +1,76 @@
+<?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 orm_1_0.xsd"
+                 version="1.0"
+        >
+    <persistence-unit-metadata>
+        <xml-mapping-metadata-complete/>
+        <persistence-unit-defaults>
+            <schema>myschema</schema>
+            <catalog>mycatalog</catalog>
+            <cascade-persist/>
+        </persistence-unit-defaults>
+    </persistence-unit-metadata>
+    <package>org.hibernate.test.annotations.reflection</package>
+    <mapped-superclass class="Organization">
+        <attributes>
+            <basic name="organizationId"/>
+        </attributes>
+    </mapped-superclass>
+    <entity class="Administration">
+        <attributes>
+            <id name="id"/>
+        </attributes>
+    </entity>
+    <entity class="Match">
+    </entity>
+    <entity class="SocialSecurityMoralAccount"/>
+    <entity class="BusTrip" access="FIELD">
+        <attributes>
+            <embedded-id name="id">
+                <attribute-override name="busDriver">
+                    <column name="fld_busdriver"/>
+                </attribute-override>
+            </embedded-id>
+            <basic name="status" optional="false">
+                <enumerated>STRING</enumerated>
+            </basic>
+            <basic name="serial" optional="true">
+                <column name="serialbytes"/>
+                <lob/>
+            </basic>
+            <basic name="terminusTime" fetch="LAZY">
+                <temporal>TIMESTAMP</temporal>
+            </basic>
+            <one-to-many name="players">
+                <map-key name="name"/>
+                <join-column name="driver"/>
+                <join-column name="number"/>
+            </one-to-many>
+            <many-to-many name="roads" target-entity="Administration">
+                <order-by>maxSpeed</order-by>
+                <join-table name="bus_road">
+                    <join-column name="driver"/>
+                    <join-column name="number"/>
+                    <inverse-join-column name="road_id"/>
+                    <unique-constraint>
+                        <column-name>driver</column-name>
+                        <column-name>number</column-name>
+                    </unique-constraint>
+                </join-table>
+            </many-to-many>
+        </attributes>
+    </entity>
+    <embeddable class="BusTripPk" access="FIELD">
+        <attributes>
+            <basic name="busDriver">
+                <column name="busdriver"/>
+            </basic>
+            <basic name="busNumber">
+                <column name="busnumber"/>
+            </basic>
+        </attributes>
+    </embeddable>
+</entity-mappings>
\ No newline at end of file

Copied: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/reflection/orm.xml (from rev 17773, core/trunk/annotations/src/test/java/org/hibernate/test/annotations/reflection/orm.xml)
===================================================================
--- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/reflection/orm.xml	                        (rev 0)
+++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/reflection/orm.xml	2009-10-16 13:22:28 UTC (rev 17779)
@@ -0,0 +1,117 @@
+<?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 orm_1_0.xsd"
+                 version="1.0"
+        >
+    <persistence-unit-metadata>
+        <persistence-unit-defaults>
+            <schema>myschema</schema>
+            <catalog>mycatalog</catalog>
+            <cascade-persist/>
+            <entity-listeners>
+                <entity-listener class="org.hibernate.test.annotations.reflection.OtherLogListener">
+                    <post-update method-name="log"/>
+                </entity-listener>
+            </entity-listeners>
+        </persistence-unit-defaults>
+    </persistence-unit-metadata>
+    <package>org.hibernate.test.annotations.reflection</package>
+    <entity class="Administration">
+        <table name="tbl_admin">
+            <unique-constraint>
+                <column-name>firstname</column-name>
+                <column-name>lastname</column-name>
+            </unique-constraint>
+        </table>
+        <secondary-table name="admin2">
+            <primary-key-join-column name="admin_id" referenced-column-name="id"/>
+            <unique-constraint>
+                <column-name>address</column-name>
+            </unique-constraint>
+        </secondary-table>
+        <sequence-generator name="seqhilo" sequence-name="seqhilo"/>
+        <table-generator name="table" table="tablehilo"/>
+        <entity-listeners>
+            <entity-listener class="LogListener">
+                <pre-persist method-name="log"/>
+                <post-load method-name="noLog"/>
+            </entity-listener>
+        </entity-listeners>
+        <pre-persist method-name="calculate"/>
+        <attributes>
+            <id name="id">
+                <column name="fld_id"/>
+                <generated-value generator="generator" strategy="SEQUENCE"/>
+                <temporal>DATE</temporal>
+                <sequence-generator name="generator" sequence-name="seq"/>
+            </id>
+            <version name="version"/>
+            <one-to-one name="defaultBusTrip" fetch="LAZY" mapped-by="test">
+                <primary-key-join-column name="pk"/>
+                <cascade>
+                    <cascade-all/>
+                    <cascade-persist/>
+                    <cascade-merge/>
+                    <cascade-remove/>
+                    <cascade-refresh/>
+                </cascade>
+            </one-to-one>
+            <transient name="transientField"/>
+        </attributes>
+    </entity>
+    <entity class="Match">
+        <inheritance strategy="JOINED"/>
+        <named-query name="allmatches">
+            <query>select m from Match m</query>
+            <hint name="org.hibernate.timeout" value="200"/>
+        </named-query>
+        <named-query name="matchbyid">
+            <query>select m from Match m where m.id = :id</query>
+            <hint name="org.hibernate.timeout" value="200"/>
+        </named-query>
+        <named-native-query name="allmatches" result-set-mapping="matchrs">
+            <query>select m from Match m</query>
+            <hint name="org.hibernate.timeout" value="200"/>
+        </named-native-query>
+        <named-native-query name="matchbyid" result-set-mapping="matchrs">
+            <query>select m from Match m where m.id = :id</query>
+            <hint name="org.hibernate.timeout" value="200"/>
+        </named-native-query>
+        <sql-result-set-mapping name="matchrs">
+            <entity-result entity-class="org.hibernate.test.annotations.reflection.Match">
+                <field-result name="competitor1Point" column="competitor1Point"/>
+            </entity-result>
+            <column-result name="competitor1Point"/>
+        </sql-result-set-mapping>
+        <exclude-default-listeners/>
+        <exclude-superclass-listeners/>
+        <entity-listeners>
+            <entity-listener class="LogListener">
+                <pre-persist method-name="log"/>
+                <post-load method-name="noLog"/>
+            </entity-listener>
+        </entity-listeners>
+        <attributes>
+            <embedded name="playerASSN"/>
+        </attributes>
+    </entity>
+    <entity class="TennisMatch">
+        <primary-key-join-column name="id"/>
+        <attribute-override name="net">
+            <column name="fld_net"/>
+        </attribute-override>
+        <attribute-override name="ground">
+            <column name="fld_ground" unique="true" scale="2"/>
+        </attribute-override>
+        <association-override name="referer">
+            <join-column name="referer_id" referenced-column-name="id"/>
+        </association-override>
+    </entity>
+    <entity class="SocialSecurityPhysicalAccount">
+        <id-class class="org.hibernate.test.annotations.reflection.SocialSecurityNumber"/>
+        <discriminator-value>Physical</discriminator-value>
+        <discriminator-column length="34"/>
+    </entity>
+</entity-mappings>
\ No newline at end of file

Copied: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm.xml (from rev 17773, core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/ejb3/orm.xml)
===================================================================
--- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm.xml	                        (rev 0)
+++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm.xml	2009-10-16 13:22:28 UTC (rev 17779)
@@ -0,0 +1,56 @@
+<?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"
+                 version="1.0"
+        >
+    <!-- no grammar specified should pass -->
+    <persistence-unit-metadata>
+        <persistence-unit-defaults>
+            <cascade-persist/>
+        </persistence-unit-defaults>
+    </persistence-unit-metadata>
+    <package>org.hibernate.test.annotations.xml.ejb3</package>
+    <table-generator name="generator" table="table_id"/>
+    <named-query name="manufacturer.findAll">
+        <query>select m from Manufacturer m</query>
+    </named-query>
+    <entity class="Model" access="PROPERTY" name="ModelZ" metadata-complete="true">
+        <table name="ModelZ">
+        </table>
+        <inheritance strategy="JOINED"/>
+        <attributes>
+            <id name="id">
+                <column name="fld_id"/>
+                <generated-value strategy="TABLE" generator="generator"/>
+            </id>
+            <basic name="unknownProperty"/>
+            <many-to-one name="manufacturer" fetch="LAZY">
+                <join-column name="manufacturer_pk"/>
+            </many-to-one>
+        </attributes>
+    </entity>
+    <entity class="CarModel" metadata-complete="true">
+        <primary-key-join-column name="model_id"/>
+        <inheritance strategy="JOINED"/>
+        <named-query name="allModelsPerManufacturer">
+            <query>from ModelZ m where m.manufacturer = :manufacturer</query>
+            <hint name="org.hibernate.timeout" value="200"/>
+        </named-query>
+        <exclude-default-listeners/>
+        <exclude-superclass-listeners/>
+        <attributes>
+            <basic name="year" optional="false">
+                <temporal>DATE</temporal>
+            </basic>
+        </attributes>
+    </entity>
+    <entity class="Manufacturer">
+        <attributes>
+            <id name="id">
+                <generated-value strategy="AUTO"/>
+            </id>
+            <one-to-many name="models" mapped-by="manufacturer"/>
+        </attributes>
+    </entity>
+</entity-mappings>
\ No newline at end of file

Copied: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm2.xml (from rev 17773, core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/ejb3/orm2.xml)
===================================================================
--- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm2.xml	                        (rev 0)
+++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm2.xml	2009-10-16 13:22:28 UTC (rev 17779)
@@ -0,0 +1,17 @@
+<?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 orm_1_0.xsd"
+                 version="1.0"
+        >
+    <package>org.hibernate.test.annotations.xml.ejb3</package>
+    <entity class="Light" access="FIELD" metadata-complete="true">
+        <attributes>
+            <id name="name">
+                <column name="fld_id"/>
+            </id>
+            <basic name="power"></basic>
+        </attributes>
+    </entity>
+</entity-mappings>
\ No newline at end of file

Copied: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm3.xml (from rev 17773, core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/ejb3/orm3.xml)
===================================================================
--- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm3.xml	                        (rev 0)
+++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm3.xml	2009-10-16 13:22:28 UTC (rev 17779)
@@ -0,0 +1,17 @@
+<?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 orm_1_0.xsd"
+                 version="1.0"
+        >
+    <package>org.hibernate.test.annotations.xml.ejb3</package>
+    <entity class="Lighter" access="FIELD" metadata-complete="true">
+        <attributes>
+            <id name="name">
+                <column name="fld_id"/>
+            </id>
+            <basic name="power"></basic>
+        </attributes>
+    </entity>
+</entity-mappings>
\ No newline at end of file

Copied: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/hbm/A.hbm.xml (from rev 17773, core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/A.hbm.xml)
===================================================================
--- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/hbm/A.hbm.xml	                        (rev 0)
+++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/hbm/A.hbm.xml	2009-10-16 13:22:28 UTC (rev 17779)
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+        "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<!-- Generated Nov 9, 2006 6:27:53 PM by Hibernate Tools 3.2.0.beta7 -->
+<hibernate-mapping>
+    <class name="org.hibernate.test.annotations.xml.hbm.AImpl" table="A"
+           proxy="org.hibernate.test.annotations.xml.hbm.A">
+        <id name="AId" column="aID" type="java.lang.Integer">
+            <generator class="identity"/>
+        </id>
+    </class>
+</hibernate-mapping>
\ No newline at end of file

Copied: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/hbm/B.hbm.xml (from rev 17773, core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/B.hbm.xml)
===================================================================
--- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/hbm/B.hbm.xml	                        (rev 0)
+++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/hbm/B.hbm.xml	2009-10-16 13:22:28 UTC (rev 17779)
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+        "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<!-- Generated Nov 9, 2006 6:27:53 PM by Hibernate Tools 3.2.0.beta7 -->
+<hibernate-mapping>
+    <joined-subclass name="org.hibernate.test.annotations.xml.hbm.BImpl" table="B"
+                     proxy="org.hibernate.test.annotations.xml.hbm.B"
+                     extends="org.hibernate.test.annotations.xml.hbm.AImpl">
+        <key column="aID"/>
+        <property name="BId" column="bID" type="java.lang.Integer"
+                  not-null="true"/>
+    </joined-subclass>
+</hibernate-mapping>
\ No newline at end of file

Copied: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/hbm/CloudType.hbm.xml (from rev 17773, core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/CloudType.hbm.xml)
===================================================================
--- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/hbm/CloudType.hbm.xml	                        (rev 0)
+++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/hbm/CloudType.hbm.xml	2009-10-16 13:22:28 UTC (rev 17779)
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+        "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+        "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping package="org.hibernate.test.annotations.xml.hbm">
+
+    <class name="CloudType">
+        <id name="id">
+            <generator class="native"/>
+        </id>
+        <property name="name"/>
+    </class>
+
+</hibernate-mapping>
\ No newline at end of file

Copied: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/hbm/Government.hbm.xml (from rev 17773, core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/Government.hbm.xml)
===================================================================
--- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/hbm/Government.hbm.xml	                        (rev 0)
+++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/hbm/Government.hbm.xml	2009-10-16 13:22:28 UTC (rev 17779)
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+        "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+        "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping package="org.hibernate.test.annotations.xml.hbm">
+
+    <class name="Government">
+        <id name="id">
+            <generator class="native"/>
+        </id>
+        <property name="name"/>
+        <many-to-one name="primeMinister" column="primeMinister_id"/>
+    </class>
+
+</hibernate-mapping>
\ No newline at end of file


Property changes on: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/hbm/Government.hbm.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native



More information about the hibernate-commits mailing list