[hibernate-commits] Hibernate SVN: r19925 - in core/trunk: annotations/src/test/resources and 37 other directories.
hibernate-commits at lists.jboss.org
hibernate-commits at lists.jboss.org
Fri Jul 9 13:52:49 EDT 2010
Author: steve.ebersole at jboss.com
Date: 2010-07-09 13:52:47 -0400 (Fri, 09 Jul 2010)
New Revision: 19925
Added:
core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/
core/trunk/testsuite/src/test/java/org/hibernate/test/util/SchemaUtil.java
core/trunk/testsuite/src/test/resources/org/
core/trunk/testsuite/src/test/resources/org/hibernate/
core/trunk/testsuite/src/test/resources/org/hibernate/test/
core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/
core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/Boat.hbm.xml
core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/Ferry.hbm.xml
core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/access/
core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/access/xml/
core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/access/xml/Boy.xml
core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/access/xml/Cook.xml
core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/access/xml/Crew.xml
core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/access/xml/RentalCar.xml
core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist.xml
core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist2.xml
core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist3.xml
core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist4.xml
core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/bytecode/
core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/bytecode/Hammer.hbm.xml
core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/configuration/
core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/configuration/orm.xml
core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/duplicatedgenerator/
core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/duplicatedgenerator/orm.xml
core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/fetchprofile/
core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/fetchprofile/mappings.hbm.xml
core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/hibernate.cfg.xml
core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/idclass/
core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/idclass/xml/
core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/idclass/xml/HabitatSpeciesLink.xml
core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/inheritance/
core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/inheritance/joined/
core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/inheritance/joined/Asset.hbm.xml
core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/loader/
core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/loader/Loader.hbm.xml
core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/onetomany/
core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/onetomany/orm.xml
core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/onetoone/
core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/onetoone/orm.xml
core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/orm.xml
core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/query/
core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/query/orm.xml
core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/reflection/
core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/reflection/metadata-complete.xml
core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/reflection/orm.xml
core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/xml/
core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/
core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm.xml
core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm2.xml
core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm3.xml
core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/xml/hbm/
core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/xml/hbm/A.hbm.xml
core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/xml/hbm/B.hbm.xml
core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/xml/hbm/CloudType.hbm.xml
core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/xml/hbm/Government.hbm.xml
Removed:
core/trunk/annotations/src/test/java/org/hibernate/test/annotations/
core/trunk/annotations/src/test/java/org/hibernate/test/util/
core/trunk/annotations/src/test/resources/org/
Modified:
core/trunk/testsuite/pom.xml
core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/access/Closet.java
core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/access/Foobar.java
core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Bed.java
core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Being.java
core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/BigBed.java
core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Chair.java
core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Gardenshed.java
core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Person.java
core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Thingy.java
core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/User.java
core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Woody.java
core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/access/xml/Crew.java
core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/access/xml/Driver.java
core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/access/xml/RentalCar.java
core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/access/xml/Tourist.java
core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/access/xml/Waiter.java
core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/any/package-info.java
core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/b/DerivedIdentitySimpleParentSimpleDepMapsIdTest.java
core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/embedded/EmbeddedTest.java
core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer2.java
core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer3.java
core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer4.java
core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer5.java
core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/fetchprofile/SupportTickets.java
core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/fetchprofile/package-info.java
core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/A.java
core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/A_PK.java
core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/B.java
core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/C.java
core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassA.java
core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassB.java
core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassC.java
core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassD.java
core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/D.java
core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/D_PK.java
core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/FkCircularityTest.java
core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/id/entities/Planet.java
core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/namingstrategy/Address.java
core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/namingstrategy/DummyNamingStrategy.java
core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/namingstrategy/Person.java
core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/override/AttributeOverrideTest.java
Log:
HHH-5366 - Move annotations module tests into testsuite module
Modified: core/trunk/testsuite/pom.xml
===================================================================
--- core/trunk/testsuite/pom.xml 2010-07-09 12:24:59 UTC (rev 19924)
+++ core/trunk/testsuite/pom.xml 2010-07-09 17:52:47 UTC (rev 19925)
@@ -43,6 +43,11 @@
<artifactId>jaxen</artifactId>
<version>1.1</version>
</dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -96,4 +101,27 @@
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>jaxb</id>
+ <activation>
+ <jdk>1.5</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>2.1.3</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
Copied: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations (from rev 19924, core/trunk/annotations/src/test/java/org/hibernate/test/annotations)
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/access/Closet.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/access/Closet.java 2010-07-09 12:24:59 UTC (rev 19924)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/access/Closet.java 2010-07-09 17:52:47 UTC (rev 19925)
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/access/Foobar.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/access/Foobar.java 2010-07-09 12:24:59 UTC (rev 19924)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/access/Foobar.java 2010-07-09 17:52:47 UTC (rev 19925)
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Bed.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Bed.java 2010-07-09 12:24:59 UTC (rev 19924)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Bed.java 2010-07-09 17:52:47 UTC (rev 19925)
@@ -1,4 +1,4 @@
-//$Id:$
+//$Id$
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Being.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Being.java 2010-07-09 12:24:59 UTC (rev 19924)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Being.java 2010-07-09 17:52:47 UTC (rev 19925)
@@ -1,4 +1,4 @@
-//$Id:$
+//$Id$
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/BigBed.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/BigBed.java 2010-07-09 12:24:59 UTC (rev 19924)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/BigBed.java 2010-07-09 17:52:47 UTC (rev 19925)
@@ -1,4 +1,4 @@
-//$Id:$
+//$Id$
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Chair.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Chair.java 2010-07-09 12:24:59 UTC (rev 19924)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Chair.java 2010-07-09 17:52:47 UTC (rev 19925)
@@ -1,4 +1,4 @@
-//$Id:$
+//$Id$
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Gardenshed.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Gardenshed.java 2010-07-09 12:24:59 UTC (rev 19924)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Gardenshed.java 2010-07-09 17:52:47 UTC (rev 19925)
@@ -1,4 +1,4 @@
-//$Id:$
+//$Id$
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Person.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Person.java 2010-07-09 12:24:59 UTC (rev 19924)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Person.java 2010-07-09 17:52:47 UTC (rev 19925)
@@ -1,4 +1,4 @@
-//$Id:$
+//$Id$
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Thingy.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Thingy.java 2010-07-09 12:24:59 UTC (rev 19924)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Thingy.java 2010-07-09 17:52:47 UTC (rev 19925)
@@ -1,4 +1,4 @@
-//$Id:$
+//$Id$
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/User.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/User.java 2010-07-09 12:24:59 UTC (rev 19924)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/User.java 2010-07-09 17:52:47 UTC (rev 19925)
@@ -1,4 +1,4 @@
-//$Id:$
+//$Id$
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Woody.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Woody.java 2010-07-09 12:24:59 UTC (rev 19924)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/access/jpa/Woody.java 2010-07-09 17:52:47 UTC (rev 19925)
@@ -1,4 +1,4 @@
-//$Id:$
+//$Id$
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/access/xml/Crew.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/access/xml/Crew.java 2010-07-09 12:24:59 UTC (rev 19924)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/access/xml/Crew.java 2010-07-09 17:52:47 UTC (rev 19925)
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/access/xml/Driver.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/access/xml/Driver.java 2010-07-09 12:24:59 UTC (rev 19924)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/access/xml/Driver.java 2010-07-09 17:52:47 UTC (rev 19925)
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/access/xml/RentalCar.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/access/xml/RentalCar.java 2010-07-09 12:24:59 UTC (rev 19924)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/access/xml/RentalCar.java 2010-07-09 17:52:47 UTC (rev 19925)
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/access/xml/Tourist.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/access/xml/Tourist.java 2010-07-09 12:24:59 UTC (rev 19924)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/access/xml/Tourist.java 2010-07-09 17:52:47 UTC (rev 19925)
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/access/xml/Waiter.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/access/xml/Waiter.java 2010-07-09 12:24:59 UTC (rev 19924)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/access/xml/Waiter.java 2010-07-09 17:52:47 UTC (rev 19925)
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/any/package-info.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/any/package-info.java 2010-07-09 12:24:59 UTC (rev 19924)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/any/package-info.java 2010-07-09 17:52:47 UTC (rev 19925)
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
@AnyMetaDefs(
@AnyMetaDef( name= "Property", metaType = "string", idType = "integer",
metaValues = {
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/b/DerivedIdentitySimpleParentSimpleDepMapsIdTest.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/b/DerivedIdentitySimpleParentSimpleDepMapsIdTest.java 2010-07-09 12:24:59 UTC (rev 19924)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/b/DerivedIdentitySimpleParentSimpleDepMapsIdTest.java 2010-07-09 17:52:47 UTC (rev 19925)
@@ -1,11 +1,7 @@
package org.hibernate.test.annotations.derivedidentities.e4.b;
import java.util.Date;
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityTransaction;
-
import org.hibernate.Session;
import org.hibernate.test.annotations.TestCase;
import org.hibernate.test.util.SchemaUtil;
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/embedded/EmbeddedTest.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/embedded/EmbeddedTest.java 2010-07-09 12:24:59 UTC (rev 19924)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/embedded/EmbeddedTest.java 2010-07-09 17:52:47 UTC (rev 19925)
@@ -4,7 +4,6 @@
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Iterator;
import java.util.List;
import java.util.Set;
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer2.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer2.java 2010-07-09 12:24:59 UTC (rev 19924)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer2.java 2010-07-09 17:52:47 UTC (rev 19925)
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer3.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer3.java 2010-07-09 12:24:59 UTC (rev 19924)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer3.java 2010-07-09 17:52:47 UTC (rev 19925)
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer4.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer4.java 2010-07-09 12:24:59 UTC (rev 19924)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer4.java 2010-07-09 17:52:47 UTC (rev 19925)
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer5.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer5.java 2010-07-09 12:24:59 UTC (rev 19924)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer5.java 2010-07-09 17:52:47 UTC (rev 19925)
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/fetchprofile/SupportTickets.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/SupportTickets.java 2010-07-09 12:24:59 UTC (rev 19924)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/fetchprofile/SupportTickets.java 2010-07-09 17:52:47 UTC (rev 19925)
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/fetchprofile/package-info.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/package-info.java 2010-07-09 12:24:59 UTC (rev 19924)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/fetchprofile/package-info.java 2010-07-09 17:52:47 UTC (rev 19925)
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/A.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/A.java 2010-07-09 12:24:59 UTC (rev 19924)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/A.java 2010-07-09 17:52:47 UTC (rev 19925)
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
package org.hibernate.test.annotations.fkcircularity;
import javax.persistence.EmbeddedId;
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/A_PK.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/A_PK.java 2010-07-09 12:24:59 UTC (rev 19924)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/A_PK.java 2010-07-09 17:52:47 UTC (rev 19925)
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
package org.hibernate.test.annotations.fkcircularity;
import java.io.Serializable;
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/B.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/B.java 2010-07-09 12:24:59 UTC (rev 19924)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/B.java 2010-07-09 17:52:47 UTC (rev 19925)
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
package org.hibernate.test.annotations.fkcircularity;
import javax.persistence.Entity;
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/C.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/C.java 2010-07-09 12:24:59 UTC (rev 19924)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/C.java 2010-07-09 17:52:47 UTC (rev 19925)
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
package org.hibernate.test.annotations.fkcircularity;
import javax.persistence.Entity;
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassA.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassA.java 2010-07-09 12:24:59 UTC (rev 19924)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassA.java 2010-07-09 17:52:47 UTC (rev 19925)
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
package org.hibernate.test.annotations.fkcircularity;
import javax.persistence.Column;
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassB.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassB.java 2010-07-09 12:24:59 UTC (rev 19924)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassB.java 2010-07-09 17:52:47 UTC (rev 19925)
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
package org.hibernate.test.annotations.fkcircularity;
import javax.persistence.Entity;
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassC.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassC.java 2010-07-09 12:24:59 UTC (rev 19924)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassC.java 2010-07-09 17:52:47 UTC (rev 19925)
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
package org.hibernate.test.annotations.fkcircularity;
import javax.persistence.Entity;
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassD.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassD.java 2010-07-09 12:24:59 UTC (rev 19924)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassD.java 2010-07-09 17:52:47 UTC (rev 19925)
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
package org.hibernate.test.annotations.fkcircularity;
import javax.persistence.Entity;
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/D.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/D.java 2010-07-09 12:24:59 UTC (rev 19924)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/D.java 2010-07-09 17:52:47 UTC (rev 19925)
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
package org.hibernate.test.annotations.fkcircularity;
import javax.persistence.EmbeddedId;
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/D_PK.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/D_PK.java 2010-07-09 12:24:59 UTC (rev 19924)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/D_PK.java 2010-07-09 17:52:47 UTC (rev 19925)
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
package org.hibernate.test.annotations.fkcircularity;
import java.io.Serializable;
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/FkCircularityTest.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/FkCircularityTest.java 2010-07-09 12:24:59 UTC (rev 19924)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/fkcircularity/FkCircularityTest.java 2010-07-09 17:52:47 UTC (rev 19925)
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
package org.hibernate.test.annotations.fkcircularity;
import java.io.PrintWriter;
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/id/entities/Planet.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/id/entities/Planet.java 2010-07-09 12:24:59 UTC (rev 19924)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/id/entities/Planet.java 2010-07-09 17:52:47 UTC (rev 19925)
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
package org.hibernate.test.annotations.id.entities;
public enum Planet {
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/namingstrategy/Address.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/namingstrategy/Address.java 2010-07-09 12:24:59 UTC (rev 19924)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/namingstrategy/Address.java 2010-07-09 17:52:47 UTC (rev 19925)
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
package org.hibernate.test.annotations.namingstrategy;
import javax.persistence.Entity;
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/namingstrategy/DummyNamingStrategy.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/namingstrategy/DummyNamingStrategy.java 2010-07-09 12:24:59 UTC (rev 19924)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/namingstrategy/DummyNamingStrategy.java 2010-07-09 17:52:47 UTC (rev 19925)
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
package org.hibernate.test.annotations.namingstrategy;
import org.hibernate.cfg.EJB3NamingStrategy;
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/namingstrategy/Person.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/namingstrategy/Person.java 2010-07-09 12:24:59 UTC (rev 19924)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/namingstrategy/Person.java 2010-07-09 17:52:47 UTC (rev 19925)
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
package org.hibernate.test.annotations.namingstrategy;
import java.util.HashSet;
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/override/AttributeOverrideTest.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/override/AttributeOverrideTest.java 2010-07-09 12:24:59 UTC (rev 19924)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/override/AttributeOverrideTest.java 2010-07-09 17:52:47 UTC (rev 19925)
@@ -1,14 +1,7 @@
package org.hibernate.test.annotations.override;
-import java.util.Iterator;
-
import org.hibernate.test.annotations.TestCase;
import org.hibernate.test.util.SchemaUtil;
-import org.hibernate.metadata.CollectionMetadata;
-import org.hibernate.engine.SessionFactoryImplementor;
-import org.hibernate.persister.collection.CollectionPersister;
-import org.hibernate.mapping.Table;
-import org.hibernate.mapping.Column;
/**
* @author Emmanuel Bernard
Copied: core/trunk/testsuite/src/test/java/org/hibernate/test/util/SchemaUtil.java (from rev 19924, core/trunk/annotations/src/test/java/org/hibernate/test/util/SchemaUtil.java)
===================================================================
--- core/trunk/testsuite/src/test/java/org/hibernate/test/util/SchemaUtil.java (rev 0)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/util/SchemaUtil.java 2010-07-09 17:52:47 UTC (rev 19925)
@@ -0,0 +1,65 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2010, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.test.util;
+
+import java.util.Iterator;
+
+import org.hibernate.mapping.Table;
+import org.hibernate.mapping.Column;
+import org.hibernate.cfg.Configuration;
+
+/**
+ * Check that the Hibernate metamodel contains some database objects
+ *
+ * @author Emmanuel Bernard
+ */
+public abstract class SchemaUtil {
+ public static boolean isColumnPresent(String tableName, String columnName, Configuration cfg) {
+ final Iterator<Table> tables = ( Iterator<Table> ) cfg.getTableMappings();
+ while (tables.hasNext()) {
+ Table table = tables.next();
+ if (tableName.equals( table.getName() ) ) {
+ Iterator<Column> columns = (Iterator<Column>) table.getColumnIterator();
+ while ( columns.hasNext() ) {
+ Column column = columns.next();
+ if ( columnName.equals( column.getName() ) ) {
+ return true;
+ }
+ }
+ }
+ }
+ return false;
+ }
+
+ public static boolean isTablePresent(String tableName, Configuration cfg) {
+ final Iterator<Table> tables = ( Iterator<Table> ) cfg.getTableMappings();
+ while (tables.hasNext()) {
+ Table table = tables.next();
+ if (tableName.equals( table.getName() ) ) {
+ return true;
+ }
+ }
+ return false;
+ }
+}
Copied: core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/Boat.hbm.xml (from rev 19924, core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/Boat.hbm.xml)
===================================================================
--- core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/Boat.hbm.xml (rev 0)
+++ core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/Boat.hbm.xml 2010-07-09 17:52:47 UTC (rev 19925)
@@ -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/testsuite/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/testsuite/src/test/resources/org/hibernate/test/annotations/Ferry.hbm.xml (from rev 19924, core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/Ferry.hbm.xml)
===================================================================
--- core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/Ferry.hbm.xml (rev 0)
+++ core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/Ferry.hbm.xml 2010-07-09 17:52:47 UTC (rev 19925)
@@ -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/testsuite/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/testsuite/src/test/resources/org/hibernate/test/annotations/access/xml/Boy.xml (from rev 19924, core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/access/xml/Boy.xml)
===================================================================
--- core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/access/xml/Boy.xml (rev 0)
+++ core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/access/xml/Boy.xml 2010-07-09 17:52:47 UTC (rev 19925)
@@ -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="2.0">
+ <package>org.hibernate.test.annotations.access.xml</package>
+ <entity class="Boy" metadata-complete="false">
+ <attributes>
+ <element-collection name="nickNames" target-class="java.lang.String" access="PROPERTY"/>
+ </attributes>
+ </entity>
+</entity-mappings>
Copied: core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/access/xml/Cook.xml (from rev 19924, core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/access/xml/Cook.xml)
===================================================================
--- core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/access/xml/Cook.xml (rev 0)
+++ core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/access/xml/Cook.xml 2010-07-09 17:52:47 UTC (rev 19925)
@@ -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="2.0">
+ <package>org.hibernate.test.annotations.access.xml</package>
+ <entity class="Cook" metadata-complete="false">
+ <attributes>
+ <embedded name="favouriteKnife" access="PROPERTY"/>
+ </attributes>
+ </entity>
+</entity-mappings>
Copied: core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/access/xml/Crew.xml (from rev 19924, core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/access/xml/Crew.xml)
===================================================================
--- core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/access/xml/Crew.xml (rev 0)
+++ core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/access/xml/Crew.xml 2010-07-09 17:52:47 UTC (rev 19925)
@@ -0,0 +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"
+ version="2.0">
+ <package>org.hibernate.test.annotations.access.xml</package>
+ <mapped-superclass class="Crew" metadata-complete="false" access="FIELD">
+ <attributes>
+ <id name="id">
+ <generated-value/>
+ </id>
+ </attributes>
+ </mapped-superclass>
+</entity-mappings>
\ No newline at end of file
Copied: core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/access/xml/RentalCar.xml (from rev 19924, core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/access/xml/RentalCar.xml)
===================================================================
--- core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/access/xml/RentalCar.xml (rev 0)
+++ core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/access/xml/RentalCar.xml 2010-07-09 17:52:47 UTC (rev 19925)
@@ -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="2.0">
+ <package>org.hibernate.test.annotations.access.xml</package>
+ <entity class="RentalCar" metadata-complete="false">
+ <attributes>
+ <one-to-one name="driver" target-entity="Driver" access="PROPERTY"/>
+ </attributes>
+ </entity>
+</entity-mappings>
Copied: core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist.xml (from rev 19924, core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist.xml)
===================================================================
--- core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist.xml (rev 0)
+++ core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist.xml 2010-07-09 17:52:47 UTC (rev 19925)
@@ -0,0 +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"
+ 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="destination" access="PROPERTY"/>
+ </attributes>
+ </entity>
+</entity-mappings>
Copied: core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist2.xml (from rev 19924, core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist2.xml)
===================================================================
--- core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist2.xml (rev 0)
+++ core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist2.xml 2010-07-09 17:52:47 UTC (rev 19925)
@@ -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">
+ <description>Mapping for Tourist entity</description>
+ <persistence-unit-metadata>
+ <persistence-unit-defaults>
+ <access>PROPERTY</access>
+ </persistence-unit-defaults>
+ </persistence-unit-metadata>
+ <package>org.hibernate.test.annotations.access.xml</package>
+ <entity class="Tourist" cacheable="false" metadata-complete="false">
+ <attributes>
+ <id name="id" access="FIELD"/>
+ </attributes>
+ </entity>
+</entity-mappings>
Copied: core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist3.xml (from rev 19924, core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist3.xml)
===================================================================
--- core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist3.xml (rev 0)
+++ core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist3.xml 2010-07-09 17:52:47 UTC (rev 19925)
@@ -0,0 +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"
+ version="2.0">
+ <description>Mapping for Tourist entity</description>
+ <package>org.hibernate.test.annotations.access.xml</package>
+ <access>PROPERTY</access>
+ <entity class="Tourist" cacheable="false" metadata-complete="false">
+ <attributes>
+ <id name="id" access="FIELD"/>
+ </attributes>
+ </entity>
+</entity-mappings>
Copied: core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist4.xml (from rev 19924, core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist4.xml)
===================================================================
--- core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist4.xml (rev 0)
+++ core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist4.xml 2010-07-09 17:52:47 UTC (rev 19925)
@@ -0,0 +1,12 @@
+<?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">
+ <description>Mapping for Tourist entity</description>
+ <package>org.hibernate.test.annotations.access.xml</package>
+ <entity class="Tourist" cacheable="false" metadata-complete="false" access="PROPERTY">
+ <attributes>
+ <id name="id" access="FIELD"/>
+ </attributes>
+ </entity>
+</entity-mappings>
Copied: core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/bytecode/Hammer.hbm.xml (from rev 19924, core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/bytecode/Hammer.hbm.xml)
===================================================================
--- core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/bytecode/Hammer.hbm.xml (rev 0)
+++ core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/bytecode/Hammer.hbm.xml 2010-07-09 17:52:47 UTC (rev 19925)
@@ -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/testsuite/src/test/resources/org/hibernate/test/annotations/configuration/orm.xml (from rev 19924, core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/configuration/orm.xml)
===================================================================
--- core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/configuration/orm.xml (rev 0)
+++ core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/configuration/orm.xml 2010-07-09 17:52:47 UTC (rev 19925)
@@ -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_2_0.xsd"
+ version="2.0">
+</entity-mappings>
Copied: core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/duplicatedgenerator/orm.xml (from rev 19924, core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/duplicatedgenerator/orm.xml)
===================================================================
--- core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/duplicatedgenerator/orm.xml (rev 0)
+++ core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/duplicatedgenerator/orm.xml 2010-07-09 17:52:47 UTC (rev 19925)
@@ -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/testsuite/src/test/resources/org/hibernate/test/annotations/fetchprofile/mappings.hbm.xml (from rev 19924, core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/fetchprofile/mappings.hbm.xml)
===================================================================
--- core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/fetchprofile/mappings.hbm.xml (rev 0)
+++ core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/fetchprofile/mappings.hbm.xml 2010-07-09 17:52:47 UTC (rev 19925)
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping
+ SYSTEM
+ "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" >
+
+<!--
+ ~ Hibernate, Relational Persistence for Idiomatic Java
+ ~
+ ~ Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
+ ~ indicated by the @author tags or express copyright attribution
+ ~ statements applied by the authors. All third-party contributions are
+ ~ distributed under license by Red Hat Middleware LLC.
+ ~
+ ~ This copyrighted material is made available to anyone wishing to use, modify,
+ ~ copy, or redistribute it subject to the terms and conditions of the GNU
+ ~ Lesser General Public License, as published by the Free Software Foundation.
+ ~
+ ~ This program is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ ~ for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public License
+ ~ along with this distribution; if not, write to:
+ ~ Free Software Foundation, Inc.
+ ~ 51 Franklin Street, Fifth Floor
+ ~ Boston, MA 02110-1301 USA
+ ~
+ -->
+
+<hibernate-mapping package="org.hibernate.test.annotations.fetchprofile">
+ <fetch-profile name="orders-profile">
+ <fetch entity="Customer5" association="orders" style="join"/>
+ </fetch-profile>
+</hibernate-mapping>
Property changes on: core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/fetchprofile/mappings.hbm.xml
___________________________________________________________________
Name: svn:keywords
+ Id
Copied: core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/hibernate.cfg.xml (from rev 19924, core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/hibernate.cfg.xml)
===================================================================
--- core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/hibernate.cfg.xml (rev 0)
+++ core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/hibernate.cfg.xml 2010-07-09 17:52:47 UTC (rev 19925)
@@ -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/testsuite/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/testsuite/src/test/resources/org/hibernate/test/annotations/idclass/xml/HabitatSpeciesLink.xml (from rev 19924, core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/idclass/xml/HabitatSpeciesLink.xml)
===================================================================
--- core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/idclass/xml/HabitatSpeciesLink.xml (rev 0)
+++ core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/idclass/xml/HabitatSpeciesLink.xml 2010-07-09 17:52:47 UTC (rev 19925)
@@ -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"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd"
+ version="2.0">
+ <entity class="org.hibernate.test.annotations.idclass.xml.HabitatSpeciesLink" access="FIELD">
+ <table name="HABITAT_SPECIES_LINK"/>
+ <id-class
+ class="org.hibernate.test.annotations.idclass.xml.HabitatSpeciesLink$HabitatSpeciesLinkId"/>
+ <named-native-query name="testQuery"
+ result-class="org.hibernate.test.annotations.idclass.xml.HabitatSpeciesLink">
+ <query>select * from HABITAT_SPECIES_LINK link where link.HABITAT_LINK = 1</query>
+ </named-native-query>
+ <attributes>
+ <id name="habitatId">
+ <column name="HABITAT_LINK"/>
+ </id>
+ <id name="speciesId">
+ <column name="SPECIES_LINK"/>
+ </id>
+ </attributes>
+ </entity>
+</entity-mappings>
+
Copied: core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/inheritance/joined/Asset.hbm.xml (from rev 19924, core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/inheritance/joined/Asset.hbm.xml)
===================================================================
--- core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/inheritance/joined/Asset.hbm.xml (rev 0)
+++ core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/inheritance/joined/Asset.hbm.xml 2010-07-09 17:52:47 UTC (rev 19925)
@@ -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/testsuite/src/test/resources/org/hibernate/test/annotations/loader/Loader.hbm.xml (from rev 19924, core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/loader/Loader.hbm.xml)
===================================================================
--- core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/loader/Loader.hbm.xml (rev 0)
+++ core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/loader/Loader.hbm.xml 2010-07-09 17:52:47 UTC (rev 19925)
@@ -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/testsuite/src/test/resources/org/hibernate/test/annotations/onetomany/orm.xml (from rev 19924, core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/onetomany/orm.xml)
===================================================================
--- core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/onetomany/orm.xml (rev 0)
+++ core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/onetomany/orm.xml 2010-07-09 17:52:47 UTC (rev 19925)
@@ -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
Copied: core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/onetoone/orm.xml (from rev 19924, core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/onetoone/orm.xml)
===================================================================
--- core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/onetoone/orm.xml (rev 0)
+++ core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/onetoone/orm.xml 2010-07-09 17:52:47 UTC (rev 19925)
@@ -0,0 +1,29 @@
+<?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.onetoone</package>
+ <entity class="Father">
+ <attributes>
+ <id name="id">
+ <generated-value strategy="AUTO"/>
+ </id>
+ <basic name="name"/>
+ </attributes>
+ </entity>
+ <entity class="Son">
+ <attributes>
+ <id name="id">
+ <generated-value strategy="AUTO"/>
+ </id>
+ <basic name="name"/>
+ <one-to-one name="father">
+ <join-table name="father_son">
+ <join-column name="foo"/>
+ <inverse-join-column name="bar"/>
+ </join-table>
+ </one-to-one>
+ </attributes>
+ </entity>
+</entity-mappings>
\ No newline at end of file
Copied: core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/orm.xml (from rev 19924, core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/orm.xml)
===================================================================
--- core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/orm.xml (rev 0)
+++ core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/orm.xml 2010-07-09 17:52:47 UTC (rev 19925)
@@ -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/testsuite/src/test/resources/org/hibernate/test/annotations/query/orm.xml (from rev 19924, core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/query/orm.xml)
===================================================================
--- core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/query/orm.xml (rev 0)
+++ core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/query/orm.xml 2010-07-09 17:52:47 UTC (rev 19925)
@@ -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/testsuite/src/test/resources/org/hibernate/test/annotations/reflection/metadata-complete.xml (from rev 19924, core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/reflection/metadata-complete.xml)
===================================================================
--- core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/reflection/metadata-complete.xml (rev 0)
+++ core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/reflection/metadata-complete.xml 2010-07-09 17:52:47 UTC (rev 19925)
@@ -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_2_0.xsd"
+ version="2.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/testsuite/src/test/resources/org/hibernate/test/annotations/reflection/orm.xml (from rev 19924, core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/reflection/orm.xml)
===================================================================
--- core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/reflection/orm.xml (rev 0)
+++ core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/reflection/orm.xml 2010-07-09 17:52:47 UTC (rev 19925)
@@ -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_2_0.xsd"
+ version="2.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/testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm.xml (from rev 19924, core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm.xml)
===================================================================
--- core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm.xml (rev 0)
+++ core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm.xml 2010-07-09 17:52:47 UTC (rev 19925)
@@ -0,0 +1,55 @@
+<?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">
+ <!-- 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/testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm2.xml (from rev 19924, core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm2.xml)
===================================================================
--- core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm2.xml (rev 0)
+++ core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm2.xml 2010-07-09 17:52:47 UTC (rev 19925)
@@ -0,0 +1,18 @@
+<?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"
+ >
+ <!-- use orm_1_0 on purpose (backward compatibility test -->
+ <package>org.hibernate.test.annotations.xml.ejb3</package>
+ <entity class="Light" access="FIELD" metadata-complete="true">
+ <attributes>
+ <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/testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm3.xml (from rev 19924, core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm3.xml)
===================================================================
--- core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm3.xml (rev 0)
+++ core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm3.xml 2010-07-09 17:52:47 UTC (rev 19925)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm/orm_2_0.xsd"
+ version="2.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/testsuite/src/test/resources/org/hibernate/test/annotations/xml/hbm/A.hbm.xml (from rev 19924, core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/hbm/A.hbm.xml)
===================================================================
--- core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/xml/hbm/A.hbm.xml (rev 0)
+++ core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/xml/hbm/A.hbm.xml 2010-07-09 17:52:47 UTC (rev 19925)
@@ -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/testsuite/src/test/resources/org/hibernate/test/annotations/xml/hbm/B.hbm.xml (from rev 19924, core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/hbm/B.hbm.xml)
===================================================================
--- core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/xml/hbm/B.hbm.xml (rev 0)
+++ core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/xml/hbm/B.hbm.xml 2010-07-09 17:52:47 UTC (rev 19925)
@@ -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/testsuite/src/test/resources/org/hibernate/test/annotations/xml/hbm/CloudType.hbm.xml (from rev 19924, core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/hbm/CloudType.hbm.xml)
===================================================================
--- core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/xml/hbm/CloudType.hbm.xml (rev 0)
+++ core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/xml/hbm/CloudType.hbm.xml 2010-07-09 17:52:47 UTC (rev 19925)
@@ -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/testsuite/src/test/resources/org/hibernate/test/annotations/xml/hbm/Government.hbm.xml (from rev 19924, core/trunk/annotations/src/test/resources/org/hibernate/test/annotations/xml/hbm/Government.hbm.xml)
===================================================================
--- core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/xml/hbm/Government.hbm.xml (rev 0)
+++ core/trunk/testsuite/src/test/resources/org/hibernate/test/annotations/xml/hbm/Government.hbm.xml 2010-07-09 17:52:47 UTC (rev 19925)
@@ -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/testsuite/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