Move tests from packages actionqueue, annotations, batch, boot, bytecode, id, resource, schemafilter, schematools, schemaupdate, schemavalidation, serialization, service, tool, unidir, util

documentation/src/test/java/org/hibernate/userguide/multitenancy/AbstractMultiTenancyTest.java

@@ -37,7 +37,7 @@ import org.hibernate.tool.schema.internal.exec.GenerationTargetToDatabase;
 
 import org.hibernate.testing.AfterClassOnce;
 import org.hibernate.testing.junit4.BaseUnitTestCase;
-import org.hibernate.test.util.DdlTransactionIsolatorTestingImpl;
+import org.hibernate.orm.test.util.DdlTransactionIsolatorTestingImpl;
 import org.junit.Test;
 
 /**

documentation/src/test/java/org/hibernate/userguide/multitenancy/DatabaseTimeZoneMultiTenancyTest.java

@@ -45,7 +45,7 @@ import org.hibernate.tool.schema.internal.exec.GenerationTargetToDatabase;
 import org.hibernate.testing.AfterClassOnce;
 import org.hibernate.testing.RequiresDialect;
 import org.hibernate.testing.junit4.BaseUnitTestCase;
-import org.hibernate.test.util.DdlTransactionIsolatorTestingImpl;
+import org.hibernate.orm.test.util.DdlTransactionIsolatorTestingImpl;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;

hibernate-core/src/main/java/org/hibernate/dialect/DerbyDialect.java

@@ -369,6 +369,11 @@ public class DerbyDialect extends Dialect {
 				: SequenceInformationExtractorDerbyDatabaseImpl.INSTANCE;
 	}
 
+	@Override
+	public String[] getDropSchemaCommand(String schemaName) {
+		return new String[] {"drop schema " + schemaName + " restrict"};
+	}
+
 	@Override
 	public String getSelectClauseNullString(int sqlType) {
 		return DB2Dialect.selectNullString( sqlType );

hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/EnhancerWildFlyNamesTest.java

@@ -13,10 +13,8 @@ import java.io.InputStream;
 import org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImpl;
 import org.hibernate.bytecode.enhance.spi.DefaultEnhancementContext;
 import org.hibernate.bytecode.enhance.spi.Enhancer;
-import org.hibernate.bytecode.internal.bytebuddy.ByteBuddyState;
 
 import org.hibernate.testing.TestForIssue;
-import org.hibernate.test.bytecode.Bean;
 import org.junit.Assert;
 import org.junit.Test;
 

hibernate-core/src/test/java/org/hibernate/jpa/test/criteria/literal/AbstractCriteriaLiteralHandlingModeTest.java

@@ -9,19 +9,15 @@ package org.hibernate.jpa.test.criteria.literal;
 import java.util.List;
 import java.util.Map;
 import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.Tuple;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Root;
 
-import org.hibernate.dialect.H2Dialect;
 import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
 
-import org.hibernate.testing.RequiresDialect;
 import org.hibernate.testing.jdbc.SQLStatementInterceptor;
-import org.hibernate.test.util.jdbc.PreparedStatementSpyConnectionProvider;
 import org.junit.Before;
 import org.junit.Test;
 

hibernate-core/src/test/java/org/hibernate/jpa/test/lock/StatementIsClosedAfterALockExceptionTest.java

@@ -12,11 +12,9 @@ import java.util.HashMap;
 import java.util.Map;
 import javax.persistence.LockModeType;
 import org.hibernate.Session;
-import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.dialect.CockroachDialect;
-import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
 import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
-import org.hibernate.test.util.jdbc.PreparedStatementSpyConnectionProvider;
+import org.hibernate.orm.test.util.jdbc.PreparedStatementSpyConnectionProvider;
 import org.hibernate.testing.DialectChecks;
 import org.hibernate.testing.RequiresDialectFeature;
 import org.hibernate.testing.SkipForDialect;

hibernate-core/src/test/java/org/hibernate/jpa/test/query/NamedQueryCommentTest.java

@@ -27,7 +27,6 @@ import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
 import org.hibernate.testing.RequiresDialect;
 import org.hibernate.testing.TestForIssue;
 import org.hibernate.testing.jdbc.SQLStatementInterceptor;
-import org.hibernate.test.util.jdbc.PreparedStatementSpyConnectionProvider;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

hibernate-core/src/test/java/org/hibernate/orm/test/actionqueue/CustomAfterCompletionTest.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.actionqueue;
+package org.hibernate.orm.test.actionqueue;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 import javax.persistence.Entity;

hibernate-core/src/test/java/org/hibernate/orm/test/actionqueue/CustomBeforeCompletionTest.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.actionqueue;
+package org.hibernate.orm.test.actionqueue;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 import javax.persistence.Entity;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Company.java

@@ -6,7 +6,7 @@
  */
 
 //$Id$
-package org.hibernate.test.annotations;
+package org.hibernate.orm.test.annotations;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.Set;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/CreationTimestampTest.java

@@ -1,4 +1,4 @@
-package org.hibernate.test.annotations;
+package org.hibernate.orm.test.annotations;
 
 import org.hibernate.annotations.CreationTimestamp;
 import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/EntityTest.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.annotations;
+package org.hibernate.orm.test.annotations;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Flight.java

@@ -6,7 +6,7 @@
  */
 
 //$Id$
-package org.hibernate.test.annotations;
+package org.hibernate.orm.test.annotations;
 import java.io.Serializable;
 import java.util.Calendar;
 import java.util.Date;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/InMemoryCreationTimestampNullableColumnTest.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.annotations;
+package org.hibernate.orm.test.annotations;
 
 import java.util.Date;
 import javax.persistence.Column;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/InMemoryUpdateTimestampTest.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.annotations;
+package org.hibernate.orm.test.annotations;
 
 import java.util.Date;
 import java.util.concurrent.atomic.AtomicReference;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/JoinedSubclassTest.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.annotations;
+package org.hibernate.orm.test.annotations;
 
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
@@ -14,6 +14,11 @@ import org.hibernate.orm.test.annotations.inheritance.Carrot;
 import org.hibernate.orm.test.annotations.inheritance.Tomato;
 import org.hibernate.orm.test.annotations.inheritance.Vegetable;
 import org.hibernate.orm.test.annotations.inheritance.VegetablePk;
+
+import org.hibernate.test.annotations.AmericaCupClass;
+import org.hibernate.test.annotations.Boat;
+import org.hibernate.test.annotations.Country;
+import org.hibernate.test.annotations.Ferry;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/SafeMappingTest.java

@@ -6,7 +6,7 @@
  */
 
 //$Id$
-package org.hibernate.test.annotations;
+package org.hibernate.orm.test.annotations;
 import org.junit.Test;
 
 import org.hibernate.AnnotationException;
@@ -16,6 +16,8 @@ import org.hibernate.cfg.Environment;
 import org.hibernate.service.ServiceRegistry;
 import org.hibernate.testing.ServiceRegistryBuilder;
 
+import org.hibernate.test.annotations.IncorrectEntity;
+
 import static org.junit.Assert.fail;
 
 /**

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/SecuredBindingTest.java

@@ -6,7 +6,7 @@
  */
 
 //$Id$
-package org.hibernate.test.annotations;
+package org.hibernate.orm.test.annotations;
 
 import java.util.Properties;
 
@@ -17,6 +17,7 @@ import org.hibernate.cfg.Environment;
 import org.hibernate.service.ServiceRegistry;
 
 import org.hibernate.testing.ServiceRegistryBuilder;
+import org.hibernate.test.annotations.Plane;
 import org.junit.Assert;
 import org.junit.Test;
 

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Sky.java

@@ -6,7 +6,7 @@
  */
 
 //$Id$
-package org.hibernate.test.annotations;
+package org.hibernate.orm.test.annotations;
 import java.io.Serializable;
 import javax.persistence.Column;
 import javax.persistence.Entity;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/UpdateTimeStampInheritanceTest.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.annotations;
+package org.hibernate.orm.test.annotations;
 
 import java.util.Date;
 import java.util.HashSet;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/UpdateTimestampTest.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.annotations;
+package org.hibernate.orm.test.annotations;
 
 import org.hibernate.annotations.UpdateTimestamp;
 import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Address.java

@@ -5,7 +5,7 @@
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
 
-package org.hibernate.test.annotations.beanvalidation;
+package org.hibernate.orm.test.annotations.beanvalidation;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Transient;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationAutoTest.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.annotations.beanvalidation;
+package org.hibernate.orm.test.annotations.beanvalidation;
 
 import java.math.BigDecimal;
 import javax.validation.ConstraintViolationException;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationDisabledTest.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.annotations.beanvalidation;
+package org.hibernate.orm.test.annotations.beanvalidation;
 
 import java.math.BigDecimal;
 import java.util.Map;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationGroupsTest.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.annotations.beanvalidation;
+package org.hibernate.orm.test.annotations.beanvalidation;
 
 import java.lang.annotation.Annotation;
 import java.math.BigDecimal;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationProvidedFactoryTest.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.annotations.beanvalidation;
+package org.hibernate.orm.test.annotations.beanvalidation;
 
 import java.math.BigDecimal;
 import java.util.Locale;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Button.java

@@ -5,7 +5,7 @@
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
 
-package org.hibernate.test.annotations.beanvalidation;
+package org.hibernate.orm.test.annotations.beanvalidation;
 import javax.persistence.Column;
 import javax.persistence.Embeddable;
 import javax.validation.constraints.Max;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Color.java

@@ -5,7 +5,7 @@
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
 
-package org.hibernate.test.annotations.beanvalidation;
+package org.hibernate.orm.test.annotations.beanvalidation;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/CupHolder.java

@@ -5,7 +5,7 @@
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
 
-package org.hibernate.test.annotations.beanvalidation;
+package org.hibernate.orm.test.annotations.beanvalidation;
 import java.math.BigDecimal;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/DDLTest.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.annotations.beanvalidation;
+package org.hibernate.orm.test.annotations.beanvalidation;
 
 import java.util.Map;
 

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/DDLWithoutCallbackTest.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.annotations.beanvalidation;
+package org.hibernate.orm.test.annotations.beanvalidation;
 
 import java.math.BigDecimal;
 import java.util.Map;
@@ -14,8 +14,6 @@ import javax.persistence.Id;
 import javax.persistence.PersistenceException;
 import javax.validation.ConstraintViolationException;
 
-import org.hibernate.Session;
-import org.hibernate.Transaction;
 import org.hibernate.mapping.Column;
 import org.hibernate.mapping.PersistentClass;
 

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Display.java

@@ -5,7 +5,7 @@
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
 
-package org.hibernate.test.annotations.beanvalidation;
+package org.hibernate.orm.test.annotations.beanvalidation;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/DisplayConnector.java

@@ -5,7 +5,7 @@
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
 
-package org.hibernate.test.annotations.beanvalidation;
+package org.hibernate.orm.test.annotations.beanvalidation;
 import javax.persistence.CascadeType;
 import javax.persistence.Embeddable;
 import javax.persistence.ManyToOne;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/HibernateTraversableResolverTest.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.annotations.beanvalidation;
+package org.hibernate.orm.test.annotations.beanvalidation;
 
 import java.math.BigDecimal;
 import javax.validation.ConstraintViolation;
@@ -14,7 +14,6 @@ import org.junit.Test;
 
 import org.hibernate.Session;
 import org.hibernate.Transaction;
-import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MergeNotNullCollectionTest.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.annotations.beanvalidation;
+package org.hibernate.orm.test.annotations.beanvalidation;
 
 import java.util.ArrayList;
 import java.util.List;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MergeNotNullCollectionUsingIdentityTest.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.annotations.beanvalidation;
+package org.hibernate.orm.test.annotations.beanvalidation;
 
 import java.util.ArrayList;
 import java.util.List;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MinMax.java

@@ -5,7 +5,7 @@
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
 
-package org.hibernate.test.annotations.beanvalidation;
+package org.hibernate.orm.test.annotations.beanvalidation;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Music.java

@@ -5,7 +5,7 @@
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
 
-package org.hibernate.test.annotations.beanvalidation;
+package org.hibernate.orm.test.annotations.beanvalidation;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/PowerSupply.java

@@ -5,7 +5,7 @@
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
 
-package org.hibernate.test.annotations.beanvalidation;
+package org.hibernate.orm.test.annotations.beanvalidation;
 import java.math.BigDecimal;
 import javax.persistence.Column;
 import javax.persistence.Entity;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Rock.java

@@ -5,7 +5,7 @@
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
 
-package org.hibernate.test.annotations.beanvalidation;
+package org.hibernate.orm.test.annotations.beanvalidation;
 import javax.persistence.Entity;
 import javax.validation.constraints.NotNull;
 

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Screen.java

@@ -5,7 +5,7 @@
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
 
-package org.hibernate.test.annotations.beanvalidation;
+package org.hibernate.orm.test.annotations.beanvalidation;
 import java.util.HashSet;
 import java.util.Set;
 import javax.persistence.CascadeType;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Strict.java

@@ -5,7 +5,7 @@
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
 
-package org.hibernate.test.annotations.beanvalidation;
+package org.hibernate.orm.test.annotations.beanvalidation;
 
 
 /**

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Tv.java

@@ -1,71 +1,71 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
- */
-
-package org.hibernate.test.annotations.beanvalidation;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.Date;
-import javax.persistence.Embeddable;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Column;
-import javax.validation.Valid;
-import javax.validation.constraints.Future;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
-
-import org.hibernate.validator.constraints.Length;
-
-/**
- * @author Emmanuel Bernard
- * @author Hardy Ferentschik
- */
-@Entity
-public class Tv {
-
-	@Id
-	@Size(max = 2)
-	public String serial;
-
-	@Length(max = 5)
-	public String model;
-
-	public int size;
-
-	@Size(max = 2)
-	public String name;
-
-	@Future
-	public Date expDate;
-
-	@Size(min = 0)
-	public String description;
-
-	@Min(1000)
-	public BigInteger lifetime;
-
-	@NotNull
-	@Valid
-	public Tuner tuner;
-
-	@Valid
-	public Recorder recorder;
-
-	@Embeddable
-	public static class Tuner {
-		@NotNull
-		public String frequency;
-	}
-
-	@Embeddable
-	public static class Recorder {
-		@NotNull
-        @Column(name = "`time`")
-		public BigDecimal time;
-	}
-}
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+ * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ */
+
+package org.hibernate.orm.test.annotations.beanvalidation;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Date;
+import javax.persistence.Embeddable;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Column;
+import javax.validation.Valid;
+import javax.validation.constraints.Future;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
+import org.hibernate.validator.constraints.Length;
+
+/**
+ * @author Emmanuel Bernard
+ * @author Hardy Ferentschik
+ */
+@Entity
+public class Tv {
+
+	@Id
+	@Size(max = 2)
+	public String serial;
+
+	@Length(max = 5)
+	public String model;
+
+	public int size;
+
+	@Size(max = 2)
+	public String name;
+
+	@Future
+	public Date expDate;
+
+	@Size(min = 0)
+	public String description;
+
+	@Min(1000)
+	public BigInteger lifetime;
+
+	@NotNull
+	@Valid
+	public Tuner tuner;
+
+	@Valid
+	public Recorder recorder;
+
+	@Embeddable
+	public static class Tuner {
+		@NotNull
+		public String frequency;
+	}
+
+	@Embeddable
+	public static class Recorder {
+		@NotNull
+        @Column(name = "`time`")
+		public BigDecimal time;
+	}
+}

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/TvOwner.java

@@ -5,7 +5,7 @@
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
 
-package org.hibernate.test.annotations.beanvalidation;
+package org.hibernate.orm.test.annotations.beanvalidation;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/bytecode/Hammer.java

@@ -6,7 +6,7 @@
  */
 
 //$Id$
-package org.hibernate.test.annotations.bytecode;
+package org.hibernate.orm.test.annotations.bytecode;
 
 
 /**

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/bytecode/ProxyBreakingTest.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.annotations.bytecode;
+package org.hibernate.orm.test.annotations.bytecode;
 
 import org.hibernate.Hibernate;
 import org.hibernate.Session;
@@ -39,7 +39,7 @@ public class ProxyBreakingTest extends BaseCoreFunctionalTestCase {
 	@Override
 	protected String[] getOrmXmlFiles() {
 		return new String[] {
-				"org/hibernate/test/annotations/bytecode/Hammer.hbm.xml"
+				"org/hibernate/orm/test/annotations/bytecode/Hammer.hbm.xml"
 		};
 	}
 }

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/bytecode/Tool.java

@@ -6,7 +6,7 @@
  */
 
 //$Id$
-package org.hibernate.test.annotations.bytecode;
+package org.hibernate.orm.test.annotations.bytecode;
 
 
 /**

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/configuration/ConfigurationTest.java

@@ -6,7 +6,7 @@
  */
 
 //$Id$
-package org.hibernate.test.annotations.configuration;
+package org.hibernate.orm.test.annotations.configuration;
 
 import org.hibernate.cfg.Configuration;
 
@@ -21,8 +21,8 @@ public class ConfigurationTest  {
 	public void testMixPackageAndResourceOrdering() throws Exception {
 		try {
 			Configuration config = new Configuration();
-			config.addResource( "org/hibernate/test/annotations/configuration/orm.xml" );
-			config.addPackage( "org.hibernate.test.annotations.configuration" );
+			config.addResource( "org/hibernate/orm/test/annotations/configuration/orm.xml" );
+			config.addPackage( "org.hibernate.orm/test.annotations.configuration" );
 		}
 		catch( Exception e ) {
             Assert.fail( "Processing package first when ORM.xml is used should not fail" );

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/configuration/package-info.java

@@ -5,6 +5,6 @@
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
 @GenericGenerator(name = "myGenerator", strategy = "sequence")
-package org.hibernate.test.annotations.configuration;
+package org.hibernate.orm.test.annotations.configuration;
 import org.hibernate.annotations.GenericGenerator;
 

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/Dependent.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.annotations.derivedidentities.e1.b;
+package org.hibernate.orm.test.annotations.derivedidentities.e1.b;
 import javax.persistence.EmbeddedId;
 import javax.persistence.Entity;
 import javax.persistence.JoinColumn;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/DependentId.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.annotations.derivedidentities.e1.b;
+package org.hibernate.orm.test.annotations.derivedidentities.e1.b;
 import java.io.Serializable;
 import javax.persistence.Embeddable;
 

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/DerivedIdentitySimpleParentEmbeddedIdDepTest.java

@@ -4,12 +4,12 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.annotations.derivedidentities.e1.b;
+package org.hibernate.orm.test.annotations.derivedidentities.e1.b;
 
 import org.hibernate.Session;
 
 import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase;
-import org.hibernate.test.util.SchemaUtil;
+import org.hibernate.orm.test.util.SchemaUtil;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/Employee.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.annotations.derivedidentities.e1.c;
+package org.hibernate.orm.test.annotations.derivedidentities.e1.b;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/ExclusiveDependent.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.annotations.derivedidentities.e1.b;
+package org.hibernate.orm.test.annotations.derivedidentities.e1.b;
 import javax.persistence.EmbeddedId;
 import javax.persistence.Entity;
 import javax.persistence.JoinColumn;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/Customer.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.annotations.derivedidentities.e1.b.specjmapid;
+package org.hibernate.orm.test.annotations.derivedidentities.e1.b.specjmapid;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.ArrayList;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/CustomerInventory.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.annotations.derivedidentities.e1.b.specjmapid;
+package org.hibernate.orm.test.annotations.derivedidentities.e1.b.specjmapid;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Comparator;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/CustomerInventoryPK.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.annotations.derivedidentities.e1.b.specjmapid;
+package org.hibernate.orm.test.annotations.derivedidentities.e1.b.specjmapid;
 import java.io.Serializable;
 
 

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/IdMapManyToOneSpecjTest.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.annotations.derivedidentities.e1.b.specjmapid;
+package org.hibernate.orm.test.annotations.derivedidentities.e1.b.specjmapid;
 
 import java.math.BigDecimal;
 import java.util.List;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/Item.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.annotations.derivedidentities.e1.b.specjmapid;
+package org.hibernate.orm.test.annotations.derivedidentities.e1.b.specjmapid;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import javax.persistence.Column;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CompositeKeyDeleteTest.java

@@ -5,7 +5,7 @@
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
 
-package org.hibernate.test.annotations.derivedidentities.e1.b.specjmapid.lazy;
+package org.hibernate.orm.test.annotations.derivedidentities.e1.b.specjmapid.lazy;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -14,12 +14,18 @@ import junit.framework.Assert;
 
 import org.hibernate.Session;
 import org.hibernate.Transaction;
-import org.hibernate.test.annotations.derivedidentities.e1.b.specjmapid.Item;
+import org.hibernate.orm.test.annotations.derivedidentities.e1.b.specjmapid.Item;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 import org.junit.Test;
 
 public class CompositeKeyDeleteTest extends BaseCoreFunctionalTestCase {
 
+   @Override
+   protected String getBaseForMappings() {
+      return "org/hibernate/orm/test/";
+   }
+
+   @Override
    public String[] getMappings() {
       return new String[] { "annotations/derivedidentities/e1/b/specjmapid/lazy/order_orm.xml" };
    }

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerInventoryTwo.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.annotations.derivedidentities.e1.b.specjmapid.lazy;
+package org.hibernate.orm.test.annotations.derivedidentities.e1.b.specjmapid.lazy;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -25,7 +25,7 @@ import javax.persistence.Table;
 import javax.persistence.TableGenerator;
 import javax.persistence.Version;
 
-import org.hibernate.test.annotations.derivedidentities.e1.b.specjmapid.Item;
+import org.hibernate.orm.test.annotations.derivedidentities.e1.b.specjmapid.Item;
 
 @NamedQueries({ @NamedQuery(name = "CustomerInventoryTwo.selectAll", query = "select a from CustomerInventoryTwo a") })
 @SuppressWarnings("serial")

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerInventoryTwoPK.java

@@ -5,7 +5,7 @@
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
 
-package org.hibernate.test.annotations.derivedidentities.e1.b.specjmapid.lazy;
+package org.hibernate.orm.test.annotations.derivedidentities.e1.b.specjmapid.lazy;
 
 import java.io.Serializable;
 

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerTwo.java

@@ -5,7 +5,7 @@
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
 
-package org.hibernate.test.annotations.derivedidentities.e1.b.specjmapid.lazy;
+package org.hibernate.orm.test.annotations.derivedidentities.e1.b.specjmapid.lazy;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -26,7 +26,7 @@ import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import javax.persistence.Version;
 
-import org.hibernate.test.annotations.derivedidentities.e1.b.specjmapid.Item;
+import org.hibernate.orm.test.annotations.derivedidentities.e1.b.specjmapid.Item;
 
 @SuppressWarnings("serial")
 @NamedQueries({

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/hbm_order.xml

@@ -11,7 +11,7 @@
 
 <hibernate-mapping>
  
-    <class name="org.hibernate.test.annotations.derivedidentities.e1.b.specjmapid.lazy.CustomerTwo" mutable="true" table="O_CUSTOMER">
+    <class name="org.hibernate.orm.test.annotations.derivedidentities.e1.b.specjmapid.lazy.CustomerTwo" mutable="true" table="O_CUSTOMER">
         <cache usage="transactional" include="all"/>
         <id name="id" type="java.lang.Integer" column="C_ID" access="field">
             <generator class="assigned"/>
@@ -31,7 +31,7 @@
             <key>
                 <column name="CI_CUSTOMERID" not-null="true"/>
             </key>
-            <one-to-many class="org.hibernate.test.annotations.derivedidentities.e1.b.specjmapid.lazy.CustomerInventoryTwo"/>
+            <one-to-many class="org.hibernate.orm.test.annotations.derivedidentities.e1.b.specjmapid.lazy.CustomerInventoryTwo"/>
         </bag>
         
     </class>

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/order_orm.xml

@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-  ~ Hibernate, Relational Persistence for Idiomatic Java
-  ~
-  ~ License: GNU Lesser General Public License (LGPL), version 2.1 or later.
-  ~ See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
-  -->
-<entity-mappings
-	xmlns="http://java.sun.com/xml/ns/persistence/orm"
-	version="2.0">
-      
-      <entity class="org.hibernate.test.annotations.derivedidentities.e1.b.specjmapid.lazy.CustomerTwo">
-         <attributes>
-            <one-to-many name="customerInventories" mapped-by="customer" fetch="EAGER">
-                <cascade>
-                    <cascade-all/>
-                </cascade>
-            </one-to-many>
-         </attributes>
-      </entity>
-      <entity class="org.hibernate.test.annotations.derivedidentities.e1.b.specjmapid.lazy.CustomerInventoryTwo">
-         <attributes>
-            <many-to-one name="vehicle" fetch="EAGER">
-                <join-column name="CI_ITEMID"/>
-                <cascade>
-                    <cascade-merge/>
-                </cascade>
-            </many-to-one>
-
-            <many-to-one name="customer" fetch="EAGER">
-                <join-column name="CI_CUSTOMERID" insertable="false" nullable="false"/>
-                <cascade>
-                    <cascade-merge/>
-                </cascade>
-            </many-to-one>
-
-         </attributes>
-      </entity>
-</entity-mappings>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+  ~ Hibernate, Relational Persistence for Idiomatic Java
+  ~
+  ~ License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+  ~ See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+  -->
+<entity-mappings
+	xmlns="http://java.sun.com/xml/ns/persistence/orm"
+	version="2.0">
+      
+      <entity class="org.hibernate.orm.test.annotations.derivedidentities.e1.b.specjmapid.lazy.CustomerTwo">
+         <attributes>
+            <one-to-many name="customerInventories" mapped-by="customer" fetch="EAGER">
+                <cascade>
+                    <cascade-all/>
+                </cascade>
+            </one-to-many>
+         </attributes>
+      </entity>
+      <entity class="org.hibernate.orm.test.annotations.derivedidentities.e1.b.specjmapid.lazy.CustomerInventoryTwo">
+         <attributes>
+            <many-to-one name="vehicle" fetch="EAGER">
+                <join-column name="CI_ITEMID"/>
+                <cascade>
+                    <cascade-merge/>
+                </cascade>
+            </many-to-one>
+
+            <many-to-one name="customer" fetch="EAGER">
+                <join-column name="CI_CUSTOMERID" insertable="false" nullable="false"/>
+                <cascade>
+                    <cascade-merge/>
+                </cascade>
+            </many-to-one>
+
+         </attributes>
+      </entity>
+</entity-mappings>

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/c/Dependent.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.annotations.derivedidentities.e1.c;
+package org.hibernate.orm.test.annotations.derivedidentities.e1.c;
 import java.io.Serializable;
 import javax.persistence.Entity;
 import javax.persistence.Id;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/c/DerivedIdentitySimpleParentEmbeddedDepTest.java

@@ -4,12 +4,12 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.annotations.derivedidentities.e1.c;
+package org.hibernate.orm.test.annotations.derivedidentities.e1.c;
 
 import org.hibernate.Session;
 
 import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase;
-import org.hibernate.test.util.SchemaUtil;
+import org.hibernate.orm.test.util.SchemaUtil;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/c/Employee.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.annotations.derivedidentities.e1.b;
+package org.hibernate.orm.test.annotations.derivedidentities.e1.c;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/b/DerivedIdentitySimpleParentSimpleDepMapsIdTest.java

@@ -4,14 +4,14 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.annotations.derivedidentities.e4.b;
+package org.hibernate.orm.test.annotations.derivedidentities.e4.b;
 
 import java.util.Date;
 
 import org.hibernate.Session;
 
 import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase;
-import org.hibernate.test.util.SchemaUtil;
+import org.hibernate.orm.test.util.SchemaUtil;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/b/FinancialHistory.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.annotations.derivedidentities.e4.b;
+package org.hibernate.orm.test.annotations.derivedidentities.e4.b;
 import java.util.Date;
 import javax.persistence.Entity;
 import javax.persistence.Id;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/b/MedicalHistory.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.annotations.derivedidentities.e4.b;
+package org.hibernate.orm.test.annotations.derivedidentities.e4.b;
 import java.util.Date;
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/b/Person.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.annotations.derivedidentities.e4.b;
+package org.hibernate.orm.test.annotations.derivedidentities.e4.b;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/c/ForeignGeneratorViaMapsIdTest.java

@@ -4,12 +4,12 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.annotations.derivedidentities.e5.c;
+package org.hibernate.orm.test.annotations.derivedidentities.e5.c;
 
 import org.hibernate.Session;
 
 import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase;
-import org.hibernate.test.util.SchemaUtil;
+import org.hibernate.orm.test.util.SchemaUtil;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/c/MedicalHistory.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.annotations.derivedidentities.e5.c;
+package org.hibernate.orm.test.annotations.derivedidentities.e5.c;
 import java.io.Serializable;
 import javax.persistence.Entity;
 import javax.persistence.Id;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/c/Person.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.annotations.derivedidentities.e5.c;
+package org.hibernate.orm.test.annotations.derivedidentities.e5.c;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/duplicatedgenerator/DuplicateTest.java

@@ -6,13 +6,13 @@
  */
 
 //$Id$
-package org.hibernate.test.annotations.duplicatedgenerator;
+package org.hibernate.orm.test.annotations.duplicatedgenerator;
 
-import org.hibernate.AnnotationException;
 import org.hibernate.DuplicateMappingException;
 import org.hibernate.SessionFactory;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.cfg.Environment;
+import org.hibernate.orm.test.annotations.Company;
 import org.hibernate.service.ServiceRegistry;
 
 import org.hibernate.testing.ServiceRegistryBuilder;
@@ -31,10 +31,10 @@ public class DuplicateTest  {
 		SessionFactory sf = null;
 		try {
 			cfg.addAnnotatedClass( Flight.class );
-			cfg.addAnnotatedClass( org.hibernate.test.annotations.Flight.class );
-			cfg.addAnnotatedClass( org.hibernate.test.annotations.Company.class );
-			cfg.addResource( "org/hibernate/test/annotations/orm.xml" );
-			cfg.addResource( "org/hibernate/test/annotations/duplicatedgenerator/orm.xml" );
+			cfg.addAnnotatedClass( org.hibernate.orm.test.annotations.Flight.class );
+			cfg.addAnnotatedClass( Company.class );
+			cfg.addResource( "org/hibernate/orm/test/annotations/orm.xml" );
+			cfg.addResource( "org/hibernate/orm/test/annotations/duplicatedgenerator/orm.xml" );
 			serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( cfg.getProperties() );
 			sf = cfg.buildSessionFactory( serviceRegistry );
             Assert.fail( "Should not be able to map the same entity name twice" );

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/duplicatedgenerator/Flight.java

@@ -6,7 +6,7 @@
  */
 
 //$Id$
-package org.hibernate.test.annotations.duplicatedgenerator;
+package org.hibernate.orm.test.annotations.duplicatedgenerator;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Address.java

@@ -6,7 +6,7 @@
  */
 
 //$Id$
-package org.hibernate.test.annotations.entity;
+package org.hibernate.orm.test.annotations.entity;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/BasicHibernateAnnotationsTest.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.annotations.entity;
+package org.hibernate.orm.test.annotations.entity;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -32,6 +32,7 @@ import org.hibernate.testing.RequiresDialectFeature;
 import org.hibernate.testing.ServiceRegistryBuilder;
 import org.hibernate.testing.SkipForDialect;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
@@ -44,6 +45,8 @@ import static org.junit.Assert.fail;
 /**
  * @author Emmanuel Bernard
  */
+// todo (6.0): needs a composite user type mechanism e.g. by providing a custom ComponentTuplizer/Instantiator
+@Ignore( "Missing support for composite user types" )
 public class BasicHibernateAnnotationsTest extends BaseCoreFunctionalTestCase {
 	@Override
 	protected boolean isCleanupTestDataRequired() {
@@ -665,7 +668,7 @@ public class BasicHibernateAnnotationsTest extends BaseCoreFunctionalTestCase {
 	public void testFormula() throws Exception {
 		Session s = openSession();
 		Transaction tx = s.beginTransaction();
-		org.hibernate.test.annotations.entity.Flight airFrance = new Flight();
+		Flight airFrance = new Flight();
 		airFrance.setId( new Long( 747 ) );
 		airFrance.setMaxAltitude( 10000 );
 		s.persist( airFrance );
@@ -795,7 +798,7 @@ public class BasicHibernateAnnotationsTest extends BaseCoreFunctionalTestCase {
 	@Override
 	protected String[] getAnnotatedPackages() {
 		return new String[]{
-				"org.hibernate.test.annotations.entity"
+				"org.hibernate.orm.test.annotations.entity"
 		};
 	}
 

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Bid.java

@@ -6,7 +6,7 @@
  */
 
 //$Id$
-package org.hibernate.test.annotations.entity;
+package org.hibernate.orm.test.annotations.entity;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Car.java

@@ -5,7 +5,7 @@
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
 
-package org.hibernate.test.annotations.entity;
+package org.hibernate.orm.test.annotations.entity;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/CasterStringType.java

@@ -6,7 +6,7 @@
  */
 
 //$Id$
-package org.hibernate.test.annotations.entity;
+package org.hibernate.orm.test.annotations.entity;
 
 import java.io.Serializable;
 import java.sql.PreparedStatement;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/CommunityBid.java

@@ -6,7 +6,7 @@
  */
 
 //$Id$
-package org.hibernate.test.annotations.entity;
+package org.hibernate.orm.test.annotations.entity;
 import javax.persistence.Entity;
 
 /**

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/ContactDetails.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.annotations.entity;
+package org.hibernate.orm.test.annotations.entity;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Country.java

@@ -6,7 +6,7 @@
  */
 
 //$Id$
-package org.hibernate.test.annotations.entity;
+package org.hibernate.orm.test.annotations.entity;
 import java.io.Serializable;
 
 /**

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Doctor.java

@@ -6,7 +6,7 @@
  */
 
 //$Id$
-package org.hibernate.test.annotations.entity;
+package org.hibernate.orm.test.annotations.entity;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Drill.java

@@ -5,7 +5,7 @@
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
 
-package org.hibernate.test.annotations.entity;
+package org.hibernate.orm.test.annotations.entity;
 import javax.persistence.DiscriminatorColumn;
 import javax.persistence.DiscriminatorType;
 import javax.persistence.Entity;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/FirstName.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.annotations.entity;
+package org.hibernate.orm.test.annotations.entity;
 import javax.persistence.MappedSuperclass;
 
 import org.hibernate.annotations.Parameter;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Flight.java

@@ -6,7 +6,7 @@
  */
 
 //$Id$
-package org.hibernate.test.annotations.entity;
+package org.hibernate.orm.test.annotations.entity;
 import java.io.Serializable;
 import javax.persistence.Entity;
 import javax.persistence.Id;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Forest.java

@@ -6,7 +6,7 @@
  */
 
 //$Id$
-package org.hibernate.test.annotations.entity;
+package org.hibernate.orm.test.annotations.entity;
 
 import java.util.Set;
 import javax.persistence.ElementCollection;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Forest2.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.annotations.entity;
+package org.hibernate.orm.test.annotations.entity;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/FormalLastName.java

@@ -7,7 +7,7 @@
 
 //$Id: BasicHibernateAnnotationsTest.java 17531 2009-09-22 17:43:48Z epbernard $
 
-package org.hibernate.test.annotations.entity;
+package org.hibernate.orm.test.annotations.entity;
 import javax.persistence.Embedded;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/HibernateAnnotationMappingTest.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.annotations.entity;
+package org.hibernate.orm.test.annotations.entity;
 
 import static org.junit.Assert.fail;
 
@@ -27,7 +27,7 @@ public class HibernateAnnotationMappingTest extends BaseUnitTestCase {
 	public void testUniqueConstraintAnnotationOnNaturalIds() throws Exception {
 		Configuration configuration = new Configuration();
 		configuration.setProperty( Environment.HBM2DDL_AUTO, "create-drop" );
-		configuration.addAnnotatedClass(Month.class);
+		configuration.addAnnotatedClass( Month.class);
 		SessionFactory sf = null;
 		try {
 			sf = configuration.buildSessionFactory();

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Java5FeaturesTest.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.annotations.entity;
+package org.hibernate.orm.test.annotations.entity;
 
 import org.junit.Test;
 

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/LastName.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.annotations.entity;
+package org.hibernate.orm.test.annotations.entity;
 import javax.persistence.Embeddable;
 
 import org.hibernate.annotations.Parameter;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Length.java

@@ -6,7 +6,7 @@
  */
 
 //$Id$
-package org.hibernate.test.annotations.entity;
+package org.hibernate.orm.test.annotations.entity;
 
 
 /**

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/LocalContactDetails.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.annotations.entity;
+package org.hibernate.orm.test.annotations.entity;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/MonetaryAmount.java

@@ -6,7 +6,7 @@
  */
 
 //$Id$
-package org.hibernate.test.annotations.entity;
+package org.hibernate.orm.test.annotations.entity;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Currency;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Month.java

@@ -5,7 +5,7 @@
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
 
-package org.hibernate.test.annotations.entity;
+package org.hibernate.orm.test.annotations.entity;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;