[hibernate-commits] Hibernate SVN: r18869 - in core/trunk/annotations/src/test: java/org/hibernate/test/annotations/onetomany and 3 other directories.
hibernate-commits at lists.jboss.org
hibernate-commits at lists.jboss.org
Wed Feb 24 12:11:06 EST 2010
Author: hardy.ferentschik
Date: 2010-02-24 12:11:05 -0500 (Wed, 24 Feb 2010)
New Revision: 18869
Added:
core/trunk/annotations/src/test/java/org/hibernate/test/annotations/onetomany/Manufacturer.java
core/trunk/annotations/src/test/java/org/hibernate/test/annotations/onetomany/Model.java
core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/onetomany/
core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/onetomany/orm.xml
Modified:
core/trunk/annotations/src/test/java/org/hibernate/test/annotations/loader/Team.java
core/trunk/annotations/src/test/java/org/hibernate/test/annotations/onetomany/OneToManyTest.java
core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/access/xml/Boy.xml
core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/access/xml/Cook.xml
core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/access/xml/Crew.xml
core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/access/xml/RentalCar.xml
core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist.xml
core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist2.xml
core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist3.xml
core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist4.xml
Log:
HHH-4605 - Add support for @OneToMany @JoinColumn in XML
Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/loader/Team.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/loader/Team.java 2010-02-24 09:22:43 UTC (rev 18868)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/loader/Team.java 2010-02-24 17:11:05 UTC (rev 18869)
@@ -2,7 +2,6 @@
import java.util.HashSet;
import java.util.Set;
-
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
@@ -12,18 +11,14 @@
import org.hibernate.annotations.Fetch;
import org.hibernate.annotations.FetchMode;
import org.hibernate.annotations.Loader;
-import org.hibernate.annotations.NamedNativeQueries;
-import org.hibernate.annotations.NamedNativeQuery;
-import javax.persistence.NamedQuery;
-
@Entity
public class Team {
private Long id;
private Set<Player> players = new HashSet<Player>();
-
- @Id
- @GeneratedValue
+
+ @Id
+ @GeneratedValue
public Long getId() {
return id;
}
@@ -31,7 +26,7 @@
public void setId(Long id) {
this.id = id;
}
-
+
@OneToMany(targetEntity = Player.class, mappedBy = "team", fetch = FetchType.EAGER)
@Fetch(FetchMode.SELECT)
@Loader(namedQuery = "loadByTeam")
Copied: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/onetomany/Manufacturer.java (from rev 18855, core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/ejb3/Manufacturer.java)
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/onetomany/Manufacturer.java (rev 0)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/onetomany/Manufacturer.java 2010-02-24 17:11:05 UTC (rev 18869)
@@ -0,0 +1,29 @@
+//$Id$
+package org.hibernate.test.annotations.onetomany;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * @author Emmanuel Bernard
+ */
+public class Manufacturer {
+ private Integer id;
+ private Set<Model> models = new HashSet<Model>();
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Set<Model> getModels() {
+ return models;
+ }
+
+ public void setModels(Set<Model> models) {
+ this.models = models;
+ }
+}
\ No newline at end of file
Copied: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/onetomany/Model.java (from rev 18855, core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/ejb3/Model.java)
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/onetomany/Model.java (rev 0)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/onetomany/Model.java 2010-02-24 17:11:05 UTC (rev 18869)
@@ -0,0 +1,36 @@
+//$Id$
+package org.hibernate.test.annotations.onetomany;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+
+/**
+ * @author Emmanuel Bernard
+ */
+ at Entity
+public class Model {
+ @Id
+ @GeneratedValue
+ private Integer id;
+
+ @ManyToOne
+ private Manufacturer manufacturer;
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Manufacturer getManufacturer() {
+ return manufacturer;
+ }
+
+ public void setManufacturer(Manufacturer manufacturer) {
+ this.manufacturer = manufacturer;
+ }
+}
\ No newline at end of file
Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/onetomany/OneToManyTest.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/onetomany/OneToManyTest.java 2010-02-24 09:22:43 UTC (rev 18868)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/onetomany/OneToManyTest.java 2010-02-24 17:11:05 UTC (rev 18869)
@@ -4,6 +4,7 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
+import java.util.Iterator;
import java.util.List;
import java.util.SortedSet;
import java.util.TreeSet;
@@ -12,6 +13,10 @@
import org.hibernate.HibernateException;
import org.hibernate.Session;
import org.hibernate.Transaction;
+import org.hibernate.junit.FailureExpected;
+import org.hibernate.mapping.Column;
+import org.hibernate.mapping.PersistentClass;
+import org.hibernate.mapping.Table;
import org.hibernate.test.annotations.Customer;
import org.hibernate.test.annotations.Discount;
import org.hibernate.test.annotations.Passport;
@@ -20,9 +25,10 @@
import org.hibernate.test.annotations.TicketComparator;
/**
- * Test various case of a one to many relationship
+ * Test various case of a one to many relationship.
*
* @author Emmanuel Bernard
+ * @author Hardy Ferentschik
*/
@SuppressWarnings("unchecked")
public class OneToManyTest extends TestCase {
@@ -77,12 +83,12 @@
s.clear();
//testing @OrderBy with explicit values including Formula
- paris = (City) s.get( City.class, paris.getId() );
+ paris = ( City ) s.get( City.class, paris.getId() );
assertEquals( 3, paris.getStreets().size() );
assertEquals( chmpsElysees.getStreetName(), paris.getStreets().get( 0 ).getStreetName() );
List<Street> mainStreets = paris.getMainStreets();
assertEquals( 2, mainStreets.size() );
- Integer previousId = new Integer( -1 );
+ Integer previousId = -1;
for ( Street street : mainStreets ) {
assertTrue( previousId < street.getId() );
previousId = street.getId();
@@ -115,7 +121,7 @@
s = openSession();
tx = s.beginTransaction();
- trainer = (Trainer) s.get( Trainer.class, trainer.getId() );
+ trainer = ( Trainer ) s.get( Trainer.class, trainer.getId() );
assertNotNull( trainer );
assertNotNull( trainer.getTrainedTigers() );
assertEquals( 2, trainer.getTrainedTigers().size() );
@@ -133,7 +139,7 @@
tx.commit();
fail( "A one to many should not allow several trainer per Tiger" );
}
- catch (HibernateException ce) {
+ catch ( HibernateException ce ) {
tx.rollback();
//success
}
@@ -162,7 +168,7 @@
s = openSession();
tx = s.beginTransaction();
- trainer = (Trainer) s.get( Trainer.class, trainer.getId() );
+ trainer = ( Trainer ) s.get( Trainer.class, trainer.getId() );
assertNotNull( trainer );
assertNotNull( trainer.getTrainedMonkeys() );
assertEquals( 2, trainer.getTrainedMonkeys().size() );
@@ -189,7 +195,7 @@
s = openSession();
tx = s.beginTransaction();
- t = (Troop) s.get( Troop.class, t.getId() );
+ t = ( Troop ) s.get( Troop.class, t.getId() );
assertNotNull( t.getSoldiers() );
assertFalse( Hibernate.isInitialized( t.getSoldiers() ) );
assertEquals( 2, t.getSoldiers().size() );
@@ -199,7 +205,7 @@
s = openSession();
tx = s.beginTransaction();
- t = (Troop) s.createQuery( "from " + Troop.class.getName() + " as t where t.id = :id" )
+ t = ( Troop ) s.createQuery( "from " + Troop.class.getName() + " as t where t.id = :id" )
.setParameter( "id", t.getId() ).uniqueResult();
assertFalse( Hibernate.isInitialized( t.getSoldiers() ) );
tx.commit();
@@ -207,14 +213,14 @@
s = openSession();
tx = s.beginTransaction();
- rambo = (Soldier) s.get( Soldier.class, rambo.getId() );
+ rambo = ( Soldier ) s.get( Soldier.class, rambo.getId() );
assertTrue( Hibernate.isInitialized( rambo.getTroop() ) );
tx.commit();
s.close();
s = openSession();
tx = s.beginTransaction();
- rambo = (Soldier) s.createQuery( "from " + Soldier.class.getName() + " as s where s.id = :rid" )
+ rambo = ( Soldier ) s.createQuery( "from " + Soldier.class.getName() + " as s where s.id = :rid" )
.setParameter( "rid", rambo.getId() ).uniqueResult();
assertTrue( "fetching strategy used when we do query", Hibernate.isInitialized( rambo.getTroop() ) );
tx.commit();
@@ -236,11 +242,10 @@
s.close();
s = openSession();
tx = s.beginTransaction();
- Troop troop = (Troop) s.get( Troop.class, disney.getId() );
- Soldier soldier = (Soldier) troop.getSoldiers().iterator().next();
+ Troop troop = ( Troop ) s.get( Troop.class, disney.getId() );
+ Soldier soldier = ( Soldier ) troop.getSoldiers().iterator().next();
tx.commit();
s.close();
- //troop.getSoldiers().remove(soldier);
troop.getSoldiers().clear();
s = openSession();
tx = s.beginTransaction();
@@ -249,9 +254,9 @@
s.close();
s = openSession();
tx = s.beginTransaction();
- soldier = (Soldier) s.get( Soldier.class, mickey.getId() );
+ soldier = ( Soldier ) s.get( Soldier.class, mickey.getId() );
assertNull( "delete-orphan should work", soldier );
- troop = (Troop) s.get( Troop.class, disney.getId() );
+ troop = ( Troop ) s.get( Troop.class, disney.getId() );
s.delete( troop );
tx.commit();
s.close();
@@ -272,13 +277,13 @@
s.close();
s = openSession();
tx = s.beginTransaction();
- Troop troop = (Troop) s.get( Troop.class, disney.getId() );
+ Troop troop = ( Troop ) s.get( Troop.class, disney.getId() );
s.delete( troop );
tx.commit();
s.close();
s = openSession();
tx = s.beginTransaction();
- Soldier soldier = (Soldier) s.get( Soldier.class, mickey.getId() );
+ Soldier soldier = ( Soldier ) s.get( Soldier.class, mickey.getId() );
assertNull( "delete-orphan should work", soldier );
tx.commit();
s.close();
@@ -306,7 +311,7 @@
s = openSession();
tx = s.beginTransaction();
- c = (Customer) s.load( Customer.class, c.getId() );
+ c = ( Customer ) s.load( Customer.class, c.getId() );
assertNotNull( c );
assertTrue( Hibernate.isInitialized( c.getTickets() ) );
assertNotNull( c.getTickets() );
@@ -335,7 +340,7 @@
s = openSession();
tx = s.beginTransaction();
- c = (Customer) s.load( Customer.class, c.getId() );
+ c = ( Customer ) s.load( Customer.class, c.getId() );
assertNotNull( c );
assertFalse( Hibernate.isInitialized( c.getDiscountTickets() ) );
assertNotNull( c.getDiscountTickets() );
@@ -371,7 +376,7 @@
s = openSession();
tx = s.beginTransaction();
- parent = (Parent) s.get( Parent.class, pk );
+ parent = ( Parent ) s.get( Parent.class, pk );
assertNotNull( parent.children );
Hibernate.initialize( parent.children );
assertEquals( 2, parent.children.size() );
@@ -379,33 +384,50 @@
s.close();
}
-// HHH-3577
-// public void testOrderByOnSuperclassProperty() {
-// OrganisationUser user = new OrganisationUser();
-// user.setFirstName( "Emmanuel" );
-// user.setLastName( "Bernard" );
-// user.setIdPerson( new Long(1) );
-// user.setSomeText( "SomeText" );
-// Organisation org = new Organisation();
-// org.setIdOrganisation( new Long(1) );
-// org.setName( "S Diego Zoo" );
-// user.setOrganisation( org );
-// Session s = openSession();
-// s.getTransaction().begin();
-// s.persist( user );
-// s.persist( org );
-// s.flush();
-// s.clear();
-// s.createQuery( "select org from Organisation org left join fetch org.organisationUsers" ).list();
-// s.getTransaction().rollback();
-// s.close();
-// }
+ @FailureExpected(jiraKey = "HHH-3577")
+ public void testOrderByOnSuperclassProperty() {
+ OrganisationUser user = new OrganisationUser();
+ user.setFirstName( "Emmanuel" );
+ user.setLastName( "Bernard" );
+ user.setIdPerson( 1l );
+ user.setSomeText( "SomeText" );
+ Organisation org = new Organisation();
+ org.setIdOrganisation( 1l );
+ org.setName( "S Diego Zoo" );
+ user.setOrganisation( org );
+ Session s = openSession();
+ s.getTransaction().begin();
+ s.persist( user );
+ s.persist( org );
+ s.flush();
+ s.clear();
+ s.createQuery( "select org from Organisation org left join fetch org.organisationUsers" ).list();
+ s.getTransaction().rollback();
+ s.close();
+ }
/**
+ * HHH-4605
+ */
+ public void testJoinColumnConfiguredInXml() {
+ PersistentClass pc = cfg.getClassMapping( Model.class.getName() );
+ Table table = pc.getRootTable();
+ Iterator iter = table.getColumnIterator();
+ boolean joinColumnFound = false;
+ while(iter.hasNext()) {
+ Column column = (Column) iter.next();
+ if(column.getName().equals( "model_manufacturer_join" )) {
+ joinColumnFound = true;
+ }
+ }
+ assertTrue( "The mapping defines a joing column which could not be found in the metadata.", joinColumnFound );
+ }
+
+ /**
* @see org.hibernate.test.annotations.TestCase#getAnnotatedClasses()
*/
protected Class[] getAnnotatedClasses() {
- return new Class[]{
+ return new Class[] {
Troop.class,
Soldier.class,
Customer.class,
@@ -423,8 +445,12 @@
Politician.class,
Person.class,
Organisation.class,
- OrganisationUser.class
+ OrganisationUser.class,
+ Model.class
};
}
+ protected String[] getXmlFiles() {
+ return new String[] { "org/hibernate/test/annotations/onetomany/orm.xml" };
+ }
}
Modified: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/access/xml/Boy.xml
===================================================================
--- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/access/xml/Boy.xml 2010-02-24 09:22:43 UTC (rev 18868)
+++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/access/xml/Boy.xml 2010-02-24 17:11:05 UTC (rev 18869)
@@ -1,7 +1,6 @@
<?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 file:/Users/hardy/work/hibernate/core/trunk/annotations/src/main/resources/org/hibernate/ejb/orm_2_0.xsd"
version="2.0">
<package>org.hibernate.test.annotations.access.xml</package>
<entity class="Boy" metadata-complete="false">
Modified: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/access/xml/Cook.xml
===================================================================
--- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/access/xml/Cook.xml 2010-02-24 09:22:43 UTC (rev 18868)
+++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/access/xml/Cook.xml 2010-02-24 17:11:05 UTC (rev 18869)
@@ -1,7 +1,6 @@
<?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 file:/Users/hardy/work/hibernate/core/trunk/annotations/src/main/resources/org/hibernate/ejb/orm_2_0.xsd"
version="2.0">
<package>org.hibernate.test.annotations.access.xml</package>
<entity class="Cook" metadata-complete="false">
Modified: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/access/xml/Crew.xml
===================================================================
--- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/access/xml/Crew.xml 2010-02-24 09:22:43 UTC (rev 18868)
+++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/access/xml/Crew.xml 2010-02-24 17:11:05 UTC (rev 18869)
@@ -1,7 +1,6 @@
<?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 file:/Users/hardy/work/hibernate/core/trunk/annotations/src/main/resources/org/hibernate/ejb/orm_2_0.xsd"
version="2.0">
<package>org.hibernate.test.annotations.access.xml</package>
<mapped-superclass class="Crew" metadata-complete="false" access="FIELD">
@@ -11,4 +10,4 @@
</id>
</attributes>
</mapped-superclass>
-</entity-mappings>
+</entity-mappings>
\ No newline at end of file
Modified: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/access/xml/RentalCar.xml
===================================================================
--- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/access/xml/RentalCar.xml 2010-02-24 09:22:43 UTC (rev 18868)
+++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/access/xml/RentalCar.xml 2010-02-24 17:11:05 UTC (rev 18869)
@@ -1,7 +1,6 @@
<?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 file:/Users/hardy/work/hibernate/core/trunk/annotations/src/main/resources/org/hibernate/ejb/orm_2_0.xsd"
version="2.0">
<package>org.hibernate.test.annotations.access.xml</package>
<entity class="RentalCar" metadata-complete="false">
Modified: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist.xml
===================================================================
--- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist.xml 2010-02-24 09:22:43 UTC (rev 18868)
+++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist.xml 2010-02-24 17:11:05 UTC (rev 18869)
@@ -1,13 +1,13 @@
<?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 file:/Users/hardy/work/hibernate/core/trunk/annotations/src/main/resources/org/hibernate/ejb/orm_2_0.xsd" version="2.0">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ version="2.0">
<description>Mapping for Tourist entity</description>
<package>org.hibernate.test.annotations.access.xml</package>
<entity class="Tourist" cacheable="false" metadata-complete="false">
<attributes>
- <basic name="name" access="PROPERTY"/>
+ <basic name="name" access="PROPERTY"/>
<basic name="destination" access="PROPERTY"/>
</attributes>
- </entity>
+ </entity>
</entity-mappings>
Modified: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist2.xml
===================================================================
--- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist2.xml 2010-02-24 09:22:43 UTC (rev 18868)
+++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist2.xml 2010-02-24 17:11:05 UTC (rev 18869)
@@ -1,7 +1,6 @@
<?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 file:/Users/hardy/work/hibernate/core/trunk/annotations/src/main/resources/org/hibernate/ejb/orm_2_0.xsd"
version="2.0">
<description>Mapping for Tourist entity</description>
<persistence-unit-metadata>
Modified: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist3.xml
===================================================================
--- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist3.xml 2010-02-24 09:22:43 UTC (rev 18868)
+++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist3.xml 2010-02-24 17:11:05 UTC (rev 18869)
@@ -1,7 +1,6 @@
<?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 file:/Users/hardy/work/hibernate/core/trunk/annotations/src/main/resources/org/hibernate/ejb/orm_2_0.xsd"
version="2.0">
<description>Mapping for Tourist entity</description>
<package>org.hibernate.test.annotations.access.xml</package>
Modified: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist4.xml
===================================================================
--- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist4.xml 2010-02-24 09:22:43 UTC (rev 18868)
+++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist4.xml 2010-02-24 17:11:05 UTC (rev 18869)
@@ -1,7 +1,6 @@
<?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 file:/Users/hardy/work/hibernate/core/trunk/annotations/src/main/resources/org/hibernate/ejb/orm_2_0.xsd"
version="2.0">
<description>Mapping for Tourist entity</description>
<package>org.hibernate.test.annotations.access.xml</package>
Added: core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/onetomany/orm.xml
===================================================================
--- core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/onetomany/orm.xml (rev 0)
+++ core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/onetomany/orm.xml 2010-02-24 17:11:05 UTC (rev 18869)
@@ -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"
+ version="2.0">
+ <package>org.hibernate.test.annotations.onetomany</package>
+ <entity class="Manufacturer">
+ <attributes>
+ <id name="id">
+ <generated-value strategy="AUTO"/>
+ </id>
+ <one-to-many name="models">
+ <join-column name="model_manufacturer_join"/>
+ </one-to-many>
+ </attributes>
+ </entity>
+</entity-mappings>
\ No newline at end of file
More information about the hibernate-commits
mailing list