Author: stliu Date: 2009-11-27 16:12:06 -0500 (Fri, 27 Nov 2009) New Revision: 18087 Added: annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/ annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org/ annotations/branches/v3_4_0_GA_CP-r17982/src/test/resources/ Removed: annotations/branches/v3_4_0_GA_CP-r17982/src/test-resources/ annotations/branches/v3_4_0_GA_CP-r17982/src/test/org/ Modified: annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org/hibernate/test/annotations/RequiresDialect.java annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org/hibernate/test/annotations/fkcircularity/A.java annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org/hibernate/test/annotations/fkcircularity/A_PK.java annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org/hibernate/test/annotations/fkcircularity/B.java annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org/hibernate/test/annotations/fkcircularity/C.java annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassA.java annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassB.java annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassC.java annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassD.java annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org/hibernate/test/annotations/fkcircularity/D.java annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org/hibernate/test/annotations/fkcircularity/D_PK.java annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org/hibernate/test/annotations/fkcircularity/FkCircularityTest.java annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org/hibernate/test/annotations/id/entities/Planet.java annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org/hibernate/test/annotations/namingstrategy/Address.java annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org/hibernate/test/annotations/namingstrategy/DummyNamingStrategy.java annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org/hibernate/test/annotations/namingstrategy/NamingStrategyTest.java annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org/hibernate/test/annotations/namingstrategy/Person.java annotations/branches/v3_4_0_GA_CP-r17982/src/test/resources/hibernate.properties Log: JBPAPP-3150 update test directory - move test/org into test/java - move test-resource/* into test/resources - update hibernate.properties Copied: annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org (from rev 18082, annotations/branches/v3_4_0_GA_CP-r17982/src/test/org) Modified: annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org/hibernate/test/annotations/RequiresDialect.java =================================================================== --- annotations/branches/v3_4_0_GA_CP-r17982/src/test/org/hibernate/test/annotations/RequiresDialect.java 2009-11-27 20:48:52 UTC (rev 18082) +++ annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org/hibernate/test/annotations/RequiresDialect.java 2009-11-27 21:12:06 UTC (rev 18087) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.test.annotations; import java.lang.annotation.ElementType; Modified: annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org/hibernate/test/annotations/fkcircularity/A.java =================================================================== --- annotations/branches/v3_4_0_GA_CP-r17982/src/test/org/hibernate/test/annotations/fkcircularity/A.java 2009-11-27 20:48:52 UTC (rev 18082) +++ annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org/hibernate/test/annotations/fkcircularity/A.java 2009-11-27 21:12:06 UTC (rev 18087) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.test.annotations.fkcircularity; import javax.persistence.EmbeddedId; Modified: annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org/hibernate/test/annotations/fkcircularity/A_PK.java =================================================================== --- annotations/branches/v3_4_0_GA_CP-r17982/src/test/org/hibernate/test/annotations/fkcircularity/A_PK.java 2009-11-27 20:48:52 UTC (rev 18082) +++ annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org/hibernate/test/annotations/fkcircularity/A_PK.java 2009-11-27 21:12:06 UTC (rev 18087) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.test.annotations.fkcircularity; import java.io.Serializable; Modified: annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org/hibernate/test/annotations/fkcircularity/B.java =================================================================== --- annotations/branches/v3_4_0_GA_CP-r17982/src/test/org/hibernate/test/annotations/fkcircularity/B.java 2009-11-27 20:48:52 UTC (rev 18082) +++ annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org/hibernate/test/annotations/fkcircularity/B.java 2009-11-27 21:12:06 UTC (rev 18087) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.test.annotations.fkcircularity; import javax.persistence.Entity; Modified: annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org/hibernate/test/annotations/fkcircularity/C.java =================================================================== --- annotations/branches/v3_4_0_GA_CP-r17982/src/test/org/hibernate/test/annotations/fkcircularity/C.java 2009-11-27 20:48:52 UTC (rev 18082) +++ annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org/hibernate/test/annotations/fkcircularity/C.java 2009-11-27 21:12:06 UTC (rev 18087) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.test.annotations.fkcircularity; import javax.persistence.Entity; Modified: annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassA.java =================================================================== --- annotations/branches/v3_4_0_GA_CP-r17982/src/test/org/hibernate/test/annotations/fkcircularity/ClassA.java 2009-11-27 20:48:52 UTC (rev 18082) +++ annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassA.java 2009-11-27 21:12:06 UTC (rev 18087) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.test.annotations.fkcircularity; import javax.persistence.Column; Modified: annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassB.java =================================================================== --- annotations/branches/v3_4_0_GA_CP-r17982/src/test/org/hibernate/test/annotations/fkcircularity/ClassB.java 2009-11-27 20:48:52 UTC (rev 18082) +++ annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassB.java 2009-11-27 21:12:06 UTC (rev 18087) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.test.annotations.fkcircularity; import javax.persistence.Entity; Modified: annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassC.java =================================================================== --- annotations/branches/v3_4_0_GA_CP-r17982/src/test/org/hibernate/test/annotations/fkcircularity/ClassC.java 2009-11-27 20:48:52 UTC (rev 18082) +++ annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassC.java 2009-11-27 21:12:06 UTC (rev 18087) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.test.annotations.fkcircularity; import javax.persistence.Entity; Modified: annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassD.java =================================================================== --- annotations/branches/v3_4_0_GA_CP-r17982/src/test/org/hibernate/test/annotations/fkcircularity/ClassD.java 2009-11-27 20:48:52 UTC (rev 18082) +++ annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassD.java 2009-11-27 21:12:06 UTC (rev 18087) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.test.annotations.fkcircularity; import javax.persistence.Entity; Modified: annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org/hibernate/test/annotations/fkcircularity/D.java =================================================================== --- annotations/branches/v3_4_0_GA_CP-r17982/src/test/org/hibernate/test/annotations/fkcircularity/D.java 2009-11-27 20:48:52 UTC (rev 18082) +++ annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org/hibernate/test/annotations/fkcircularity/D.java 2009-11-27 21:12:06 UTC (rev 18087) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.test.annotations.fkcircularity; import javax.persistence.EmbeddedId; Modified: annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org/hibernate/test/annotations/fkcircularity/D_PK.java =================================================================== --- annotations/branches/v3_4_0_GA_CP-r17982/src/test/org/hibernate/test/annotations/fkcircularity/D_PK.java 2009-11-27 20:48:52 UTC (rev 18082) +++ annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org/hibernate/test/annotations/fkcircularity/D_PK.java 2009-11-27 21:12:06 UTC (rev 18087) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.test.annotations.fkcircularity; import java.io.Serializable; Modified: annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org/hibernate/test/annotations/fkcircularity/FkCircularityTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP-r17982/src/test/org/hibernate/test/annotations/fkcircularity/FkCircularityTest.java 2009-11-27 20:48:52 UTC (rev 18082) +++ annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org/hibernate/test/annotations/fkcircularity/FkCircularityTest.java 2009-11-27 21:12:06 UTC (rev 18087) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.test.annotations.fkcircularity; import java.io.PrintWriter; Modified: annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org/hibernate/test/annotations/id/entities/Planet.java =================================================================== --- annotations/branches/v3_4_0_GA_CP-r17982/src/test/org/hibernate/test/annotations/id/entities/Planet.java 2009-11-27 20:48:52 UTC (rev 18082) +++ annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org/hibernate/test/annotations/id/entities/Planet.java 2009-11-27 21:12:06 UTC (rev 18087) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.test.annotations.id.entities; public enum Planet { Modified: annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org/hibernate/test/annotations/namingstrategy/Address.java =================================================================== --- annotations/branches/v3_4_0_GA_CP-r17982/src/test/org/hibernate/test/annotations/namingstrategy/Address.java 2009-11-27 20:48:52 UTC (rev 18082) +++ annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org/hibernate/test/annotations/namingstrategy/Address.java 2009-11-27 21:12:06 UTC (rev 18087) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.test.annotations.namingstrategy; import javax.persistence.Entity; Modified: annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org/hibernate/test/annotations/namingstrategy/DummyNamingStrategy.java =================================================================== --- annotations/branches/v3_4_0_GA_CP-r17982/src/test/org/hibernate/test/annotations/namingstrategy/DummyNamingStrategy.java 2009-11-27 20:48:52 UTC (rev 18082) +++ annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org/hibernate/test/annotations/namingstrategy/DummyNamingStrategy.java 2009-11-27 21:12:06 UTC (rev 18087) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.test.annotations.namingstrategy; import org.hibernate.cfg.EJB3NamingStrategy; Modified: annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org/hibernate/test/annotations/namingstrategy/NamingStrategyTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP-r17982/src/test/org/hibernate/test/annotations/namingstrategy/NamingStrategyTest.java 2009-11-27 20:48:52 UTC (rev 18082) +++ annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org/hibernate/test/annotations/namingstrategy/NamingStrategyTest.java 2009-11-27 21:12:06 UTC (rev 18087) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.test.annotations.namingstrategy; import java.io.PrintWriter; Modified: annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org/hibernate/test/annotations/namingstrategy/Person.java =================================================================== --- annotations/branches/v3_4_0_GA_CP-r17982/src/test/org/hibernate/test/annotations/namingstrategy/Person.java 2009-11-27 20:48:52 UTC (rev 18082) +++ annotations/branches/v3_4_0_GA_CP-r17982/src/test/java/org/hibernate/test/annotations/namingstrategy/Person.java 2009-11-27 21:12:06 UTC (rev 18087) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.test.annotations.namingstrategy; import java.util.HashSet; Copied: annotations/branches/v3_4_0_GA_CP-r17982/src/test/resources (from rev 18082, annotations/branches/v3_4_0_GA_CP-r17982/src/test-resources) Modified: annotations/branches/v3_4_0_GA_CP-r17982/src/test/resources/hibernate.properties =================================================================== --- annotations/branches/v3_4_0_GA_CP-r17982/src/test-resources/hibernate.properties 2009-11-27 20:48:52 UTC (rev 18082) +++ annotations/branches/v3_4_0_GA_CP-r17982/src/test/resources/hibernate.properties 2009-11-27 21:12:06 UTC (rev 18087) @@ -19,12 +19,14 @@ ### Platforms ### ################# -hibernate.dialect @hibernate.dialect@ -hibernate.connection.driver_class @hibernate.connection.driver_class@ -hibernate.connection.username @hibernate.connection.username@ -hibernate.connection.password @hibernate.connection.password@ -hibernate.connection.url @hibernate.connection.url@ +hibernate.dialect ${db.dialect} +hibernate.connection.driver_class ${jdbc.driver} +hibernate.connection.url ${jdbc.url} +hibernate.connection.username ${jdbc.user} +hibernate.connection.password ${jdbc.pass} +hibernate.connection.isolation ${jdbc.isolation} + ################################# ### Hibernate Connection Pool ### #################################