Hibernate SVN: r19099 - validator/trunk.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2010-03-24 11:08:07 -0400 (Wed, 24 Mar 2010)
New Revision: 19099
Modified:
validator/trunk/pom.xml
Log:
reverted the distribution management section
Modified: validator/trunk/pom.xml
===================================================================
--- validator/trunk/pom.xml 2010-03-24 14:58:27 UTC (rev 19098)
+++ validator/trunk/pom.xml 2010-03-24 15:08:07 UTC (rev 19099)
@@ -321,8 +321,7 @@
<!-- It is anticipated that ${maven.repository.root} be set in user's settings.xml -->
<!-- todo : replace this with direct svn access once the svnkit providers are available -->
<id>repository.jboss.org</id>
- <!--url>file://${maven.repository.root}</url-->
- <url>file:///Users/hardy/tmp/snapshot/org/hibernate</url>
+ <url>file://${maven.repository.root}</url>
</repository>
<snapshotRepository>
<id>snapshots.jboss.org</id>
14 years, 1 month
- 1
- 0
Hibernate SVN: r19098 - in validator/trunk: hibernate-validator and 4 other directories.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2010-03-24 10:58:27 -0400 (Wed, 24 Mar 2010)
New Revision: 19098
Modified:
validator/trunk/hibernate-validator-annotation-processor/pom.xml
validator/trunk/hibernate-validator-archetype/pom.xml
validator/trunk/hibernate-validator-legacy/pom.xml
validator/trunk/hibernate-validator-tck-runner/pom.xml
validator/trunk/hibernate-validator/pom.xml
validator/trunk/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: validator/trunk/hibernate-validator/pom.xml
===================================================================
--- validator/trunk/hibernate-validator/pom.xml 2010-03-24 14:58:05 UTC (rev 19097)
+++ validator/trunk/hibernate-validator/pom.xml 2010-03-24 14:58:27 UTC (rev 19098)
@@ -2,7 +2,7 @@
<parent>
<artifactId>hibernate-validator-parent</artifactId>
<groupId>org.hibernate</groupId>
- <version>4.1.0.Beta1</version>
+ <version>4.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: validator/trunk/hibernate-validator-annotation-processor/pom.xml
===================================================================
--- validator/trunk/hibernate-validator-annotation-processor/pom.xml 2010-03-24 14:58:05 UTC (rev 19097)
+++ validator/trunk/hibernate-validator-annotation-processor/pom.xml 2010-03-24 14:58:27 UTC (rev 19098)
@@ -4,7 +4,7 @@
<parent>
<artifactId>hibernate-validator-parent</artifactId>
<groupId>org.hibernate</groupId>
- <version>4.1.0.Beta1</version>
+ <version>4.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.hibernate</groupId>
Modified: validator/trunk/hibernate-validator-archetype/pom.xml
===================================================================
--- validator/trunk/hibernate-validator-archetype/pom.xml 2010-03-24 14:58:05 UTC (rev 19097)
+++ validator/trunk/hibernate-validator-archetype/pom.xml 2010-03-24 14:58:27 UTC (rev 19098)
@@ -4,7 +4,7 @@
<parent>
<artifactId>hibernate-validator-parent</artifactId>
<groupId>org.hibernate</groupId>
- <version>4.1.0.Beta1</version>
+ <version>4.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.hibernate</groupId>
Modified: validator/trunk/hibernate-validator-legacy/pom.xml
===================================================================
--- validator/trunk/hibernate-validator-legacy/pom.xml 2010-03-24 14:58:05 UTC (rev 19097)
+++ validator/trunk/hibernate-validator-legacy/pom.xml 2010-03-24 14:58:27 UTC (rev 19098)
@@ -4,13 +4,13 @@
<parent>
<artifactId>hibernate-validator-parent</artifactId>
<groupId>org.hibernate</groupId>
- <version>4.1.0.Beta1</version>
+ <version>4.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hibernate-validator-legacy</artifactId>
<packaging>jar</packaging>
<name>Hibernate Validator Legacy</name>
- <version>4.1.0.Beta1</version>
+ <version>3.1.0.GA</version>
<url>http://validator.hibernate.org</url>
<licenses>
<license>
Modified: validator/trunk/hibernate-validator-tck-runner/pom.xml
===================================================================
--- validator/trunk/hibernate-validator-tck-runner/pom.xml 2010-03-24 14:58:05 UTC (rev 19097)
+++ validator/trunk/hibernate-validator-tck-runner/pom.xml 2010-03-24 14:58:27 UTC (rev 19098)
@@ -3,7 +3,7 @@
<parent>
<artifactId>hibernate-validator-parent</artifactId>
<groupId>org.hibernate</groupId>
- <version>4.1.0.Beta1</version>
+ <version>4.1.0-SNAPSHOT</version>
</parent>
<artifactId>hibernate-validator-tck-runner</artifactId>
<name>Hibernate Validator TCK Runner</name>
Modified: validator/trunk/pom.xml
===================================================================
--- validator/trunk/pom.xml 2010-03-24 14:58:05 UTC (rev 19097)
+++ validator/trunk/pom.xml 2010-03-24 14:58:27 UTC (rev 19098)
@@ -3,7 +3,7 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator-parent</artifactId>
<packaging>pom</packaging>
- <version>4.1.0.Beta1</version>
+ <version>4.1.0-SNAPSHOT</version>
<name>Hibernate Validator Aggregator</name>
<url>http://validator.hibernate.org</url>
@@ -311,8 +311,8 @@
</licenses>
<scm>
- <connection>scm:svn:https://svn.jboss.org/repos/hibernate/validator/tags/v4_1_0_Beta1</connection>
- <url>http://fisheye.jboss.org/browse/Hibernate/validator/tags/v4_1_0_Beta1</url>
+ <connection>scm:svn:https://svn.jboss.org/repos/hibernate/validator/trunk</connection>
+ <url>http://fisheye.jboss.org/browse/Hibernate/validator/trunk</url>
</scm>
<distributionManagement>
14 years, 1 month
- 1
- 0
Hibernate SVN: r19097 - validator/tags.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2010-03-24 10:58:05 -0400 (Wed, 24 Mar 2010)
New Revision: 19097
Added:
validator/tags/v4_1_0_Beta1/
Log:
[maven-scm] copy for tag v4_1_0_Beta1
Copied: validator/tags/v4_1_0_Beta1 (from rev 19096, validator/trunk)
14 years, 1 month
- 1
- 0
Hibernate SVN: r19096 - in validator/trunk: hibernate-validator and 4 other directories.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2010-03-24 10:57:40 -0400 (Wed, 24 Mar 2010)
New Revision: 19096
Modified:
validator/trunk/hibernate-validator-annotation-processor/pom.xml
validator/trunk/hibernate-validator-archetype/pom.xml
validator/trunk/hibernate-validator-legacy/pom.xml
validator/trunk/hibernate-validator-tck-runner/pom.xml
validator/trunk/hibernate-validator/pom.xml
validator/trunk/pom.xml
Log:
[maven-release-plugin] prepare release v4_1_0_Beta1
Modified: validator/trunk/hibernate-validator/pom.xml
===================================================================
--- validator/trunk/hibernate-validator/pom.xml 2010-03-24 14:37:56 UTC (rev 19095)
+++ validator/trunk/hibernate-validator/pom.xml 2010-03-24 14:57:40 UTC (rev 19096)
@@ -1,10 +1,8 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>hibernate-validator-parent</artifactId>
<groupId>org.hibernate</groupId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.0.Beta1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -184,7 +182,7 @@
</relocation>
</relocations>
<transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer"/>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer" />
</transformers>
</configuration>
</execution>
Modified: validator/trunk/hibernate-validator-annotation-processor/pom.xml
===================================================================
--- validator/trunk/hibernate-validator-annotation-processor/pom.xml 2010-03-24 14:37:56 UTC (rev 19095)
+++ validator/trunk/hibernate-validator-annotation-processor/pom.xml 2010-03-24 14:57:40 UTC (rev 19096)
@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>hibernate-validator-parent</artifactId>
<groupId>org.hibernate</groupId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.0.Beta1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.hibernate</groupId>
Modified: validator/trunk/hibernate-validator-archetype/pom.xml
===================================================================
--- validator/trunk/hibernate-validator-archetype/pom.xml 2010-03-24 14:37:56 UTC (rev 19095)
+++ validator/trunk/hibernate-validator-archetype/pom.xml 2010-03-24 14:57:40 UTC (rev 19096)
@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>hibernate-validator-parent</artifactId>
<groupId>org.hibernate</groupId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.0.Beta1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.hibernate</groupId>
@@ -61,6 +59,10 @@
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-archetype-plugin</artifactId>
+ </plugin>
</plugins>
</build>
<repositories>
Modified: validator/trunk/hibernate-validator-legacy/pom.xml
===================================================================
--- validator/trunk/hibernate-validator-legacy/pom.xml 2010-03-24 14:37:56 UTC (rev 19095)
+++ validator/trunk/hibernate-validator-legacy/pom.xml 2010-03-24 14:57:40 UTC (rev 19096)
@@ -1,18 +1,16 @@
<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>hibernate-validator-parent</artifactId>
<groupId>org.hibernate</groupId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.0.Beta1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hibernate-validator-legacy</artifactId>
<packaging>jar</packaging>
<name>Hibernate Validator Legacy</name>
- <version>3.1.0.GA</version>
+ <version>4.1.0.Beta1</version>
<url>http://validator.hibernate.org</url>
<licenses>
<license>
Modified: validator/trunk/hibernate-validator-tck-runner/pom.xml
===================================================================
--- validator/trunk/hibernate-validator-tck-runner/pom.xml 2010-03-24 14:37:56 UTC (rev 19095)
+++ validator/trunk/hibernate-validator-tck-runner/pom.xml 2010-03-24 14:57:40 UTC (rev 19096)
@@ -1,11 +1,9 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>hibernate-validator-parent</artifactId>
<groupId>org.hibernate</groupId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.0.Beta1</version>
</parent>
<artifactId>hibernate-validator-tck-runner</artifactId>
<name>Hibernate Validator TCK Runner</name>
@@ -58,7 +56,7 @@
<properties>
<jboss.home>/opt/java/jboss-5.1.0.GA</jboss.home>
<validation.provider>org.hibernate.validator.HibernateValidator</validation.provider>
- <remote.debug/>
+ <remote.debug />
</properties>
<build>
Modified: validator/trunk/pom.xml
===================================================================
--- validator/trunk/pom.xml 2010-03-24 14:37:56 UTC (rev 19095)
+++ validator/trunk/pom.xml 2010-03-24 14:57:40 UTC (rev 19096)
@@ -1,11 +1,9 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator-parent</artifactId>
<packaging>pom</packaging>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.0.Beta1</version>
<name>Hibernate Validator Aggregator</name>
<url>http://validator.hibernate.org</url>
@@ -283,7 +281,12 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>2.0.1</version>
- </plugin>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-archetype-plugin</artifactId>
+ <version>2.0-alpha-4</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
@@ -308,8 +311,8 @@
</licenses>
<scm>
- <connection>scm:svn:https://svn.jboss.org/repos/hibernate/validator/trunk</connection>
- <url>http://fisheye.jboss.org/browse/Hibernate/validator/trunk</url>
+ <connection>scm:svn:https://svn.jboss.org/repos/hibernate/validator/tags/v4_1_0_Beta1</connection>
+ <url>http://fisheye.jboss.org/browse/Hibernate/validator/tags/v4_1_0_Beta1</url>
</scm>
<distributionManagement>
@@ -318,7 +321,8 @@
<!-- It is anticipated that ${maven.repository.root} be set in user's settings.xml -->
<!-- todo : replace this with direct svn access once the svnkit providers are available -->
<id>repository.jboss.org</id>
- <url>file://${maven.repository.root}</url>
+ <!--url>file://${maven.repository.root}</url-->
+ <url>file:///Users/hardy/tmp/snapshot/org/hibernate</url>
</repository>
<snapshotRepository>
<id>snapshots.jboss.org</id>
14 years, 1 month
- 1
- 0
Hibernate SVN: r19095 - in core/trunk: core/src/main/java/org/hibernate/dialect/lock and 7 other directories.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2010-03-24 10:37:56 -0400 (Wed, 24 Mar 2010)
New Revision: 19095
Added:
core/trunk/core/src/main/java/org/hibernate/dialect/lock/AbstractSelectLockingStrategy.java
Modified:
core/trunk/core/src/main/java/org/hibernate/dialect/Dialect.java
core/trunk/core/src/main/java/org/hibernate/dialect/HSQLDialect.java
core/trunk/core/src/main/java/org/hibernate/dialect/lock/LockingStrategy.java
core/trunk/core/src/main/java/org/hibernate/dialect/lock/PessimisticReadSelectLockingStrategy.java
core/trunk/core/src/main/java/org/hibernate/dialect/lock/PessimisticWriteSelectLockingStrategy.java
core/trunk/core/src/main/java/org/hibernate/dialect/lock/SelectLockingStrategy.java
core/trunk/core/src/main/java/org/hibernate/engine/QueryParameters.java
core/trunk/core/src/main/java/org/hibernate/event/def/DefaultLoadEventListener.java
core/trunk/core/src/main/java/org/hibernate/loader/Loader.java
core/trunk/core/src/main/java/org/hibernate/loader/entity/AbstractEntityLoader.java
core/trunk/core/src/main/java/org/hibernate/loader/entity/BatchingEntityLoader.java
core/trunk/core/src/main/java/org/hibernate/loader/entity/EntityLoader.java
core/trunk/core/src/main/java/org/hibernate/loader/entity/UniqueEntityLoader.java
core/trunk/core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
core/trunk/core/src/main/java/org/hibernate/persister/entity/NamedQueryLoader.java
core/trunk/entitymanager/src/main/java/org/hibernate/ejb/AbstractEntityManagerImpl.java
core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/lock/LockTest.java
Log:
HHH-5009 - Support NOWAIT for "SELECT ... FOR UPDATE" with JPA interfaces
Modified: core/trunk/core/src/main/java/org/hibernate/dialect/Dialect.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/dialect/Dialect.java 2010-03-24 12:18:25 UTC (rev 19094)
+++ core/trunk/core/src/main/java/org/hibernate/dialect/Dialect.java 2010-03-24 14:37:56 UTC (rev 19095)
@@ -1,10 +1,10 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
+ * 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 Middleware LLC.
+ * 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
@@ -20,7 +20,6 @@
* Free Software Foundation, Inc.
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
- *
*/
package org.hibernate.dialect;
@@ -943,6 +942,34 @@
// lock acquisition support ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/**
+ * Informational metadata about whether this dialect is known to support
+ * specifying timeouts for requested lock acquisitions.
+ *
+ * @return True is this dialect supports specifying lock timeouts.
+ */
+ public boolean supportsLockTimeouts() {
+ return true;
+
+ }
+
+ /**
+ * If this dialect supports specifying lock timeouts, are those timeouts
+ * rendered into the <tt>SQL</tt> string as parameters. The implication
+ * is that Hibernate will need to bind the timeout value as a parameter
+ * in the {@link java.sql.PreparedStatement}. If true, the param position
+ * is always handled as the last parameter; if the dialect specifies the
+ * lock timeout elsewhere in the <tt>SQL</tt> statement then the timeout
+ * value should be directly rendered into the statement and this method
+ * should return false.
+ *
+ * @return True if the lock timeout is rendered into the <tt>SQL</tt>
+ * string as a parameter; false otherwise.
+ */
+ public boolean isLockTimeoutParameterized() {
+ return false;
+ }
+
+ /**
* Get a strategy instance which knows how to acquire a database-level lock
* of the specified mode for this dialect.
*
Modified: core/trunk/core/src/main/java/org/hibernate/dialect/HSQLDialect.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/dialect/HSQLDialect.java 2010-03-24 12:18:25 UTC (rev 19094)
+++ core/trunk/core/src/main/java/org/hibernate/dialect/HSQLDialect.java 2010-03-24 14:37:56 UTC (rev 19095)
@@ -173,6 +173,10 @@
return "null";
}
+ public boolean supportsLockTimeouts() {
+ return false;
+ }
+
public String getForUpdateString() {
return "";
}
Added: core/trunk/core/src/main/java/org/hibernate/dialect/lock/AbstractSelectLockingStrategy.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/dialect/lock/AbstractSelectLockingStrategy.java (rev 0)
+++ core/trunk/core/src/main/java/org/hibernate/dialect/lock/AbstractSelectLockingStrategy.java 2010-03-24 14:37:56 UTC (rev 19095)
@@ -0,0 +1,73 @@
+/*
+ * 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.dialect.lock;
+
+import org.hibernate.LockMode;
+import org.hibernate.LockOptions;
+import org.hibernate.persister.entity.Lockable;
+
+/**
+ * Base {@link LockingStrategy} implementation to support implementations
+ * based on issuing <tt>SQL</tt> <tt>SELECT</tt> statements
+ *
+ * @author Steve Ebersole
+ */
+public abstract class AbstractSelectLockingStrategy implements LockingStrategy {
+ private final Lockable lockable;
+ private final LockMode lockMode;
+ private final String waitForeverSql;
+
+ protected AbstractSelectLockingStrategy(Lockable lockable, LockMode lockMode) {
+ this.lockable = lockable;
+ this.lockMode = lockMode;
+ this.waitForeverSql = generateLockString( LockOptions.WAIT_FOREVER );
+ }
+
+ protected Lockable getLockable() {
+ return lockable;
+ }
+
+ protected LockMode getLockMode() {
+ return lockMode;
+ }
+
+ protected abstract String generateLockString(int lockTimeout);
+
+ protected String determineSql(int timeout) {
+ return timeout == LockOptions.WAIT_FOREVER
+ ? waitForeverSql
+ : timeout == LockOptions.NO_WAIT
+ ? getNoWaitSql()
+ : generateLockString( timeout );
+ }
+
+ private String noWaitSql;
+
+ public String getNoWaitSql() {
+ if ( noWaitSql == null ) {
+ noWaitSql = generateLockString( LockOptions.NO_WAIT );
+ }
+ return noWaitSql;
+ }
+}
Modified: core/trunk/core/src/main/java/org/hibernate/dialect/lock/LockingStrategy.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/dialect/lock/LockingStrategy.java 2010-03-24 12:18:25 UTC (rev 19094)
+++ core/trunk/core/src/main/java/org/hibernate/dialect/lock/LockingStrategy.java 2010-03-24 14:37:56 UTC (rev 19095)
@@ -1,10 +1,10 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
+ * 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 Middleware LLC.
+ * 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
@@ -20,7 +20,6 @@
* Free Software Foundation, Inc.
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
- *
*/
package org.hibernate.dialect.lock;
@@ -33,7 +32,7 @@
/**
* A strategy abstraction for how locks are obtained in the underlying database.
* <p/>
- * All locking provided implemenations assume the underlying database supports
+ * All locking provided implementations assume the underlying database supports
* (and that the connection is in) at least read-committed transaction isolation.
* The most glaring exclusion to this is HSQLDB which only offers support for
* READ_UNCOMMITTED isolation.
@@ -53,9 +52,9 @@
* @param object The object logically being locked (currently not used)
* @param timeout timeout in milliseconds, 0 = no wait, -1 = wait indefinitely
* @param session The session from which the lock request originated
- * @throws StaleObjectStateException Indicates an optimisitic lock failure
+ * @throws StaleObjectStateException Indicates an optimistic lock failure
* as part of acquiring the requested database lock.
- * @throws JDBCException
+ * @throws JDBCException Indicates errors from the <tt>JDBC</tt> driver.
*/
public void lock(Serializable id, Object version, Object object, int timeout, SessionImplementor session)
throws StaleObjectStateException, JDBCException;
Modified: core/trunk/core/src/main/java/org/hibernate/dialect/lock/PessimisticReadSelectLockingStrategy.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/dialect/lock/PessimisticReadSelectLockingStrategy.java 2010-03-24 12:18:25 UTC (rev 19094)
+++ core/trunk/core/src/main/java/org/hibernate/dialect/lock/PessimisticReadSelectLockingStrategy.java 2010-03-24 14:37:56 UTC (rev 19095)
@@ -1,10 +1,10 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
- * Copyright (c) 2009, Red Hat Middleware LLC or third-party contributors as
+ * 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 Middleware LLC.
+ * 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
@@ -20,7 +20,6 @@
* Free Software Foundation, Inc.
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
- *
*/
package org.hibernate.dialect.lock;
@@ -51,57 +50,43 @@
*
* This class is a clone of SelectLockingStrategy.
*
+ * @author Steve Ebersole
+ * @author Scott Marlow
* @see org.hibernate.dialect.Dialect#getForUpdateString(org.hibernate.LockMode)
* @see org.hibernate.dialect.Dialect#appendLockHint(org.hibernate.LockMode, String)
* @since 3.5
- *
- * @author Steve Ebersole
- * @author Scott Marlow
*/
-public class PessimisticReadSelectLockingStrategy implements LockingStrategy {
-
- private final Lockable lockable;
- private final LockMode lockMode;
- private final String sql;
-
+public class PessimisticReadSelectLockingStrategy extends AbstractSelectLockingStrategy {
/**
* Construct a locking strategy based on SQL SELECT statements.
*
* @param lockable The metadata for the entity to be locked.
- * @param lockMode Indictates the type of lock to be acquired.
+ * @param lockMode Indicates the type of lock to be acquired.
*/
public PessimisticReadSelectLockingStrategy(Lockable lockable, LockMode lockMode) {
- this.lockable = lockable;
- this.lockMode = lockMode;
- this.sql = generateLockString(LockOptions.WAIT_FOREVER);
+ super( lockable, lockMode );
}
- /**
+ /**
* @see org.hibernate.dialect.lock.LockingStrategy#lock
*/
public void lock(
- Serializable id,
- Object version,
- Object object,
- int timeout, SessionImplementor session) throws StaleObjectStateException, JDBCException {
- String sql = this.sql;
- if ( timeout == LockOptions.NO_WAIT ) {
- sql = generateLockString( LockOptions.NO_WAIT );
- }
- else if ( timeout > 0) {
- sql = generateLockString( timeout );
- }
-
+ Serializable id,
+ Object version,
+ Object object,
+ int timeout,
+ SessionImplementor session) throws StaleObjectStateException, JDBCException {
+ final String sql = determineSql( timeout );
SessionFactoryImplementor factory = session.getFactory();
try {
PreparedStatement st = session.getBatcher().prepareSelectStatement( sql );
try {
- lockable.getIdentifierType().nullSafeSet( st, id, 1, session );
- if ( lockable.isVersioned() ) {
- lockable.getVersionType().nullSafeSet(
+ getLockable().getIdentifierType().nullSafeSet( st, id, 1, session );
+ if ( getLockable().isVersioned() ) {
+ getLockable().getVersionType().nullSafeSet(
st,
version,
- lockable.getIdentifierType().getColumnSpan( factory ) + 1,
+ getLockable().getIdentifierType().getColumnSpan( factory ) + 1,
session
);
}
@@ -111,9 +96,9 @@
if ( !rs.next() ) {
if ( factory.getStatistics().isStatisticsEnabled() ) {
factory.getStatisticsImplementor()
- .optimisticFailure( lockable.getEntityName() );
+ .optimisticFailure( getLockable().getEntityName() );
}
- throw new StaleObjectStateException( lockable.getEntityName(), id );
+ throw new StaleObjectStateException( getLockable().getEntityName(), id );
}
}
finally {
@@ -129,31 +114,27 @@
JDBCException e = JDBCExceptionHelper.convert(
session.getFactory().getSQLExceptionConverter(),
sqle,
- "could not lock: " + MessageHelper.infoString( lockable, id, session.getFactory() ),
+ "could not lock: " + MessageHelper.infoString( getLockable(), id, session.getFactory() ),
sql
- );
- throw new PessimisticLockException("could not obtain pessimistic lock", e, object);
+ );
+ throw new PessimisticLockException( "could not obtain pessimistic lock", e, object );
}
}
- protected LockMode getLockMode() {
- return lockMode;
- }
-
protected String generateLockString(int lockTimeout) {
- SessionFactoryImplementor factory = lockable.getFactory();
- LockOptions lockOptions = new LockOptions(this.lockMode);
+ SessionFactoryImplementor factory = getLockable().getFactory();
+ LockOptions lockOptions = new LockOptions( getLockMode() );
lockOptions.setTimeOut( lockTimeout );
SimpleSelect select = new SimpleSelect( factory.getDialect() )
.setLockOptions( lockOptions )
- .setTableName( lockable.getRootTableName() )
- .addColumn( lockable.getRootTableIdentifierColumnNames()[0] )
- .addCondition( lockable.getRootTableIdentifierColumnNames(), "=?" );
- if ( lockable.isVersioned() ) {
- select.addCondition( lockable.getVersionColumnName(), "=?" );
+ .setTableName( getLockable().getRootTableName() )
+ .addColumn( getLockable().getRootTableIdentifierColumnNames()[0] )
+ .addCondition( getLockable().getRootTableIdentifierColumnNames(), "=?" );
+ if ( getLockable().isVersioned() ) {
+ select.addCondition( getLockable().getVersionColumnName(), "=?" );
}
if ( factory.getSettings().isCommentsEnabled() ) {
- select.setComment( lockMode + " lock " + lockable.getEntityName() );
+ select.setComment( getLockMode() + " lock " + getLockable().getEntityName() );
}
return select.toStatementString();
}
Modified: core/trunk/core/src/main/java/org/hibernate/dialect/lock/PessimisticWriteSelectLockingStrategy.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/dialect/lock/PessimisticWriteSelectLockingStrategy.java 2010-03-24 12:18:25 UTC (rev 19094)
+++ core/trunk/core/src/main/java/org/hibernate/dialect/lock/PessimisticWriteSelectLockingStrategy.java 2010-03-24 14:37:56 UTC (rev 19095)
@@ -1,10 +1,10 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
- * Copyright (c) 2009, Red Hat Middleware LLC or third-party contributors as
+ * 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 Middleware LLC.
+ * 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
@@ -20,7 +20,6 @@
* Free Software Foundation, Inc.
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
- *
*/
package org.hibernate.dialect.lock;
@@ -46,62 +45,48 @@
* <p/>
* For non-read locks, this is achieved through the Dialect's specific
* SELECT ... FOR UPDATE syntax.
- *
+ *
* This strategy is valid for LockMode.PESSIMISTIC_WRITE
*
* This class is a clone of SelectLockingStrategy.
*
+ * @author Steve Ebersole
+ * @author Scott Marlow
* @see org.hibernate.dialect.Dialect#getForUpdateString(org.hibernate.LockMode)
* @see org.hibernate.dialect.Dialect#appendLockHint(org.hibernate.LockMode, String)
* @since 3.5
- *
- * @author Steve Ebersole
- * @author Scott Marlow
*/
-public class PessimisticWriteSelectLockingStrategy implements LockingStrategy {
-
- private final Lockable lockable;
- private final LockMode lockMode;
- private final String sql;
-
+public class PessimisticWriteSelectLockingStrategy extends AbstractSelectLockingStrategy {
/**
* Construct a locking strategy based on SQL SELECT statements.
*
* @param lockable The metadata for the entity to be locked.
- * @param lockMode Indictates the type of lock to be acquired.
+ * @param lockMode Indicates the type of lock to be acquired.
*/
public PessimisticWriteSelectLockingStrategy(Lockable lockable, LockMode lockMode) {
- this.lockable = lockable;
- this.lockMode = lockMode;
- this.sql = generateLockString(LockOptions.WAIT_FOREVER);
+ super( lockable, lockMode );
}
- /**
+ /**
* @see LockingStrategy#lock
*/
public void lock(
- Serializable id,
- Object version,
- Object object,
- int timeout, SessionImplementor session) throws StaleObjectStateException, JDBCException {
- String sql = this.sql;
- if ( timeout == LockOptions.NO_WAIT ) {
- sql = generateLockString( LockOptions.NO_WAIT );
- }
- else if ( timeout > 0) {
- sql = generateLockString( timeout );
- }
-
+ Serializable id,
+ Object version,
+ Object object,
+ int timeout,
+ SessionImplementor session) throws StaleObjectStateException, JDBCException {
+ final String sql = determineSql( timeout );
SessionFactoryImplementor factory = session.getFactory();
try {
PreparedStatement st = session.getBatcher().prepareSelectStatement( sql );
try {
- lockable.getIdentifierType().nullSafeSet( st, id, 1, session );
- if ( lockable.isVersioned() ) {
- lockable.getVersionType().nullSafeSet(
+ getLockable().getIdentifierType().nullSafeSet( st, id, 1, session );
+ if ( getLockable().isVersioned() ) {
+ getLockable().getVersionType().nullSafeSet(
st,
version,
- lockable.getIdentifierType().getColumnSpan( factory ) + 1,
+ getLockable().getIdentifierType().getColumnSpan( factory ) + 1,
session
);
}
@@ -111,9 +96,9 @@
if ( !rs.next() ) {
if ( factory.getStatistics().isStatisticsEnabled() ) {
factory.getStatisticsImplementor()
- .optimisticFailure( lockable.getEntityName() );
+ .optimisticFailure( getLockable().getEntityName() );
}
- throw new StaleObjectStateException( lockable.getEntityName(), id );
+ throw new StaleObjectStateException( getLockable().getEntityName(), id );
}
}
finally {
@@ -129,31 +114,27 @@
JDBCException e = JDBCExceptionHelper.convert(
session.getFactory().getSQLExceptionConverter(),
sqle,
- "could not lock: " + MessageHelper.infoString( lockable, id, session.getFactory() ),
+ "could not lock: " + MessageHelper.infoString( getLockable(), id, session.getFactory() ),
sql
- );
- throw new PessimisticLockException("could not obtain pessimistic lock", e, object);
+ );
+ throw new PessimisticLockException( "could not obtain pessimistic lock", e, object );
}
}
- protected LockMode getLockMode() {
- return lockMode;
- }
-
protected String generateLockString(int lockTimeout) {
- SessionFactoryImplementor factory = lockable.getFactory();
- LockOptions lockOptions = new LockOptions(this.lockMode);
+ SessionFactoryImplementor factory = getLockable().getFactory();
+ LockOptions lockOptions = new LockOptions( getLockMode() );
lockOptions.setTimeOut( lockTimeout );
SimpleSelect select = new SimpleSelect( factory.getDialect() )
.setLockOptions( lockOptions )
- .setTableName( lockable.getRootTableName() )
- .addColumn( lockable.getRootTableIdentifierColumnNames()[0] )
- .addCondition( lockable.getRootTableIdentifierColumnNames(), "=?" );
- if ( lockable.isVersioned() ) {
- select.addCondition( lockable.getVersionColumnName(), "=?" );
+ .setTableName( getLockable().getRootTableName() )
+ .addColumn( getLockable().getRootTableIdentifierColumnNames()[0] )
+ .addCondition( getLockable().getRootTableIdentifierColumnNames(), "=?" );
+ if ( getLockable().isVersioned() ) {
+ select.addCondition( getLockable().getVersionColumnName(), "=?" );
}
if ( factory.getSettings().isCommentsEnabled() ) {
- select.setComment( lockMode + " lock " + lockable.getEntityName() );
+ select.setComment( getLockMode() + " lock " + getLockable().getEntityName() );
}
return select.toStatementString();
}
Modified: core/trunk/core/src/main/java/org/hibernate/dialect/lock/SelectLockingStrategy.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/dialect/lock/SelectLockingStrategy.java 2010-03-24 12:18:25 UTC (rev 19094)
+++ core/trunk/core/src/main/java/org/hibernate/dialect/lock/SelectLockingStrategy.java 2010-03-24 14:37:56 UTC (rev 19095)
@@ -1,10 +1,10 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
+ * 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 Middleware LLC.
+ * 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
@@ -20,10 +20,10 @@
* Free Software Foundation, Inc.
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
- *
*/
package org.hibernate.dialect.lock;
+import org.hibernate.LockOptions;
import org.hibernate.persister.entity.Lockable;
import org.hibernate.engine.SessionImplementor;
import org.hibernate.engine.SessionFactoryImplementor;
@@ -51,12 +51,7 @@
*
* @author Steve Ebersole
*/
-public class SelectLockingStrategy implements LockingStrategy {
-
- private final Lockable lockable;
- private final LockMode lockMode;
- private final String sql;
-
+public class SelectLockingStrategy extends AbstractSelectLockingStrategy {
/**
* Construct a locking strategy based on SQL SELECT statements.
*
@@ -64,9 +59,7 @@
* @param lockMode Indictates the type of lock to be acquired.
*/
public SelectLockingStrategy(Lockable lockable, LockMode lockMode) {
- this.lockable = lockable;
- this.lockMode = lockMode;
- this.sql = generateLockString();
+ super( lockable, lockMode );
}
/**
@@ -78,17 +71,17 @@
Object object,
int timeout,
SessionImplementor session) throws StaleObjectStateException, JDBCException {
-
+ final String sql = determineSql( timeout );
SessionFactoryImplementor factory = session.getFactory();
try {
PreparedStatement st = session.getBatcher().prepareSelectStatement( sql );
try {
- lockable.getIdentifierType().nullSafeSet( st, id, 1, session );
- if ( lockable.isVersioned() ) {
- lockable.getVersionType().nullSafeSet(
+ getLockable().getIdentifierType().nullSafeSet( st, id, 1, session );
+ if ( getLockable().isVersioned() ) {
+ getLockable().getVersionType().nullSafeSet(
st,
version,
- lockable.getIdentifierType().getColumnSpan( factory ) + 1,
+ getLockable().getIdentifierType().getColumnSpan( factory ) + 1,
session
);
}
@@ -98,9 +91,9 @@
if ( !rs.next() ) {
if ( factory.getStatistics().isStatisticsEnabled() ) {
factory.getStatisticsImplementor()
- .optimisticFailure( lockable.getEntityName() );
+ .optimisticFailure( getLockable().getEntityName() );
}
- throw new StaleObjectStateException( lockable.getEntityName(), id );
+ throw new StaleObjectStateException( getLockable().getEntityName(), id );
}
}
finally {
@@ -116,28 +109,26 @@
throw JDBCExceptionHelper.convert(
session.getFactory().getSQLExceptionConverter(),
sqle,
- "could not lock: " + MessageHelper.infoString( lockable, id, session.getFactory() ),
+ "could not lock: " + MessageHelper.infoString( getLockable(), id, session.getFactory() ),
sql
);
}
}
- protected LockMode getLockMode() {
- return lockMode;
- }
-
- protected String generateLockString() {
- SessionFactoryImplementor factory = lockable.getFactory();
+ protected String generateLockString(int timeout) {
+ SessionFactoryImplementor factory = getLockable().getFactory();
+ LockOptions lockOptions = new LockOptions( getLockMode() );
+ lockOptions.setTimeOut( timeout );
SimpleSelect select = new SimpleSelect( factory.getDialect() )
- .setLockMode( lockMode )
- .setTableName( lockable.getRootTableName() )
- .addColumn( lockable.getRootTableIdentifierColumnNames()[0] )
- .addCondition( lockable.getRootTableIdentifierColumnNames(), "=?" );
- if ( lockable.isVersioned() ) {
- select.addCondition( lockable.getVersionColumnName(), "=?" );
+ .setLockOptions( lockOptions )
+ .setTableName( getLockable().getRootTableName() )
+ .addColumn( getLockable().getRootTableIdentifierColumnNames()[0] )
+ .addCondition( getLockable().getRootTableIdentifierColumnNames(), "=?" );
+ if ( getLockable().isVersioned() ) {
+ select.addCondition( getLockable().getVersionColumnName(), "=?" );
}
if ( factory.getSettings().isCommentsEnabled() ) {
- select.setComment( lockMode + " lock " + lockable.getEntityName() );
+ select.setComment( getLockMode() + " lock " + getLockable().getEntityName() );
}
return select.toStatementString();
}
Modified: core/trunk/core/src/main/java/org/hibernate/engine/QueryParameters.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/engine/QueryParameters.java 2010-03-24 12:18:25 UTC (rev 19094)
+++ core/trunk/core/src/main/java/org/hibernate/engine/QueryParameters.java 2010-03-24 14:37:56 UTC (rev 19095)
@@ -272,6 +272,10 @@
return lockOptions;
}
+ public void setLockOptions(LockOptions lockOptions) {
+ this.lockOptions = lockOptions;
+ }
+
public void traceParameters(SessionFactoryImplementor factory) throws HibernateException {
Printer print = new Printer( factory );
if ( positionalParameterValues.length != 0 ) {
Modified: core/trunk/core/src/main/java/org/hibernate/event/def/DefaultLoadEventListener.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/event/def/DefaultLoadEventListener.java 2010-03-24 12:18:25 UTC (rev 19094)
+++ core/trunk/core/src/main/java/org/hibernate/event/def/DefaultLoadEventListener.java 2010-03-24 14:37:56 UTC (rev 19095)
@@ -496,7 +496,7 @@
Object entity = persister.load(
event.getEntityId(),
event.getInstanceToLoad(),
- event.getLockMode(),
+ event.getLockOptions(),
source
);
Modified: core/trunk/core/src/main/java/org/hibernate/loader/Loader.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/loader/Loader.java 2010-03-24 12:18:25 UTC (rev 19094)
+++ core/trunk/core/src/main/java/org/hibernate/loader/Loader.java 2010-03-24 14:37:56 UTC (rev 19095)
@@ -247,11 +247,10 @@
* persister from each row of the <tt>ResultSet</tt>. If an object is supplied, will attempt to
* initialize that object. If a collection is supplied, attempt to initialize that collection.
*/
- private List doQueryAndInitializeNonLazyCollections(final SessionImplementor session,
- final QueryParameters queryParameters,
- final boolean returnProxies)
- throws HibernateException, SQLException {
-
+ private List doQueryAndInitializeNonLazyCollections(
+ final SessionImplementor session,
+ final QueryParameters queryParameters,
+ final boolean returnProxies) throws HibernateException, SQLException {
final PersistenceContext persistenceContext = session.getPersistenceContext();
boolean defaultReadOnlyOrig = persistenceContext.isDefaultReadOnly();
if ( queryParameters.isReadOnlyInitialized() ) {
@@ -1628,6 +1627,24 @@
st.setFetchSize( selection.getFetchSize().intValue() );
}
}
+
+ // handle lock timeout...
+ LockOptions lockOptions = queryParameters.getLockOptions();
+ if ( lockOptions != null ) {
+ if ( lockOptions.getTimeOut() != LockOptions.WAIT_FOREVER ) {
+ if ( !dialect.supportsLockTimeouts() ) {
+ log.debug(
+ "Lock timeout [" + lockOptions.getTimeOut() +
+ "] requested but dialect reported to not support lock timeouts"
+ );
+ }
+ else if ( dialect.isLockTimeoutParameterized() ) {
+ st.setInt( col++, lockOptions.getTimeOut() );
+ }
+ }
+ }
+
+ log.trace( "Bound [" + col + "] parameters total" );
}
catch ( SQLException sqle ) {
session.getBatcher().closeQueryStatement( st, null );
@@ -1885,15 +1902,17 @@
/**
* Called by subclasses that load entities
* @param persister only needed for logging
+ * @param lockOptions
*/
protected final List loadEntity(
- final SessionImplementor session,
- final Object id,
- final Type identifierType,
- final Object optionalObject,
- final String optionalEntityName,
- final Serializable optionalIdentifier,
- final EntityPersister persister) throws HibernateException {
+ final SessionImplementor session,
+ final Object id,
+ final Type identifierType,
+ final Object optionalObject,
+ final String optionalEntityName,
+ final Serializable optionalIdentifier,
+ final EntityPersister persister,
+ LockOptions lockOptions) throws HibernateException {
if ( log.isDebugEnabled() ) {
log.debug(
@@ -1904,17 +1923,14 @@
List result;
try {
- result = doQueryAndInitializeNonLazyCollections(
- session,
- new QueryParameters(
- new Type[] { identifierType },
- new Object[] { id },
- optionalObject,
- optionalEntityName,
- optionalIdentifier
- ),
- false
- );
+ QueryParameters qp = new QueryParameters();
+ qp.setPositionalParameterTypes( new Type[] { identifierType } );
+ qp.setPositionalParameterValues( new Object[] { id } );
+ qp.setOptionalObject( optionalObject );
+ qp.setOptionalEntityName( optionalEntityName );
+ qp.setOptionalId( optionalIdentifier );
+ qp.setLockOptions( lockOptions );
+ result = doQueryAndInitializeNonLazyCollections( session, qp, false );
}
catch ( SQLException sqle ) {
final Loadable[] persisters = getEntityPersisters();
@@ -1951,14 +1967,14 @@
List result;
try {
- result = doQueryAndInitializeNonLazyCollections(
+ result = doQueryAndInitializeNonLazyCollections(
session,
- new QueryParameters(
+ new QueryParameters(
new Type[] { keyType, indexType },
new Object[] { key, index }
- ),
- false
- );
+ ),
+ false
+ );
}
catch ( SQLException sqle ) {
throw JDBCExceptionHelper.convert(
@@ -1978,15 +1994,17 @@
/**
* Called by wrappers that batch load entities
* @param persister only needed for logging
+ * @param lockOptions
*/
public final List loadEntityBatch(
- final SessionImplementor session,
- final Serializable[] ids,
- final Type idType,
- final Object optionalObject,
- final String optionalEntityName,
- final Serializable optionalId,
- final EntityPersister persister) throws HibernateException {
+ final SessionImplementor session,
+ final Serializable[] ids,
+ final Type idType,
+ final Object optionalObject,
+ final String optionalEntityName,
+ final Serializable optionalId,
+ final EntityPersister persister,
+ LockOptions lockOptions) throws HibernateException {
if ( log.isDebugEnabled() ) {
log.debug(
@@ -1999,11 +2017,14 @@
Arrays.fill( types, idType );
List result;
try {
- result = doQueryAndInitializeNonLazyCollections(
- session,
- new QueryParameters( types, ids, optionalObject, optionalEntityName, optionalId ),
- false
- );
+ QueryParameters qp = new QueryParameters();
+ qp.setPositionalParameterTypes( types );
+ qp.setPositionalParameterValues( ids );
+ qp.setOptionalObject( optionalObject );
+ qp.setOptionalEntityName( optionalEntityName );
+ qp.setOptionalId( optionalId );
+ qp.setLockOptions( lockOptions );
+ result = doQueryAndInitializeNonLazyCollections( session, qp, false );
}
catch ( SQLException sqle ) {
throw JDBCExceptionHelper.convert(
Modified: core/trunk/core/src/main/java/org/hibernate/loader/entity/AbstractEntityLoader.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/loader/entity/AbstractEntityLoader.java 2010-03-24 12:18:25 UTC (rev 19094)
+++ core/trunk/core/src/main/java/org/hibernate/loader/entity/AbstractEntityLoader.java 2010-03-24 14:37:56 UTC (rev 19095)
@@ -32,6 +32,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.hibernate.HibernateException;
+import org.hibernate.LockOptions;
import org.hibernate.engine.SessionFactoryImplementor;
import org.hibernate.engine.SessionImplementor;
import org.hibernate.engine.LoadQueryInfluencers;
@@ -60,13 +61,27 @@
}
- public Object load(Serializable id, Object optionalObject, SessionImplementor session)
- throws HibernateException {
- return load(session, id, optionalObject, id);
+ /**
+ * {@inheritDoc}
+ */
+ public Object load(Serializable id, Object optionalObject, SessionImplementor session) {
+ // this form is deprecated!
+ return load( id, optionalObject, session, LockOptions.NONE );
}
- protected Object load(SessionImplementor session, Object id, Object optionalObject, Serializable optionalId)
- throws HibernateException {
+ /**
+ * {@inheritDoc}
+ */
+ public Object load(Serializable id, Object optionalObject, SessionImplementor session, LockOptions lockOptions) {
+ return load( session, id, optionalObject, id, lockOptions );
+ }
+
+ protected Object load(
+ SessionImplementor session,
+ Object id,
+ Object optionalObject,
+ Serializable optionalId,
+ LockOptions lockOptions) {
List list = loadEntity(
session,
@@ -75,7 +90,8 @@
optionalObject,
entityName,
optionalId,
- persister
+ persister,
+ lockOptions
);
if ( list.size()==1 ) {
Modified: core/trunk/core/src/main/java/org/hibernate/loader/entity/BatchingEntityLoader.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/loader/entity/BatchingEntityLoader.java 2010-03-24 12:18:25 UTC (rev 19094)
+++ core/trunk/core/src/main/java/org/hibernate/loader/entity/BatchingEntityLoader.java 2010-03-24 14:37:56 UTC (rev 19095)
@@ -78,9 +78,15 @@
return null;
}
- public Object load(Serializable id, Object optionalObject, SessionImplementor session)
- throws HibernateException {
-
+ /**
+ * {@inheritDoc}
+ */
+ public Object load(Serializable id, Object optionalObject, SessionImplementor session) {
+ // this form is deprecated!
+ return load( id, optionalObject, session, LockOptions.NONE );
+ }
+
+ public Object load(Serializable id, Object optionalObject, SessionImplementor session, LockOptions lockOptions) {
Serializable[] batch = session.getPersistenceContext()
.getBatchFetchQueue()
.getEntityBatch( persister, id, batchSizes[0], session.getEntityMode() );
@@ -97,7 +103,8 @@
optionalObject,
persister.getEntityName(),
id,
- persister
+ persister,
+ lockOptions
);
return getObjectFromList(results, id, session); //EARLY EXIT
}
Modified: core/trunk/core/src/main/java/org/hibernate/loader/entity/EntityLoader.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/loader/entity/EntityLoader.java 2010-03-24 12:18:25 UTC (rev 19094)
+++ core/trunk/core/src/main/java/org/hibernate/loader/entity/EntityLoader.java 2010-03-24 14:37:56 UTC (rev 19095)
@@ -148,14 +148,16 @@
batchLoader = batchSize > 1;
- log.debug( "Static select for entity " + entityName + ": " + getSQLString() );
+ log.debug(
+ "Static select for entity " + entityName +
+ " [" + lockOptions.getLockMode() + ":" + lockOptions.getTimeOut() + "]: "
+ + getSQLString()
+ );
}
- public Object loadByUniqueKey(
- SessionImplementor session,
- Object key) throws HibernateException {
- return load( session, key, null, null );
+ public Object loadByUniqueKey(SessionImplementor session,Object key) {
+ return load( session, key, null, null, LockOptions.NONE );
}
protected boolean isSingleRowLoader() {
Modified: core/trunk/core/src/main/java/org/hibernate/loader/entity/UniqueEntityLoader.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/loader/entity/UniqueEntityLoader.java 2010-03-24 12:18:25 UTC (rev 19094)
+++ core/trunk/core/src/main/java/org/hibernate/loader/entity/UniqueEntityLoader.java 2010-03-24 14:37:56 UTC (rev 19095)
@@ -27,16 +27,37 @@
import java.io.Serializable;
import org.hibernate.HibernateException;
+import org.hibernate.LockOptions;
import org.hibernate.engine.SessionImplementor;
/**
* Loads entities for a <tt>EntityPersister</tt>
+ *
* @author Gavin King
+ * @author Steve Ebersole
*/
public interface UniqueEntityLoader {
/**
* Load an entity instance. If <tt>optionalObject</tt> is supplied,
* load the entity state into the given (uninitialized) object.
+ *
+ * @deprecated use {@link #load(java.io.Serializable, Object, SessionImplementor, LockOptions)} instead.
+ * @noinspection JavaDoc
*/
public Object load(Serializable id, Object optionalObject, SessionImplementor session) throws HibernateException;
+
+ /**
+ * Load an entity instance by id. If <tt>optionalObject</tt> is supplied (non-<tt>null</tt>,
+ * the entity state is loaded into that object instance instead of instantiating a new one.
+ *
+ * @param id The id to be loaded
+ * @param optionalObject The (optional) entity instance in to which to load the state
+ * @param session The session from which the request originated
+ * @param lockOptions The lock options.
+ *
+ * @return The loaded entity
+ *
+ * @throws HibernateException indicates problem performing the load.
+ */
+ public Object load(Serializable id, Object optionalObject, SessionImplementor session, LockOptions lockOptions);
}
Modified: core/trunk/core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java 2010-03-24 12:18:25 UTC (rev 19094)
+++ core/trunk/core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java 2010-03-24 14:37:56 UTC (rev 19095)
@@ -3248,18 +3248,8 @@
* Load an instance using either the <tt>forUpdateLoader</tt> or the outer joining <tt>loader</tt>,
* depending upon the value of the <tt>lock</tt> parameter
*/
- public Object load(Serializable id, Object optionalObject, LockMode lockMode, SessionImplementor session)
- throws HibernateException {
-
- if ( log.isTraceEnabled() ) {
- log.trace(
- "Fetching entity: " +
- MessageHelper.infoString( this, id, getFactory() )
- );
- }
-
- final UniqueEntityLoader loader = getAppropriateLoader( new LockOptions().setLockMode(lockMode), session );
- return loader.load( id, optionalObject, session );
+ public Object load(Serializable id, Object optionalObject, LockMode lockMode, SessionImplementor session) {
+ return load( id, optionalObject, new LockOptions().setLockMode(lockMode), session );
}
/**
@@ -3277,7 +3267,7 @@
}
final UniqueEntityLoader loader = getAppropriateLoader(lockOptions, session );
- return loader.load( id, optionalObject, session );
+ return loader.load( id, optionalObject, session, lockOptions );
}
public void registerAffectingFetchProfile(String fetchProfileName) {
@@ -3321,6 +3311,9 @@
// SQL query used for loading based on those influencers
return createEntityLoader(lockOptions, session.getLoadQueryInfluencers() );
}
+ else if ( lockOptions.getTimeOut() != LockOptions.WAIT_FOREVER ) {
+ return createEntityLoader( lockOptions, session.getLoadQueryInfluencers() );
+ }
else {
return ( UniqueEntityLoader ) loaders.get( lockOptions.getLockMode() );
}
Modified: core/trunk/core/src/main/java/org/hibernate/persister/entity/NamedQueryLoader.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/persister/entity/NamedQueryLoader.java 2010-03-24 12:18:25 UTC (rev 19094)
+++ core/trunk/core/src/main/java/org/hibernate/persister/entity/NamedQueryLoader.java 2010-03-24 14:37:56 UTC (rev 19095)
@@ -30,6 +30,7 @@
import org.slf4j.LoggerFactory;
import org.hibernate.FlushMode;
import org.hibernate.HibernateException;
+import org.hibernate.LockOptions;
import org.hibernate.engine.EntityKey;
import org.hibernate.engine.SessionImplementor;
import org.hibernate.impl.AbstractQueryImpl;
@@ -38,7 +39,9 @@
/**
* Not really a <tt>Loader</tt>, just a wrapper around a
* named query.
+ *
* @author Gavin King
+ * @author Steve Ebersole
*/
public final class NamedQueryLoader implements UniqueEntityLoader {
private final String queryName;
@@ -52,9 +55,14 @@
this.persister = persister;
}
- public Object load(Serializable id, Object optionalObject, SessionImplementor session)
- throws HibernateException {
-
+ public Object load(Serializable id, Object optionalObject, SessionImplementor session, LockOptions lockOptions) {
+ if ( lockOptions != null ) {
+ log.debug( "Ignoring lock-options passed to named query loader" );
+ }
+ return load( id, optionalObject, session );
+ }
+
+ public Object load(Serializable id, Object optionalObject, SessionImplementor session) {
if ( log.isDebugEnabled() ) {
log.debug(
"loading entity: " + persister.getEntityName() +
Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/AbstractEntityManagerImpl.java
===================================================================
--- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/AbstractEntityManagerImpl.java 2010-03-24 12:18:25 UTC (rev 19094)
+++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/AbstractEntityManagerImpl.java 2010-03-24 14:37:56 UTC (rev 19095)
@@ -216,14 +216,14 @@
timeout = Integer.parseInt( ( String ) lockTimeout );
timeoutSet = true;
}
- else if ( lockTimeout instanceof Integer ) {
- timeout = ( Integer ) lockTimeout;
+ else if ( lockTimeout instanceof Number ) {
+ timeout = ( (Number) lockTimeout ).intValue();
timeoutSet = true;
}
else if ( lockTimeout != null ) {
throw new PersistenceException( "Unable to parse " + AvailableSettings.LOCK_TIMEOUT + ": " + lockTimeout );
}
- if ( timeoutSet != false ) {
+ if ( timeoutSet ) {
if ( timeout < 0 ) {
options.setTimeOut( LockOptions.WAIT_FOREVER );
}
Modified: core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/lock/LockTest.java
===================================================================
--- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/lock/LockTest.java 2010-03-24 12:18:25 UTC (rev 19094)
+++ core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/lock/LockTest.java 2010-03-24 14:37:56 UTC (rev 19095)
@@ -12,6 +12,7 @@
import org.apache.commons.logging.LogFactory;
import org.hibernate.dialect.HSQLDialect;
import org.hibernate.dialect.Oracle10gDialect;
+import org.hibernate.ejb.AvailableSettings;
import org.hibernate.ejb.test.TestCase;
import java.util.HashMap;
@@ -26,8 +27,33 @@
* @author Emmanuel Bernard
*/
public class LockTest extends TestCase {
+ private static final Log log = LogFactory.getLog( LockTest.class );
- private static final Log log = LogFactory.getLog( LockTest.class );
+ public void testFindWithTimeoutHint() {
+ EntityManager em = getOrCreateEntityManager();
+ em.getTransaction().begin();
+ Lock lock = new Lock();
+ lock.setName( "name" );
+ em.persist( lock );
+ em.getTransaction().commit();
+ em.close();
+
+ em = getOrCreateEntityManager();
+ em.getTransaction().begin();
+ Map<String, Object> properties = new HashMap<String, Object>();
+ properties.put( AvailableSettings.LOCK_TIMEOUT, 0L );
+ em.find( Lock.class, 1, LockModeType.PESSIMISTIC_WRITE, properties );
+ em.getTransaction().commit();
+ em.close();
+
+ em = getOrCreateEntityManager();
+ em.getTransaction().begin();
+ lock = em.find( Lock.class, lock.getId() );
+ em.remove( lock );
+ em.getTransaction().commit();
+ em.close();
+ }
+
public void testLockRead() throws Exception {
Lock lock = new Lock();
lock.setName( "name" );
14 years, 1 month
- 1
- 0
Hibernate SVN: r19094 - in core/trunk/core/src/main/java/org/hibernate: stat and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2010-03-24 08:18:25 -0400 (Wed, 24 Mar 2010)
New Revision: 19094
Added:
core/trunk/core/src/main/java/org/hibernate/stat/CollectionStatisticsImpl.java
core/trunk/core/src/main/java/org/hibernate/stat/ConcurrentCollectionStatisticsImpl.java
core/trunk/core/src/main/java/org/hibernate/stat/ConcurrentEntityStatisticsImpl.java
core/trunk/core/src/main/java/org/hibernate/stat/ConcurrentQueryStatisticsImpl.java
core/trunk/core/src/main/java/org/hibernate/stat/ConcurrentSecondLevelCacheStatisticsImpl.java
core/trunk/core/src/main/java/org/hibernate/stat/ConcurrentStatisticsImpl.java
core/trunk/core/src/main/java/org/hibernate/stat/EntityStatisticsImpl.java
core/trunk/core/src/main/java/org/hibernate/stat/QueryStatisticsImpl.java
core/trunk/core/src/main/java/org/hibernate/stat/SecondLevelCacheStatisticsImpl.java
Modified:
core/trunk/core/src/main/java/org/hibernate/impl/SessionFactoryImpl.java
core/trunk/core/src/main/java/org/hibernate/stat/CollectionStatistics.java
core/trunk/core/src/main/java/org/hibernate/stat/EntityStatistics.java
core/trunk/core/src/main/java/org/hibernate/stat/QueryStatistics.java
core/trunk/core/src/main/java/org/hibernate/stat/SecondLevelCacheStatistics.java
core/trunk/core/src/main/java/org/hibernate/stat/StatisticsImpl.java
Log:
HHH-4989 Use a JDK 5 concurrent safe statistics impl when required classes are present, fallback to the existing one otherwise (Alex Snaps)
Modified: core/trunk/core/src/main/java/org/hibernate/impl/SessionFactoryImpl.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/impl/SessionFactoryImpl.java 2010-03-23 21:24:49 UTC (rev 19093)
+++ core/trunk/core/src/main/java/org/hibernate/impl/SessionFactoryImpl.java 2010-03-24 12:18:25 UTC (rev 19094)
@@ -30,6 +30,7 @@
import java.io.ObjectOutputStream;
import java.io.ObjectStreamException;
import java.io.Serializable;
+import java.lang.reflect.Constructor;
import java.sql.Connection;
import java.util.ArrayList;
import java.util.Collections;
@@ -113,6 +114,7 @@
import org.hibernate.proxy.EntityNotFoundDelegate;
import org.hibernate.stat.Statistics;
import org.hibernate.stat.StatisticsImpl;
+import org.hibernate.stat.ConcurrentStatisticsImpl;
import org.hibernate.stat.StatisticsImplementor;
import org.hibernate.tool.hbm2ddl.SchemaExport;
import org.hibernate.tool.hbm2ddl.SchemaUpdate;
@@ -177,7 +179,7 @@
private final transient UpdateTimestampsCache updateTimestampsCache;
private final transient Map queryCaches;
private final transient Map allCacheRegions = new HashMap();
- private final transient StatisticsImpl statistics = new StatisticsImpl(this);
+ private final transient Statistics statistics;
private final transient EventListeners eventListeners;
private final transient CurrentSessionContext currentSessionContext;
private final transient EntityNotFoundDelegate entityNotFoundDelegate;
@@ -195,6 +197,27 @@
EventListeners listeners,
SessionFactoryObserver observer) throws HibernateException {
log.info("building session factory");
+
+ Statistics concurrentStatistics = null;
+ try {
+ Class concurrentStatsClass = ReflectHelper.classForName("org.hibernate.stat.ConcurrentStatisticsImpl");
+ Constructor constructor = concurrentStatsClass.getConstructor(new Class[]{SessionFactoryImplementor.class});
+ concurrentStatistics = (Statistics) constructor.newInstance(new Object[]{this});
+ log.trace("JDK 1.5 concurrent classes present");
+ } catch (Exception noJava5) {
+ log.trace("JDK 1.5 concurrent classes missing");
+ }
+
+ if (concurrentStatistics != null) {
+ this.statistics = concurrentStatistics;
+ } else {
+ this.statistics = new StatisticsImpl(this);
+ }
+
+ if ( log.isTraceEnabled() ) {
+ log.trace("Statistics initialized with " + statistics.getClass().getName());
+ }
+
this.properties = new Properties();
this.properties.putAll( cfg.getProperties() );
this.interceptor = cfg.getInterceptor();
@@ -1191,7 +1214,7 @@
}
public StatisticsImplementor getStatisticsImplementor() {
- return statistics;
+ return (StatisticsImplementor) statistics;
}
public FilterDefinition getFilterDefinition(String filterName) throws HibernateException {
Modified: core/trunk/core/src/main/java/org/hibernate/stat/CollectionStatistics.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/stat/CollectionStatistics.java 2010-03-23 21:24:49 UTC (rev 19093)
+++ core/trunk/core/src/main/java/org/hibernate/stat/CollectionStatistics.java 2010-03-24 12:18:25 UTC (rev 19094)
@@ -24,48 +24,23 @@
*/
package org.hibernate.stat;
+import java.io.Serializable;
+
/**
* Collection related statistics
- *
+ *
* @author Gavin King
+ * @author Alex Snaps
*/
-public class CollectionStatistics extends CategorizedStatistics {
-
- CollectionStatistics(String role) {
- super(role);
- }
-
- long loadCount;
- long fetchCount;
- long updateCount;
- long removeCount;
- long recreateCount;
-
- public long getLoadCount() {
- return loadCount;
- }
- public long getFetchCount() {
- return fetchCount;
- }
- public long getRecreateCount() {
- return recreateCount;
- }
- public long getRemoveCount() {
- return removeCount;
- }
- public long getUpdateCount() {
- return updateCount;
- }
+public interface CollectionStatistics extends Serializable {
- public String toString() {
- return new StringBuffer()
- .append("CollectionStatistics")
- .append("[loadCount=").append(this.loadCount)
- .append(",fetchCount=").append(this.fetchCount)
- .append(",recreateCount=").append(this.recreateCount)
- .append(",removeCount=").append(this.removeCount)
- .append(",updateCount=").append(this.updateCount)
- .append(']')
- .toString();
- }
-}
\ No newline at end of file
+ long getLoadCount();
+
+ long getFetchCount();
+
+ long getRecreateCount();
+
+ long getRemoveCount();
+
+ long getUpdateCount();
+}
Added: core/trunk/core/src/main/java/org/hibernate/stat/CollectionStatisticsImpl.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/stat/CollectionStatisticsImpl.java (rev 0)
+++ core/trunk/core/src/main/java/org/hibernate/stat/CollectionStatisticsImpl.java 2010-03-24 12:18:25 UTC (rev 19094)
@@ -0,0 +1,75 @@
+/*
+ * 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
+ *
+ */
+package org.hibernate.stat;
+
+/**
+ * Collection related statistics
+ *
+ * @author Gavin King
+ */
+public class CollectionStatisticsImpl extends CategorizedStatistics implements CollectionStatistics {
+
+ CollectionStatisticsImpl(String role) {
+ super(role);
+ }
+
+ long loadCount;
+ long fetchCount;
+ long updateCount;
+ long removeCount;
+ long recreateCount;
+
+ public long getLoadCount() {
+ return loadCount;
+ }
+
+ public long getFetchCount() {
+ return fetchCount;
+ }
+
+ public long getRecreateCount() {
+ return recreateCount;
+ }
+
+ public long getRemoveCount() {
+ return removeCount;
+ }
+
+ public long getUpdateCount() {
+ return updateCount;
+ }
+
+ public String toString() {
+ return new StringBuilder()
+ .append("CollectionStatistics")
+ .append("[loadCount=").append(this.loadCount)
+ .append(",fetchCount=").append(this.fetchCount)
+ .append(",recreateCount=").append(this.recreateCount)
+ .append(",removeCount=").append(this.removeCount)
+ .append(",updateCount=").append(this.updateCount)
+ .append(']')
+ .toString();
+ }
+}
Added: core/trunk/core/src/main/java/org/hibernate/stat/ConcurrentCollectionStatisticsImpl.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/stat/ConcurrentCollectionStatisticsImpl.java (rev 0)
+++ core/trunk/core/src/main/java/org/hibernate/stat/ConcurrentCollectionStatisticsImpl.java 2010-03-24 12:18:25 UTC (rev 19094)
@@ -0,0 +1,73 @@
+package org.hibernate.stat;
+
+import java.util.concurrent.atomic.AtomicLong;
+
+/**
+ * Collection related statistics
+ *
+ * @author Alex Snaps
+ */
+public class ConcurrentCollectionStatisticsImpl extends CategorizedStatistics implements CollectionStatistics {
+
+ ConcurrentCollectionStatisticsImpl(String role) {
+ super(role);
+ }
+
+ private AtomicLong loadCount = new AtomicLong();
+ private AtomicLong fetchCount = new AtomicLong();
+ private AtomicLong updateCount = new AtomicLong();
+ private AtomicLong removeCount = new AtomicLong();
+ private AtomicLong recreateCount = new AtomicLong();
+
+ public long getLoadCount() {
+ return loadCount.get();
+ }
+
+ public long getFetchCount() {
+ return fetchCount.get();
+ }
+
+ public long getRecreateCount() {
+ return recreateCount.get();
+ }
+
+ public long getRemoveCount() {
+ return removeCount.get();
+ }
+
+ public long getUpdateCount() {
+ return updateCount.get();
+ }
+
+ public String toString() {
+ return new StringBuilder()
+ .append("CollectionStatistics")
+ .append("[loadCount=").append(this.loadCount)
+ .append(",fetchCount=").append(this.fetchCount)
+ .append(",recreateCount=").append(this.recreateCount)
+ .append(",removeCount=").append(this.removeCount)
+ .append(",updateCount=").append(this.updateCount)
+ .append(']')
+ .toString();
+ }
+
+ void incrementLoadCount() {
+ loadCount.getAndIncrement();
+ }
+
+ void incrementFetchCount() {
+ fetchCount.getAndIncrement();
+ }
+
+ void incrementUpdateCount() {
+ updateCount.getAndIncrement();
+ }
+
+ void incrementRecreateCount() {
+ recreateCount.getAndIncrement();
+ }
+
+ void incrementRemoveCount() {
+ removeCount.getAndIncrement();
+ }
+}
Added: core/trunk/core/src/main/java/org/hibernate/stat/ConcurrentEntityStatisticsImpl.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/stat/ConcurrentEntityStatisticsImpl.java (rev 0)
+++ core/trunk/core/src/main/java/org/hibernate/stat/ConcurrentEntityStatisticsImpl.java 2010-03-24 12:18:25 UTC (rev 19094)
@@ -0,0 +1,84 @@
+package org.hibernate.stat;
+
+import java.util.concurrent.atomic.AtomicLong;
+
+
+/**
+ * Entity related statistics
+ *
+ * @author Alex Snaps
+ */
+public class ConcurrentEntityStatisticsImpl extends CategorizedStatistics implements EntityStatistics {
+
+ ConcurrentEntityStatisticsImpl(String name) {
+ super(name);
+ }
+
+ private AtomicLong loadCount = new AtomicLong();
+ private AtomicLong updateCount = new AtomicLong();
+ private AtomicLong insertCount = new AtomicLong();
+ private AtomicLong deleteCount = new AtomicLong();
+ private AtomicLong fetchCount = new AtomicLong();
+ private AtomicLong optimisticFailureCount = new AtomicLong();
+
+ public long getDeleteCount() {
+ return deleteCount.get();
+ }
+
+ public long getInsertCount() {
+ return insertCount.get();
+ }
+
+ public long getLoadCount() {
+ return loadCount.get();
+ }
+
+ public long getUpdateCount() {
+ return updateCount.get();
+ }
+
+ public long getFetchCount() {
+ return fetchCount.get();
+ }
+
+ public long getOptimisticFailureCount() {
+ return optimisticFailureCount.get();
+ }
+
+ public String toString() {
+ return new StringBuilder()
+ .append("EntityStatistics")
+ .append("[loadCount=").append(this.loadCount)
+ .append(",updateCount=").append(this.updateCount)
+ .append(",insertCount=").append(this.insertCount)
+ .append(",deleteCount=").append(this.deleteCount)
+ .append(",fetchCount=").append(this.fetchCount)
+ .append(",optimisticLockFailureCount=").append(this.optimisticFailureCount)
+ .append(']')
+ .toString();
+ }
+
+ void incrementLoadCount() {
+ loadCount.getAndIncrement();
+ }
+
+ void incrementFetchCount() {
+ fetchCount.getAndIncrement();
+ }
+
+ void incrementUpdateCount() {
+ updateCount.getAndIncrement();
+ }
+
+ void incrementInsertCount() {
+ insertCount.getAndIncrement();
+ }
+
+ void incrementDeleteCount() {
+ deleteCount.getAndIncrement();
+ }
+
+ void incrementOptimisticFailureCount() {
+ optimisticFailureCount.getAndIncrement();
+ }
+}
Added: core/trunk/core/src/main/java/org/hibernate/stat/ConcurrentQueryStatisticsImpl.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/stat/ConcurrentQueryStatisticsImpl.java (rev 0)
+++ core/trunk/core/src/main/java/org/hibernate/stat/ConcurrentQueryStatisticsImpl.java 2010-03-24 12:18:25 UTC (rev 19094)
@@ -0,0 +1,155 @@
+package org.hibernate.stat;
+
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
+/**
+ * Query statistics (HQL and SQL)
+ * <p/>
+ * Note that for a cached query, the cache miss is equals to the db count
+ *
+ * @author Alex Snaps
+ */
+public class ConcurrentQueryStatisticsImpl extends CategorizedStatistics implements QueryStatistics {
+
+ private final AtomicLong cacheHitCount = new AtomicLong();
+ private final AtomicLong cacheMissCount = new AtomicLong();
+ private final AtomicLong cachePutCount = new AtomicLong();
+ private final AtomicLong executionCount = new AtomicLong();
+ private final AtomicLong executionRowCount = new AtomicLong();
+ private final AtomicLong executionMaxTime = new AtomicLong();
+ private final AtomicLong executionMinTime = new AtomicLong(Long.MAX_VALUE);
+ private final AtomicLong totalExecutionTime = new AtomicLong();
+
+ private final Lock readLock;
+ private final Lock writeLock;
+
+ {
+ ReadWriteLock lock = new ReentrantReadWriteLock();
+ readLock = lock.readLock();
+ writeLock = lock.writeLock();
+ }
+
+ ConcurrentQueryStatisticsImpl(String query) {
+ super(query);
+ }
+
+ /**
+ * queries executed to the DB
+ */
+ public long getExecutionCount() {
+ return executionCount.get();
+ }
+
+ /**
+ * Queries retrieved successfully from the cache
+ */
+ public long getCacheHitCount() {
+ return cacheHitCount.get();
+ }
+
+ public long getCachePutCount() {
+ return cachePutCount.get();
+ }
+
+ public long getCacheMissCount() {
+ return cacheMissCount.get();
+ }
+
+ /**
+ * Number of lines returned by all the executions of this query (from DB)
+ * For now, {@link org.hibernate.Query#iterate()}
+ * and {@link org.hibernate.Query#scroll()()} do not fill this statistic
+ *
+ * @return The number of rows cumulatively returned by the given query; iterate
+ * and scroll queries do not effect this total as their number of returned rows
+ * is not known at execution time.
+ */
+ public long getExecutionRowCount() {
+ return executionRowCount.get();
+ }
+
+ /**
+ * average time in ms taken by the excution of this query onto the DB
+ */
+ public long getExecutionAvgTime() {
+ // We write lock here to be sure that we always calculate the average time
+ // with all updates from the executed applied: executionCount and totalExecutionTime
+ // both used in the calculation
+ writeLock.lock();
+ try {
+ long avgExecutionTime = 0;
+ if (executionCount.get() > 0) {
+ avgExecutionTime = totalExecutionTime.get() / executionCount.get();
+ }
+ return avgExecutionTime;
+ } finally {
+ writeLock.unlock();
+ }
+ }
+
+ /**
+ * max time in ms taken by the excution of this query onto the DB
+ */
+ public long getExecutionMaxTime() {
+ return executionMaxTime.get();
+ }
+
+ /**
+ * min time in ms taken by the excution of this query onto the DB
+ */
+ public long getExecutionMinTime() {
+ return executionMinTime.get();
+ }
+
+ /**
+ * add statistics report of a DB query
+ *
+ * @param rows rows count returned
+ * @param time time taken
+ */
+ void executed(long rows, long time) {
+ // read lock is enough, concurrent updates are supported by the underlying type AtomicLong
+ // this only guards executed(long, long) to be called, when another thread is executing getExecutionAvgTime()
+ readLock.lock();
+ try {
+ // Less chances for a context switch
+ for (long old = executionMinTime.get(); (time < old) && !executionMinTime.compareAndSet(old, time); old = executionMinTime.get());
+ for (long old = executionMaxTime.get(); (time > old) && !executionMaxTime.compareAndSet(old, time); old = executionMaxTime.get());
+ executionCount.getAndIncrement();
+ executionRowCount.addAndGet(rows);
+ totalExecutionTime.addAndGet(time);
+ } finally {
+ readLock.unlock();
+ }
+ }
+
+ public String toString() {
+ return new StringBuilder()
+ .append("QueryStatistics")
+ .append("[cacheHitCount=").append(this.cacheHitCount)
+ .append(",cacheMissCount=").append(this.cacheMissCount)
+ .append(",cachePutCount=").append(this.cachePutCount)
+ .append(",executionCount=").append(this.executionCount)
+ .append(",executionRowCount=").append(this.executionRowCount)
+ .append(",executionAvgTime=").append(this.getExecutionAvgTime())
+ .append(",executionMaxTime=").append(this.executionMaxTime)
+ .append(",executionMinTime=").append(this.executionMinTime)
+ .append(']')
+ .toString();
+ }
+
+ void incrementCacheHitCount() {
+ cacheHitCount.getAndIncrement();
+ }
+
+ void incrementCacheMissCount() {
+ cacheMissCount.getAndIncrement();
+ }
+
+ void incrementCachePutCount() {
+ cachePutCount.getAndIncrement();
+ }
+}
Added: core/trunk/core/src/main/java/org/hibernate/stat/ConcurrentSecondLevelCacheStatisticsImpl.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/stat/ConcurrentSecondLevelCacheStatisticsImpl.java (rev 0)
+++ core/trunk/core/src/main/java/org/hibernate/stat/ConcurrentSecondLevelCacheStatisticsImpl.java 2010-03-24 12:18:25 UTC (rev 19094)
@@ -0,0 +1,89 @@
+package org.hibernate.stat;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicLong;
+
+import org.hibernate.cache.CacheKey;
+import org.hibernate.cache.Region;
+
+/**
+ * Second level cache statistics of a specific region
+ *
+ * @author Alex Snaps
+ */
+public class ConcurrentSecondLevelCacheStatisticsImpl extends CategorizedStatistics implements SecondLevelCacheStatistics {
+
+ private final transient Region region;
+ private AtomicLong hitCount = new AtomicLong();
+ private AtomicLong missCount = new AtomicLong();
+ private AtomicLong putCount = new AtomicLong();
+
+ ConcurrentSecondLevelCacheStatisticsImpl(Region region) {
+ super(region.getName());
+ this.region = region;
+ }
+
+ public long getHitCount() {
+ return hitCount.get();
+ }
+
+ public long getMissCount() {
+ return missCount.get();
+ }
+
+ public long getPutCount() {
+ return putCount.get();
+ }
+
+ public long getElementCountInMemory() {
+ return region.getElementCountInMemory();
+ }
+
+ public long getElementCountOnDisk() {
+ return region.getElementCountOnDisk();
+ }
+
+ public long getSizeInMemory() {
+ return region.getSizeInMemory();
+ }
+
+ public Map getEntries() {
+ Map map = new HashMap();
+ Iterator iter = region.toMap().entrySet().iterator();
+ while (iter.hasNext()) {
+ Map.Entry me = (Map.Entry) iter.next();
+ map.put(((CacheKey) me.getKey()).getKey(), me.getValue());
+ }
+ return map;
+ }
+
+ public String toString() {
+ StringBuilder buf = new StringBuilder()
+ .append("SecondLevelCacheStatistics")
+ .append("[hitCount=").append(this.hitCount)
+ .append(",missCount=").append(this.missCount)
+ .append(",putCount=").append(this.putCount);
+ //not sure if this would ever be null but wanted to be careful
+ if (region != null) {
+ buf.append(",elementCountInMemory=").append(this.getElementCountInMemory())
+ .append(",elementCountOnDisk=").append(this.getElementCountOnDisk())
+ .append(",sizeInMemory=").append(this.getSizeInMemory());
+ }
+ buf.append(']');
+ return buf.toString();
+ }
+
+ void incrementHitCount() {
+ hitCount.getAndIncrement();
+ }
+
+ void incrementMissCount() {
+ missCount.getAndIncrement();
+ }
+
+ void incrementPutCount() {
+ putCount.getAndIncrement();
+ }
+}
Added: core/trunk/core/src/main/java/org/hibernate/stat/ConcurrentStatisticsImpl.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/stat/ConcurrentStatisticsImpl.java (rev 0)
+++ core/trunk/core/src/main/java/org/hibernate/stat/ConcurrentStatisticsImpl.java 2010-03-24 12:18:25 UTC (rev 19094)
@@ -0,0 +1,661 @@
+package org.hibernate.stat;
+
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicLong;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.hibernate.cache.Region;
+import org.hibernate.engine.SessionFactoryImplementor;
+import org.hibernate.util.ArrayHelper;
+
+/**
+ * @author Alex Snaps
+ * @see org.hibernate.stat.Statistics
+ */
+public class ConcurrentStatisticsImpl implements Statistics, StatisticsImplementor {
+
+ //TODO: we should provide some way to get keys of collection of statistics to make it easier to retrieve from a GUI perspective
+
+ private static final Logger log = LoggerFactory.getLogger(ConcurrentStatisticsImpl.class);
+
+ private SessionFactoryImplementor sessionFactory;
+
+ private volatile boolean isStatisticsEnabled;
+ private volatile long startTime;
+ private AtomicLong sessionOpenCount = new AtomicLong();
+ private AtomicLong sessionCloseCount = new AtomicLong();
+ private AtomicLong flushCount = new AtomicLong();
+ private AtomicLong connectCount = new AtomicLong();
+
+ private AtomicLong prepareStatementCount = new AtomicLong();
+ private AtomicLong closeStatementCount = new AtomicLong();
+
+ private AtomicLong entityLoadCount = new AtomicLong();
+ private AtomicLong entityUpdateCount = new AtomicLong();
+ private AtomicLong entityInsertCount = new AtomicLong();
+ private AtomicLong entityDeleteCount = new AtomicLong();
+ private AtomicLong entityFetchCount = new AtomicLong();
+ private AtomicLong collectionLoadCount = new AtomicLong();
+ private AtomicLong collectionUpdateCount = new AtomicLong();
+ private AtomicLong collectionRemoveCount = new AtomicLong();
+ private AtomicLong collectionRecreateCount = new AtomicLong();
+ private AtomicLong collectionFetchCount = new AtomicLong();
+
+ private AtomicLong secondLevelCacheHitCount = new AtomicLong();
+ private AtomicLong secondLevelCacheMissCount = new AtomicLong();
+ private AtomicLong secondLevelCachePutCount = new AtomicLong();
+
+ private AtomicLong queryExecutionCount = new AtomicLong();
+ private AtomicLong queryExecutionMaxTime = new AtomicLong();
+ private volatile String queryExecutionMaxTimeQueryString;
+ private AtomicLong queryCacheHitCount = new AtomicLong();
+ private AtomicLong queryCacheMissCount = new AtomicLong();
+ private AtomicLong queryCachePutCount = new AtomicLong();
+
+ private AtomicLong commitedTransactionCount = new AtomicLong();
+ private AtomicLong transactionCount = new AtomicLong();
+
+ private AtomicLong optimisticFailureCount = new AtomicLong();
+
+ /**
+ * second level cache statistics per region
+ */
+ private final ConcurrentMap secondLevelCacheStatistics = new ConcurrentHashMap();
+ /**
+ * entity statistics per name
+ */
+ private final ConcurrentMap entityStatistics = new ConcurrentHashMap();
+ /**
+ * collection statistics per name
+ */
+ private final ConcurrentMap collectionStatistics = new ConcurrentHashMap();
+ /**
+ * entity statistics per query string (HQL or SQL)
+ */
+ private final ConcurrentMap queryStatistics = new ConcurrentHashMap();
+
+ public ConcurrentStatisticsImpl() {
+ clear();
+ }
+
+ public ConcurrentStatisticsImpl(SessionFactoryImplementor sessionFactory) {
+ clear();
+ this.sessionFactory = sessionFactory;
+ }
+
+ /**
+ * reset all statistics
+ */
+ public void clear() {
+ secondLevelCacheHitCount.set(0);
+ secondLevelCacheMissCount.set(0);
+ secondLevelCachePutCount.set(0);
+
+ sessionCloseCount.set(0);
+ sessionOpenCount.set(0);
+ flushCount.set(0);
+ connectCount.set(0);
+
+ prepareStatementCount.set(0);
+ closeStatementCount.set(0);
+
+ entityDeleteCount.set(0);
+ entityInsertCount.set(0);
+ entityUpdateCount.set(0);
+ entityLoadCount.set(0);
+ entityFetchCount.set(0);
+
+ collectionRemoveCount.set(0);
+ collectionUpdateCount.set(0);
+ collectionRecreateCount.set(0);
+ collectionLoadCount.set(0);
+ collectionFetchCount.set(0);
+
+ queryExecutionCount.set(0);
+ queryCacheHitCount.set(0);
+ queryExecutionMaxTime.set(0);
+ queryExecutionMaxTimeQueryString = null;
+ queryCacheMissCount.set(0);
+ queryCachePutCount.set(0);
+
+ transactionCount.set(0);
+ commitedTransactionCount.set(0);
+
+ optimisticFailureCount.set(0);
+
+ secondLevelCacheStatistics.clear();
+ entityStatistics.clear();
+ collectionStatistics.clear();
+ queryStatistics.clear();
+
+ startTime = System.currentTimeMillis();
+ }
+
+ public void openSession() {
+ sessionOpenCount.getAndIncrement();
+ }
+
+ public void closeSession() {
+ sessionCloseCount.getAndIncrement();
+ }
+
+ public void flush() {
+ flushCount.getAndIncrement();
+ }
+
+ public void connect() {
+ connectCount.getAndIncrement();
+ }
+
+ public void loadEntity(String entityName) {
+ entityLoadCount.getAndIncrement();
+ ((ConcurrentEntityStatisticsImpl) getEntityStatistics(entityName)).incrementLoadCount();
+ }
+
+ public void fetchEntity(String entityName) {
+ entityFetchCount.getAndIncrement();
+ ((ConcurrentEntityStatisticsImpl) getEntityStatistics(entityName)).incrementFetchCount();
+ }
+
+ /**
+ * find entity statistics per name
+ *
+ * @param entityName entity name
+ * @return EntityStatistics object
+ */
+ public EntityStatistics getEntityStatistics(String entityName) {
+ ConcurrentEntityStatisticsImpl es = (ConcurrentEntityStatisticsImpl) entityStatistics.get(entityName);
+ if (es == null) {
+ es = new ConcurrentEntityStatisticsImpl(entityName);
+ ConcurrentEntityStatisticsImpl previous;
+ if ((previous = (ConcurrentEntityStatisticsImpl) entityStatistics.putIfAbsent(entityName, es)) != null) {
+ es = previous;
+ }
+ }
+ return es;
+ }
+
+ public void updateEntity(String entityName) {
+ entityUpdateCount.getAndIncrement();
+ ConcurrentEntityStatisticsImpl es = (ConcurrentEntityStatisticsImpl) getEntityStatistics(entityName);
+ es.incrementUpdateCount();
+ }
+
+ public void insertEntity(String entityName) {
+ entityInsertCount.getAndIncrement();
+ ConcurrentEntityStatisticsImpl es = (ConcurrentEntityStatisticsImpl) getEntityStatistics(entityName);
+ es.incrementInsertCount();
+ }
+
+ public void deleteEntity(String entityName) {
+ entityDeleteCount.getAndIncrement();
+ ConcurrentEntityStatisticsImpl es = (ConcurrentEntityStatisticsImpl) getEntityStatistics(entityName);
+ es.incrementDeleteCount();
+ }
+
+ /**
+ * Get collection statistics per role
+ *
+ * @param role collection role
+ * @return CollectionStatistics
+ */
+ public CollectionStatistics getCollectionStatistics(String role) {
+ ConcurrentCollectionStatisticsImpl cs = (ConcurrentCollectionStatisticsImpl) collectionStatistics.get(role);
+ if (cs == null) {
+ cs = new ConcurrentCollectionStatisticsImpl(role);
+ ConcurrentCollectionStatisticsImpl previous;
+ if ((previous = (ConcurrentCollectionStatisticsImpl) collectionStatistics.putIfAbsent(role, cs)) != null) {
+ cs = previous;
+ }
+ }
+ return cs;
+ }
+
+ public void loadCollection(String role) {
+ collectionLoadCount.getAndIncrement();
+ ((ConcurrentCollectionStatisticsImpl) getCollectionStatistics(role)).incrementLoadCount();
+ }
+
+ public void fetchCollection(String role) {
+ collectionFetchCount.getAndIncrement();
+ ((ConcurrentCollectionStatisticsImpl) getCollectionStatistics(role)).incrementFetchCount();
+ }
+
+ public void updateCollection(String role) {
+ collectionUpdateCount.getAndIncrement();
+ ((ConcurrentCollectionStatisticsImpl) getCollectionStatistics(role)).incrementUpdateCount();
+ }
+
+ public void recreateCollection(String role) {
+ collectionRecreateCount.getAndIncrement();
+ ((ConcurrentCollectionStatisticsImpl) getCollectionStatistics(role)).incrementRecreateCount();
+ }
+
+ public void removeCollection(String role) {
+ collectionRemoveCount.getAndIncrement();
+ ((ConcurrentCollectionStatisticsImpl) getCollectionStatistics(role)).incrementRemoveCount();
+ }
+
+ /**
+ * Second level cache statistics per region
+ *
+ * @param regionName region name
+ * @return SecondLevelCacheStatistics
+ */
+ public SecondLevelCacheStatistics getSecondLevelCacheStatistics(String regionName) {
+ ConcurrentSecondLevelCacheStatisticsImpl slcs
+ = (ConcurrentSecondLevelCacheStatisticsImpl) secondLevelCacheStatistics.get(regionName);
+ if (slcs == null) {
+ if (sessionFactory == null) {
+ return null;
+ }
+ Region region = sessionFactory.getSecondLevelCacheRegion(regionName);
+ if (region == null) {
+ return null;
+ }
+ slcs = new ConcurrentSecondLevelCacheStatisticsImpl(region);
+ ConcurrentSecondLevelCacheStatisticsImpl previous;
+ if ((previous = (ConcurrentSecondLevelCacheStatisticsImpl) secondLevelCacheStatistics.putIfAbsent(regionName, slcs)) != null) {
+ slcs = previous;
+ }
+ }
+ return slcs;
+ }
+
+ public void secondLevelCachePut(String regionName) {
+ secondLevelCachePutCount.getAndIncrement();
+ ((ConcurrentSecondLevelCacheStatisticsImpl) getSecondLevelCacheStatistics(regionName)).incrementPutCount();
+ }
+
+ public void secondLevelCacheHit(String regionName) {
+ secondLevelCacheHitCount.getAndIncrement();
+ ((ConcurrentSecondLevelCacheStatisticsImpl) getSecondLevelCacheStatistics(regionName)).incrementHitCount();
+ }
+
+ public void secondLevelCacheMiss(String regionName) {
+ secondLevelCacheMissCount.getAndIncrement();
+ ((ConcurrentSecondLevelCacheStatisticsImpl) getSecondLevelCacheStatistics(regionName)).incrementMissCount();
+ }
+
+ public void queryExecuted(String hql, int rows, long time) {
+ queryExecutionCount.getAndIncrement();
+ boolean isLongestQuery = false;
+ for (long old = queryExecutionMaxTime.get(); (time > old) && (isLongestQuery = !queryExecutionMaxTime.compareAndSet(old, time)); old = queryExecutionMaxTime.get())
+ ;
+ if (isLongestQuery) {
+ queryExecutionMaxTimeQueryString = hql;
+ }
+ if (hql != null) {
+ ConcurrentQueryStatisticsImpl qs = (ConcurrentQueryStatisticsImpl) getQueryStatistics(hql);
+ qs.executed(rows, time);
+ }
+ }
+
+ public void queryCacheHit(String hql, String regionName) {
+ queryCacheHitCount.getAndIncrement();
+ if (hql != null) {
+ ConcurrentQueryStatisticsImpl qs = (ConcurrentQueryStatisticsImpl) getQueryStatistics(hql);
+ qs.incrementCacheHitCount();
+ }
+ ConcurrentSecondLevelCacheStatisticsImpl slcs = (ConcurrentSecondLevelCacheStatisticsImpl) getSecondLevelCacheStatistics(regionName);
+ slcs.incrementHitCount();
+ }
+
+ public void queryCacheMiss(String hql, String regionName) {
+ queryCacheMissCount.getAndIncrement();
+ if (hql != null) {
+ ConcurrentQueryStatisticsImpl qs = (ConcurrentQueryStatisticsImpl) getQueryStatistics(hql);
+ qs.incrementCacheMissCount();
+ }
+ ConcurrentSecondLevelCacheStatisticsImpl slcs = (ConcurrentSecondLevelCacheStatisticsImpl) getSecondLevelCacheStatistics(regionName);
+ slcs.incrementMissCount();
+ }
+
+ public void queryCachePut(String hql, String regionName) {
+ queryCachePutCount.getAndIncrement();
+ if (hql != null) {
+ ConcurrentQueryStatisticsImpl qs = (ConcurrentQueryStatisticsImpl) getQueryStatistics(hql);
+ qs.incrementCachePutCount();
+ }
+ ConcurrentSecondLevelCacheStatisticsImpl slcs = (ConcurrentSecondLevelCacheStatisticsImpl) getSecondLevelCacheStatistics(regionName);
+ slcs.incrementPutCount();
+ }
+
+ /**
+ * Query statistics from query string (HQL or SQL)
+ *
+ * @param queryString query string
+ * @return QueryStatistics
+ */
+ public QueryStatistics getQueryStatistics(String queryString) {
+ ConcurrentQueryStatisticsImpl qs = (ConcurrentQueryStatisticsImpl) queryStatistics.get(queryString);
+ if (qs == null) {
+ qs = new ConcurrentQueryStatisticsImpl(queryString);
+ ConcurrentQueryStatisticsImpl previous;
+ if ((previous = (ConcurrentQueryStatisticsImpl) queryStatistics.putIfAbsent(queryString, qs)) != null) {
+ qs = previous;
+ }
+ }
+ return qs;
+ }
+
+ /**
+ * @return entity deletion count
+ */
+ public long getEntityDeleteCount() {
+ return entityDeleteCount.get();
+ }
+
+ /**
+ * @return entity insertion count
+ */
+ public long getEntityInsertCount() {
+ return entityInsertCount.get();
+ }
+
+ /**
+ * @return entity load (from DB)
+ */
+ public long getEntityLoadCount() {
+ return entityLoadCount.get();
+ }
+
+ /**
+ * @return entity fetch (from DB)
+ */
+ public long getEntityFetchCount() {
+ return entityFetchCount.get();
+ }
+
+ /**
+ * @return entity update
+ */
+ public long getEntityUpdateCount() {
+ return entityUpdateCount.get();
+ }
+
+ public long getQueryExecutionCount() {
+ return queryExecutionCount.get();
+ }
+
+ public long getQueryCacheHitCount() {
+ return queryCacheHitCount.get();
+ }
+
+ public long getQueryCacheMissCount() {
+ return queryCacheMissCount.get();
+ }
+
+ public long getQueryCachePutCount() {
+ return queryCachePutCount.get();
+ }
+
+ /**
+ * @return flush
+ */
+ public long getFlushCount() {
+ return flushCount.get();
+ }
+
+ /**
+ * @return session connect
+ */
+ public long getConnectCount() {
+ return connectCount.get();
+ }
+
+ /**
+ * @return second level cache hit
+ */
+ public long getSecondLevelCacheHitCount() {
+ return secondLevelCacheHitCount.get();
+ }
+
+ /**
+ * @return second level cache miss
+ */
+ public long getSecondLevelCacheMissCount() {
+ return secondLevelCacheMissCount.get();
+ }
+
+ /**
+ * @return second level cache put
+ */
+ public long getSecondLevelCachePutCount() {
+ return secondLevelCachePutCount.get();
+ }
+
+ /**
+ * @return session closing
+ */
+ public long getSessionCloseCount() {
+ return sessionCloseCount.get();
+ }
+
+ /**
+ * @return session opening
+ */
+ public long getSessionOpenCount() {
+ return sessionOpenCount.get();
+ }
+
+ /**
+ * @return collection loading (from DB)
+ */
+ public long getCollectionLoadCount() {
+ return collectionLoadCount.get();
+ }
+
+ /**
+ * @return collection fetching (from DB)
+ */
+ public long getCollectionFetchCount() {
+ return collectionFetchCount.get();
+ }
+
+ /**
+ * @return collection update
+ */
+ public long getCollectionUpdateCount() {
+ return collectionUpdateCount.get();
+ }
+
+ /**
+ * @return collection removal
+ * FIXME: even if isInverse="true"?
+ */
+ public long getCollectionRemoveCount() {
+ return collectionRemoveCount.get();
+ }
+
+ /**
+ * @return collection recreation
+ */
+ public long getCollectionRecreateCount() {
+ return collectionRecreateCount.get();
+ }
+
+ /**
+ * @return start time in ms (JVM standards {@link System#currentTimeMillis()})
+ */
+ public long getStartTime() {
+ return startTime;
+ }
+
+ /**
+ * log in info level the main statistics
+ */
+ public void logSummary() {
+ log.info("Logging statistics....");
+ log.info("start time: " + startTime);
+ log.info("sessions opened: " + sessionOpenCount);
+ log.info("sessions closed: " + sessionCloseCount);
+ log.info("transactions: " + transactionCount);
+ log.info("successful transactions: " + commitedTransactionCount);
+ log.info("optimistic lock failures: " + optimisticFailureCount);
+ log.info("flushes: " + flushCount);
+ log.info("connections obtained: " + connectCount);
+ log.info("statements prepared: " + prepareStatementCount);
+ log.info("statements closed: " + closeStatementCount);
+ log.info("second level cache puts: " + secondLevelCachePutCount);
+ log.info("second level cache hits: " + secondLevelCacheHitCount);
+ log.info("second level cache misses: " + secondLevelCacheMissCount);
+ log.info("entities loaded: " + entityLoadCount);
+ log.info("entities updated: " + entityUpdateCount);
+ log.info("entities inserted: " + entityInsertCount);
+ log.info("entities deleted: " + entityDeleteCount);
+ log.info("entities fetched (minimize this): " + entityFetchCount);
+ log.info("collections loaded: " + collectionLoadCount);
+ log.info("collections updated: " + collectionUpdateCount);
+ log.info("collections removed: " + collectionRemoveCount);
+ log.info("collections recreated: " + collectionRecreateCount);
+ log.info("collections fetched (minimize this): " + collectionFetchCount);
+ log.info("queries executed to database: " + queryExecutionCount);
+ log.info("query cache puts: " + queryCachePutCount);
+ log.info("query cache hits: " + queryCacheHitCount);
+ log.info("query cache misses: " + queryCacheMissCount);
+ log.info("max query time: " + queryExecutionMaxTime + "ms");
+ }
+
+ /**
+ * Are statistics logged
+ */
+ public boolean isStatisticsEnabled() {
+ return isStatisticsEnabled;
+ }
+
+ /**
+ * Enable statistics logs (this is a dynamic parameter)
+ */
+ public void setStatisticsEnabled(boolean b) {
+ isStatisticsEnabled = b;
+ }
+
+ /**
+ * @return Returns the max query execution time,
+ * for all queries
+ */
+ public long getQueryExecutionMaxTime() {
+ return queryExecutionMaxTime.get();
+ }
+
+ /**
+ * Get all executed query strings
+ */
+ public String[] getQueries() {
+ return ArrayHelper.toStringArray(queryStatistics.keySet());
+ }
+
+ /**
+ * Get the names of all entities
+ */
+ public String[] getEntityNames() {
+ if (sessionFactory == null) {
+ return ArrayHelper.toStringArray(entityStatistics.keySet());
+ } else {
+ return ArrayHelper.toStringArray(sessionFactory.getAllClassMetadata().keySet());
+ }
+ }
+
+ /**
+ * Get the names of all collection roles
+ */
+ public String[] getCollectionRoleNames() {
+ if (sessionFactory == null) {
+ return ArrayHelper.toStringArray(collectionStatistics.keySet());
+ } else {
+ return ArrayHelper.toStringArray(sessionFactory.getAllCollectionMetadata().keySet());
+ }
+ }
+
+ /**
+ * Get all second-level cache region names
+ */
+ public String[] getSecondLevelCacheRegionNames() {
+ if (sessionFactory == null) {
+ return ArrayHelper.toStringArray(secondLevelCacheStatistics.keySet());
+ } else {
+ return ArrayHelper.toStringArray(sessionFactory.getAllSecondLevelCacheRegions().keySet());
+ }
+ }
+
+ public void endTransaction(boolean success) {
+ transactionCount.getAndIncrement();
+ if (success) commitedTransactionCount.getAndIncrement();
+ }
+
+ public long getSuccessfulTransactionCount() {
+ return commitedTransactionCount.get();
+ }
+
+ public long getTransactionCount() {
+ return transactionCount.get();
+ }
+
+ public void closeStatement() {
+ closeStatementCount.getAndIncrement();
+ }
+
+ public void prepareStatement() {
+ prepareStatementCount.getAndIncrement();
+ }
+
+ public long getCloseStatementCount() {
+ return closeStatementCount.get();
+ }
+
+ public long getPrepareStatementCount() {
+ return prepareStatementCount.get();
+ }
+
+ public void optimisticFailure(String entityName) {
+ optimisticFailureCount.getAndIncrement();
+ ((ConcurrentEntityStatisticsImpl) getEntityStatistics(entityName)).incrementOptimisticFailureCount();
+ }
+
+ public long getOptimisticFailureCount() {
+ return optimisticFailureCount.get();
+ }
+
+ public String toString() {
+ return new StringBuilder()
+ .append("Statistics[")
+ .append("start time=").append(startTime)
+ .append(",sessions opened=").append(sessionOpenCount)
+ .append(",sessions closed=").append(sessionCloseCount)
+ .append(",transactions=").append(transactionCount)
+ .append(",successful transactions=").append(commitedTransactionCount)
+ .append(",optimistic lock failures=").append(optimisticFailureCount)
+ .append(",flushes=").append(flushCount)
+ .append(",connections obtained=").append(connectCount)
+ .append(",statements prepared=").append(prepareStatementCount)
+ .append(",statements closed=").append(closeStatementCount)
+ .append(",second level cache puts=").append(secondLevelCachePutCount)
+ .append(",second level cache hits=").append(secondLevelCacheHitCount)
+ .append(",second level cache misses=").append(secondLevelCacheMissCount)
+ .append(",entities loaded=").append(entityLoadCount)
+ .append(",entities updated=").append(entityUpdateCount)
+ .append(",entities inserted=").append(entityInsertCount)
+ .append(",entities deleted=").append(entityDeleteCount)
+ .append(",entities fetched=").append(entityFetchCount)
+ .append(",collections loaded=").append(collectionLoadCount)
+ .append(",collections updated=").append(collectionUpdateCount)
+ .append(",collections removed=").append(collectionRemoveCount)
+ .append(",collections recreated=").append(collectionRecreateCount)
+ .append(",collections fetched=").append(collectionFetchCount)
+ .append(",queries executed to database=").append(queryExecutionCount)
+ .append(",query cache puts=").append(queryCachePutCount)
+ .append(",query cache hits=").append(queryCacheHitCount)
+ .append(",query cache misses=").append(queryCacheMissCount)
+ .append(",max query time=").append(queryExecutionMaxTime)
+ .append(']')
+ .toString();
+ }
+
+ public String getQueryExecutionMaxTimeQueryString() {
+ return queryExecutionMaxTimeQueryString;
+ }
+
+}
Modified: core/trunk/core/src/main/java/org/hibernate/stat/EntityStatistics.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/stat/EntityStatistics.java 2010-03-23 21:24:49 UTC (rev 19093)
+++ core/trunk/core/src/main/java/org/hibernate/stat/EntityStatistics.java 2010-03-24 12:18:25 UTC (rev 19094)
@@ -24,55 +24,25 @@
*/
package org.hibernate.stat;
+import java.io.Serializable;
/**
* Entity related statistics
- *
+ *
* @author Gavin King
+ * @author Alex Snaps
*/
-public class EntityStatistics extends CategorizedStatistics {
-
- EntityStatistics(String name) {
- super(name);
- }
+public interface EntityStatistics extends Serializable {
+ long getDeleteCount();
- long loadCount;
- long updateCount;
- long insertCount;
- long deleteCount;
- long fetchCount;
- long optimisticFailureCount;
+ long getInsertCount();
- public long getDeleteCount() {
- return deleteCount;
- }
- public long getInsertCount() {
- return insertCount;
- }
- public long getLoadCount() {
- return loadCount;
- }
- public long getUpdateCount() {
- return updateCount;
- }
- public long getFetchCount() {
- return fetchCount;
- }
- public long getOptimisticFailureCount() {
- return optimisticFailureCount;
- }
+ long getLoadCount();
- public String toString() {
- return new StringBuffer()
- .append("EntityStatistics")
- .append("[loadCount=").append(this.loadCount)
- .append(",updateCount=").append(this.updateCount)
- .append(",insertCount=").append(this.insertCount)
- .append(",deleteCount=").append(this.deleteCount)
- .append(",fetchCount=").append(this.fetchCount)
- .append(",optimisticLockFailureCount=").append(this.optimisticFailureCount)
- .append(']')
- .toString();
- }
+ long getUpdateCount();
+ long getFetchCount();
+
+ long getOptimisticFailureCount();
+
}
Added: core/trunk/core/src/main/java/org/hibernate/stat/EntityStatisticsImpl.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/stat/EntityStatisticsImpl.java (rev 0)
+++ core/trunk/core/src/main/java/org/hibernate/stat/EntityStatisticsImpl.java 2010-03-24 12:18:25 UTC (rev 19094)
@@ -0,0 +1,83 @@
+/*
+ * 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
+ *
+ */
+package org.hibernate.stat;
+
+
+/**
+ * Entity related statistics
+ *
+ * @author Gavin King
+ */
+public class EntityStatisticsImpl extends CategorizedStatistics implements EntityStatistics {
+
+ EntityStatisticsImpl(String name) {
+ super(name);
+ }
+
+ long loadCount;
+ long updateCount;
+ long insertCount;
+ long deleteCount;
+ long fetchCount;
+ long optimisticFailureCount;
+
+ public long getDeleteCount() {
+ return deleteCount;
+ }
+
+ public long getInsertCount() {
+ return insertCount;
+ }
+
+ public long getLoadCount() {
+ return loadCount;
+ }
+
+ public long getUpdateCount() {
+ return updateCount;
+ }
+
+ public long getFetchCount() {
+ return fetchCount;
+ }
+
+ public long getOptimisticFailureCount() {
+ return optimisticFailureCount;
+ }
+
+ public String toString() {
+ return new StringBuilder()
+ .append("EntityStatistics")
+ .append("[loadCount=").append(this.loadCount)
+ .append(",updateCount=").append(this.updateCount)
+ .append(",insertCount=").append(this.insertCount)
+ .append(",deleteCount=").append(this.deleteCount)
+ .append(",fetchCount=").append(this.fetchCount)
+ .append(",optimisticLockFailureCount=").append(this.optimisticFailureCount)
+ .append(']')
+ .toString();
+ }
+
+}
Modified: core/trunk/core/src/main/java/org/hibernate/stat/QueryStatistics.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/stat/QueryStatistics.java 2010-03-23 21:24:49 UTC (rev 19093)
+++ core/trunk/core/src/main/java/org/hibernate/stat/QueryStatistics.java 2010-03-24 12:18:25 UTC (rev 19094)
@@ -24,111 +24,30 @@
*/
package org.hibernate.stat;
+import java.io.Serializable;
+
/**
* Query statistics (HQL and SQL)
- *
+ * <p/>
* Note that for a cached query, the cache miss is equals to the db count
- *
+ *
* @author Gavin King
+ * @author Alex Snaps
*/
-public class QueryStatistics extends CategorizedStatistics {
+public interface QueryStatistics extends Serializable {
+ long getExecutionCount();
- /*package*/ long cacheHitCount;
- /*package*/ long cacheMissCount;
- /*package*/ long cachePutCount;
- private long executionCount;
- private long executionRowCount;
- private long executionAvgTime;
- private long executionMaxTime;
- private long executionMinTime = Long.MAX_VALUE;
+ long getCacheHitCount();
- QueryStatistics(String query) {
- super(query);
- }
+ long getCachePutCount();
- /**
- * queries executed to the DB
- */
- public long getExecutionCount() {
- return executionCount;
- }
-
- /**
- * Queries retrieved successfully from the cache
- */
- public long getCacheHitCount() {
- return cacheHitCount;
- }
-
- public long getCachePutCount() {
- return cachePutCount;
- }
-
- public long getCacheMissCount() {
- return cacheMissCount;
- }
-
- /**
- * Number of lines returned by all the executions of this query (from DB)
- * For now, {@link org.hibernate.Query#iterate()}
- * and {@link org.hibernate.Query#scroll()()} do not fill this statistic
- *
- * @return The number of rows cumulatively returned by the given query; iterate
- * and scroll queries do not effect this total as their number of returned rows
- * is not known at execution time.
- */
- public long getExecutionRowCount() {
- return executionRowCount;
- }
+ long getCacheMissCount();
- /**
- * average time in ms taken by the excution of this query onto the DB
- */
- public long getExecutionAvgTime() {
- return executionAvgTime;
- }
+ long getExecutionRowCount();
- /**
- * max time in ms taken by the excution of this query onto the DB
- */
- public long getExecutionMaxTime() {
- return executionMaxTime;
- }
-
- /**
- * min time in ms taken by the excution of this query onto the DB
- */
- public long getExecutionMinTime() {
- return executionMinTime;
- }
-
- /**
- * add statistics report of a DB query
- *
- * @param rows rows count returned
- * @param time time taken
- */
- void executed(long rows, long time) {
- if (time < executionMinTime) executionMinTime = time;
- if (time > executionMaxTime) executionMaxTime = time;
- executionAvgTime = ( executionAvgTime * executionCount + time ) / ( executionCount + 1 );
- executionCount++;
- executionRowCount += rows;
- }
+ long getExecutionAvgTime();
- public String toString() {
- return new StringBuffer()
- .append( "QueryStatistics" )
- .append( "[cacheHitCount=" ).append( this.cacheHitCount )
- .append( ",cacheMissCount=" ).append( this.cacheMissCount )
- .append( ",cachePutCount=" ).append( this.cachePutCount )
- .append( ",executionCount=" ).append( this.executionCount )
- .append( ",executionRowCount=" ).append( this.executionRowCount )
- .append( ",executionAvgTime=" ).append( this.executionAvgTime )
- .append( ",executionMaxTime=" ).append( this.executionMaxTime )
- .append( ",executionMinTime=" ).append( this.executionMinTime )
- .append( ']' )
- .toString();
- }
+ long getExecutionMaxTime();
+ long getExecutionMinTime();
}
Added: core/trunk/core/src/main/java/org/hibernate/stat/QueryStatisticsImpl.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/stat/QueryStatisticsImpl.java (rev 0)
+++ core/trunk/core/src/main/java/org/hibernate/stat/QueryStatisticsImpl.java 2010-03-24 12:18:25 UTC (rev 19094)
@@ -0,0 +1,137 @@
+/*
+ * 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.stat;
+
+/**
+ * Query statistics (HQL and SQL)
+ * <p/>
+ * Note that for a cached query, the cache miss is equals to the db count
+ *
+ * @author Gavin King
+ */
+public class QueryStatisticsImpl extends CategorizedStatistics implements QueryStatistics {
+
+ /*package*/
+ long cacheHitCount;
+ /*package*/
+ long cacheMissCount;
+ /*package*/
+ long cachePutCount;
+ private long executionCount;
+ private long executionRowCount;
+ private long executionAvgTime;
+ private long executionMaxTime;
+ private long executionMinTime = Long.MAX_VALUE;
+
+ QueryStatisticsImpl(String query) {
+ super(query);
+ }
+
+ /**
+ * queries executed to the DB
+ */
+ public long getExecutionCount() {
+ return executionCount;
+ }
+
+ /**
+ * Queries retrieved successfully from the cache
+ */
+ public long getCacheHitCount() {
+ return cacheHitCount;
+ }
+
+ public long getCachePutCount() {
+ return cachePutCount;
+ }
+
+ public long getCacheMissCount() {
+ return cacheMissCount;
+ }
+
+ /**
+ * Number of lines returned by all the executions of this query (from DB)
+ * For now, {@link org.hibernate.Query#iterate()}
+ * and {@link org.hibernate.Query#scroll()()} do not fill this statistic
+ *
+ * @return The number of rows cumulatively returned by the given query; iterate
+ * and scroll queries do not effect this total as their number of returned rows
+ * is not known at execution time.
+ */
+ public long getExecutionRowCount() {
+ return executionRowCount;
+ }
+
+ /**
+ * average time in ms taken by the excution of this query onto the DB
+ */
+ public long getExecutionAvgTime() {
+ return executionAvgTime;
+ }
+
+ /**
+ * max time in ms taken by the excution of this query onto the DB
+ */
+ public long getExecutionMaxTime() {
+ return executionMaxTime;
+ }
+
+ /**
+ * min time in ms taken by the excution of this query onto the DB
+ */
+ public long getExecutionMinTime() {
+ return executionMinTime;
+ }
+
+ /**
+ * add statistics report of a DB query
+ *
+ * @param rows rows count returned
+ * @param time time taken
+ */
+ void executed(long rows, long time) {
+ if (time < executionMinTime) executionMinTime = time;
+ if (time > executionMaxTime) executionMaxTime = time;
+ executionAvgTime = (executionAvgTime * executionCount + time) / (executionCount + 1);
+ executionCount++;
+ executionRowCount += rows;
+ }
+
+ public String toString() {
+ return new StringBuilder()
+ .append("QueryStatistics")
+ .append("[cacheHitCount=").append(this.cacheHitCount)
+ .append(",cacheMissCount=").append(this.cacheMissCount)
+ .append(",cachePutCount=").append(this.cachePutCount)
+ .append(",executionCount=").append(this.executionCount)
+ .append(",executionRowCount=").append(this.executionRowCount)
+ .append(",executionAvgTime=").append(this.executionAvgTime)
+ .append(",executionMaxTime=").append(this.executionMaxTime)
+ .append(",executionMinTime=").append(this.executionMinTime)
+ .append(']')
+ .toString();
+ }
+
+}
Modified: core/trunk/core/src/main/java/org/hibernate/stat/SecondLevelCacheStatistics.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/stat/SecondLevelCacheStatistics.java 2010-03-23 21:24:49 UTC (rev 19093)
+++ core/trunk/core/src/main/java/org/hibernate/stat/SecondLevelCacheStatistics.java 2010-03-24 12:18:25 UTC (rev 19094)
@@ -24,71 +24,28 @@
*/
package org.hibernate.stat;
-import java.util.HashMap;
-import java.util.Iterator;
+import java.io.Serializable;
import java.util.Map;
-import org.hibernate.cache.CacheKey;
-import org.hibernate.cache.Region;
-
/**
* Second level cache statistics of a specific region
- *
+ *
* @author Gavin King
+ * @author Alex Snaps
*/
-public class SecondLevelCacheStatistics extends CategorizedStatistics {
+public interface SecondLevelCacheStatistics extends Serializable {
- private transient Region region;
- long hitCount;
- long missCount;
- long putCount;
+ long getHitCount();
- SecondLevelCacheStatistics(Region region) {
- super( region.getName() );
- this.region = region;
- }
- public long getHitCount() {
- return hitCount;
- }
- public long getMissCount() {
- return missCount;
- }
- public long getPutCount() {
- return putCount;
- }
- public long getElementCountInMemory() {
- return region.getElementCountInMemory();
- }
- public long getElementCountOnDisk() {
- return region.getElementCountOnDisk();
- }
- public long getSizeInMemory() {
- return region.getSizeInMemory();
- }
-
- public Map getEntries() {
- Map map = new HashMap();
- Iterator iter = region.toMap().entrySet().iterator();
- while ( iter.hasNext() ) {
- Map.Entry me = (Map.Entry) iter.next();
- map.put( ( (CacheKey) me.getKey() ).getKey(), me.getValue() );
- }
- return map;
- }
+ long getMissCount();
- public String toString() {
- StringBuffer buf = new StringBuffer()
- .append("SecondLevelCacheStatistics")
- .append("[hitCount=").append(this.hitCount)
- .append(",missCount=").append(this.missCount)
- .append(",putCount=").append(this.putCount);
- //not sure if this would ever be null but wanted to be careful
- if ( region != null ) {
- buf.append(",elementCountInMemory=").append(this.getElementCountInMemory())
- .append(",elementCountOnDisk=").append(this.getElementCountOnDisk())
- .append(",sizeInMemory=").append(this.getSizeInMemory());
- }
- buf.append(']');
- return buf.toString();
- }
+ long getPutCount();
+
+ long getElementCountInMemory();
+
+ long getElementCountOnDisk();
+
+ long getSizeInMemory();
+
+ Map getEntries();
}
Added: core/trunk/core/src/main/java/org/hibernate/stat/SecondLevelCacheStatisticsImpl.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/stat/SecondLevelCacheStatisticsImpl.java (rev 0)
+++ core/trunk/core/src/main/java/org/hibernate/stat/SecondLevelCacheStatisticsImpl.java 2010-03-24 12:18:25 UTC (rev 19094)
@@ -0,0 +1,100 @@
+/*
+ * 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
+ *
+ */
+package org.hibernate.stat;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.hibernate.cache.CacheKey;
+import org.hibernate.cache.Region;
+
+/**
+ * Second level cache statistics of a specific region
+ *
+ * @author Gavin King
+ */
+public class SecondLevelCacheStatisticsImpl extends CategorizedStatistics implements SecondLevelCacheStatistics {
+
+ private transient Region region;
+ long hitCount;
+ long missCount;
+ long putCount;
+
+ SecondLevelCacheStatisticsImpl(Region region) {
+ super(region.getName());
+ this.region = region;
+ }
+
+ public long getHitCount() {
+ return hitCount;
+ }
+
+ public long getMissCount() {
+ return missCount;
+ }
+
+ public long getPutCount() {
+ return putCount;
+ }
+
+ public long getElementCountInMemory() {
+ return region.getElementCountInMemory();
+ }
+
+ public long getElementCountOnDisk() {
+ return region.getElementCountOnDisk();
+ }
+
+ public long getSizeInMemory() {
+ return region.getSizeInMemory();
+ }
+
+ public Map getEntries() {
+ Map map = new HashMap();
+ Iterator iter = region.toMap().entrySet().iterator();
+ while (iter.hasNext()) {
+ Map.Entry me = (Map.Entry) iter.next();
+ map.put(((CacheKey) me.getKey()).getKey(), me.getValue());
+ }
+ return map;
+ }
+
+ public String toString() {
+ StringBuilder builder = new StringBuilder()
+ .append("SecondLevelCacheStatistics")
+ .append("[hitCount=").append(this.hitCount)
+ .append(",missCount=").append(this.missCount)
+ .append(",putCount=").append(this.putCount);
+ //not sure if this would ever be null but wanted to be careful
+ if (region != null) {
+ builder.append(",elementCountInMemory=").append(this.getElementCountInMemory())
+ .append(",elementCountOnDisk=").append(this.getElementCountOnDisk())
+ .append(",sizeInMemory=").append(this.getSizeInMemory());
+ }
+ builder.append(']');
+ return builder.toString();
+ }
+}
Modified: core/trunk/core/src/main/java/org/hibernate/stat/StatisticsImpl.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/stat/StatisticsImpl.java 2010-03-23 21:24:49 UTC (rev 19093)
+++ core/trunk/core/src/main/java/org/hibernate/stat/StatisticsImpl.java 2010-03-24 12:18:25 UTC (rev 19094)
@@ -166,12 +166,12 @@
public synchronized void loadEntity(String entityName) {
entityLoadCount++;
- getEntityStatistics(entityName).loadCount++;
+ ((EntityStatisticsImpl) getEntityStatistics(entityName)).loadCount++;
}
public synchronized void fetchEntity(String entityName) {
entityFetchCount++;
- getEntityStatistics(entityName).fetchCount++;
+ ((EntityStatisticsImpl) getEntityStatistics(entityName)).fetchCount++;
}
/**
@@ -181,9 +181,9 @@
* @return EntityStatistics object
*/
public synchronized EntityStatistics getEntityStatistics(String entityName) {
- EntityStatistics es = (EntityStatistics) entityStatistics.get(entityName);
- if (es==null) {
- es = new EntityStatistics(entityName);
+ EntityStatisticsImpl es = (EntityStatisticsImpl) entityStatistics.get(entityName);
+ if (es == null) {
+ es = new EntityStatisticsImpl(entityName);
entityStatistics.put(entityName, es);
}
return es;
@@ -191,19 +191,19 @@
public synchronized void updateEntity(String entityName) {
entityUpdateCount++;
- EntityStatistics es = getEntityStatistics(entityName);
+ EntityStatisticsImpl es = (EntityStatisticsImpl) getEntityStatistics(entityName);
es.updateCount++;
}
public synchronized void insertEntity(String entityName) {
entityInsertCount++;
- EntityStatistics es = getEntityStatistics(entityName);
+ EntityStatisticsImpl es = (EntityStatisticsImpl) getEntityStatistics(entityName);
es.insertCount++;
}
public synchronized void deleteEntity(String entityName) {
entityDeleteCount++;
- EntityStatistics es = getEntityStatistics(entityName);
+ EntityStatisticsImpl es = (EntityStatisticsImpl) getEntityStatistics(entityName);
es.deleteCount++;
}
@@ -214,9 +214,9 @@
* @return CollectionStatistics
*/
public synchronized CollectionStatistics getCollectionStatistics(String role) {
- CollectionStatistics cs = (CollectionStatistics) collectionStatistics.get(role);
+ CollectionStatisticsImpl cs = (CollectionStatisticsImpl) collectionStatistics.get(role);
if (cs==null) {
- cs = new CollectionStatistics(role);
+ cs = new CollectionStatisticsImpl(role);
collectionStatistics.put(role, cs);
}
return cs;
@@ -224,27 +224,27 @@
public synchronized void loadCollection(String role) {
collectionLoadCount++;
- getCollectionStatistics(role).loadCount++;
+ ((CollectionStatisticsImpl) getCollectionStatistics(role)).loadCount++;
}
public synchronized void fetchCollection(String role) {
collectionFetchCount++;
- getCollectionStatistics(role).fetchCount++;
+ ((CollectionStatisticsImpl) getCollectionStatistics(role)).fetchCount++;
}
public synchronized void updateCollection(String role) {
collectionUpdateCount++;
- getCollectionStatistics(role).updateCount++;
+ ((CollectionStatisticsImpl) getCollectionStatistics(role)).updateCount++;
}
public synchronized void recreateCollection(String role) {
collectionRecreateCount++;
- getCollectionStatistics(role).recreateCount++;
+ ((CollectionStatisticsImpl) getCollectionStatistics(role)).recreateCount++;
}
public synchronized void removeCollection(String role) {
collectionRemoveCount++;
- getCollectionStatistics(role).removeCount++;
+ ((CollectionStatisticsImpl) getCollectionStatistics(role)).removeCount++;
}
/**
@@ -254,7 +254,7 @@
* @return SecondLevelCacheStatistics
*/
public synchronized SecondLevelCacheStatistics getSecondLevelCacheStatistics(String regionName) {
- SecondLevelCacheStatistics slcs = ( SecondLevelCacheStatistics ) secondLevelCacheStatistics.get( regionName );
+ SecondLevelCacheStatisticsImpl slcs = (SecondLevelCacheStatisticsImpl) secondLevelCacheStatistics.get(regionName);
if ( slcs == null ) {
if ( sessionFactory == null ) {
return null;
@@ -263,7 +263,7 @@
if ( region == null ) {
return null;
}
- slcs = new SecondLevelCacheStatistics( region );
+ slcs = new SecondLevelCacheStatisticsImpl(region);
secondLevelCacheStatistics.put( regionName, slcs );
}
return slcs;
@@ -271,17 +271,17 @@
public synchronized void secondLevelCachePut(String regionName) {
secondLevelCachePutCount++;
- getSecondLevelCacheStatistics(regionName).putCount++;
+ ((SecondLevelCacheStatisticsImpl) getSecondLevelCacheStatistics(regionName)).putCount++;
}
public synchronized void secondLevelCacheHit(String regionName) {
secondLevelCacheHitCount++;
- getSecondLevelCacheStatistics(regionName).hitCount++;
+ ((SecondLevelCacheStatisticsImpl) getSecondLevelCacheStatistics(regionName)).hitCount++;
}
public synchronized void secondLevelCacheMiss(String regionName) {
secondLevelCacheMissCount++;
- getSecondLevelCacheStatistics(regionName).missCount++;
+ ((SecondLevelCacheStatisticsImpl) getSecondLevelCacheStatistics(regionName)).missCount++;
}
public synchronized void queryExecuted(String hql, int rows, long time) {
@@ -291,7 +291,7 @@
queryExecutionMaxTimeQueryString = hql;
}
if (hql!=null) {
- QueryStatistics qs = getQueryStatistics(hql);
+ QueryStatisticsImpl qs = (QueryStatisticsImpl) getQueryStatistics(hql);
qs.executed(rows, time);
}
}
@@ -299,30 +299,30 @@
public synchronized void queryCacheHit(String hql, String regionName) {
queryCacheHitCount++;
if (hql!=null) {
- QueryStatistics qs = getQueryStatistics(hql);
+ QueryStatisticsImpl qs = (QueryStatisticsImpl) getQueryStatistics(hql);
qs.cacheHitCount++;
}
- SecondLevelCacheStatistics slcs = getSecondLevelCacheStatistics(regionName);
+ SecondLevelCacheStatisticsImpl slcs = (SecondLevelCacheStatisticsImpl) getSecondLevelCacheStatistics(regionName);
slcs.hitCount++;
}
public synchronized void queryCacheMiss(String hql, String regionName) {
queryCacheMissCount++;
if (hql!=null) {
- QueryStatistics qs = getQueryStatistics(hql);
+ QueryStatisticsImpl qs = (QueryStatisticsImpl) getQueryStatistics(hql);
qs.cacheMissCount++;
}
- SecondLevelCacheStatistics slcs = getSecondLevelCacheStatistics(regionName);
+ SecondLevelCacheStatisticsImpl slcs = (SecondLevelCacheStatisticsImpl) getSecondLevelCacheStatistics(regionName);
slcs.missCount++;
}
public synchronized void queryCachePut(String hql, String regionName) {
queryCachePutCount++;
if (hql!=null) {
- QueryStatistics qs = getQueryStatistics(hql);
+ QueryStatisticsImpl qs = (QueryStatisticsImpl) getQueryStatistics(hql);
qs.cachePutCount++;
}
- SecondLevelCacheStatistics slcs = getSecondLevelCacheStatistics(regionName);
+ SecondLevelCacheStatisticsImpl slcs = (SecondLevelCacheStatisticsImpl) getSecondLevelCacheStatistics(regionName);
slcs.putCount++;
}
@@ -333,9 +333,9 @@
* @return QueryStatistics
*/
public synchronized QueryStatistics getQueryStatistics(String queryString) {
- QueryStatistics qs = (QueryStatistics) queryStatistics.get(queryString);
+ QueryStatisticsImpl qs = (QueryStatisticsImpl) queryStatistics.get(queryString);
if (qs==null) {
- qs = new QueryStatistics(queryString);
+ qs = new QueryStatisticsImpl(queryString);
queryStatistics.put(queryString, qs);
}
return qs;
@@ -614,7 +614,7 @@
public void optimisticFailure(String entityName) {
optimisticFailureCount++;
- getEntityStatistics(entityName).optimisticFailureCount++;
+ ((EntityStatisticsImpl) getEntityStatistics(entityName)).optimisticFailureCount++;
}
public long getOptimisticFailureCount() {
@@ -659,4 +659,4 @@
return queryExecutionMaxTimeQueryString;
}
-}
\ No newline at end of file
+}
14 years, 1 month
- 1
- 0
Hibernate SVN: r19093 - in entitymanager/branches/v3_4_0_GA_CP/src: main/java/org/hibernate/ejb/connection and 24 other directories.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2010-03-23 17:24:49 -0400 (Tue, 23 Mar 2010)
New Revision: 19093
Modified:
entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/CurrentEntityManagerImpl.java
entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/Ejb3Configuration.java
entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/Ejb3ConfigurationObjectFactory.java
entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/EntityManagerFactoryImpl.java
entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/EntityManagerImpl.java
entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/HibernateEntityManagerFactory.java
entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/HibernatePersistence.java
entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/QueryImpl.java
entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/TransactionImpl.java
entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/connection/InjectedDataSourceConnectionProvider.java
entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/BeanCallback.java
entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/CallbackResolver.java
entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/EJB3DeleteEventListener.java
entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/EJB3MergeEventListener.java
entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/EJB3PersistEventListener.java
entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/EJB3SaveEventListener.java
entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/EJB3SaveOrUpdateEventListener.java
entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/EntityCallbackHandler.java
entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/ListenerCallback.java
entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/packaging/AbstractJarVisitor.java
entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/packaging/ExplodedJarVisitor.java
entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/packaging/FileZippedJarVisitor.java
entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/packaging/JarVisitor.java
entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/packaging/PersistenceMetadata.java
entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/packaging/PersistenceXmlLoader.java
entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/util/ConfigurationHelper.java
entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/util/LogHelper.java
entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/engine/EJB3CascadingAction.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/Distributor.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/EntityManagerTest.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/Item.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/LastUpdateListener.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/NoOpListener.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/QueryTest.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/Wallet.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/association/Oven.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/CallbackAndDirtyTest.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/CountryChecker.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/CountryNameCheckerListener.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/Employee.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/Plant.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/RemoteControl.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/Rythm.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/Television.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/VideoSystem.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/Conference.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/DeleteOrphanTest.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/ExtractionDocument.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/ExtractionDocumentInfo.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/FetchTest.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/Soldier.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/Soldier2.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/Troop.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/Troop2.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/connection/DataSourceInjectionTest.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/connection/FakeDataSource.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/connection/PersistenceUnitInfoImpl.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ejb3configuration/ExceptionInterceptor.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ejb3configuration/LocalExceptionInterceptor.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ejb3configuration/TestCase.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Colony.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Competition.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Competitor.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Dress.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Empire.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/FlushModeTest.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/FlushTest.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/MergeTest.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Music.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Race.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/RemoveTest.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/cascade/A.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/cascade/B1.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/cascade/B2.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/cascade/CascadePersistTest.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/exception/Music.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/inheritance/Fruit.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/lob/BlobTest.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/lob/ImageReader.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/lock/UnversionedLock.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ops/Animal.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ops/GetLoadTest.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ops/MergeTest.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ops/PersistTest.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/pack/defaultpar/Money.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/pack/overridenpar/Bug.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/pack/spacepar/Bug.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/pack/war/Money.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/transaction/FlushAndTransactionTest.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/xml/Article.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/xml/CounterListener.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/xml/sequences/Article.java
Log:
clean up unused imports
Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/CurrentEntityManagerImpl.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/CurrentEntityManagerImpl.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/CurrentEntityManagerImpl.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -2,6 +2,7 @@
package org.hibernate.ejb;
import java.util.Map;
+
import javax.persistence.PersistenceContextType;
import javax.persistence.spi.PersistenceUnitTransactionType;
Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/Ejb3Configuration.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/Ejb3Configuration.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/Ejb3Configuration.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -21,6 +21,7 @@
import java.util.Properties;
import java.util.Set;
import java.util.StringTokenizer;
+
import javax.naming.BinaryRefAddr;
import javax.naming.NamingException;
import javax.naming.Reference;
@@ -52,16 +53,16 @@
import org.hibernate.cfg.annotations.reflection.XMLContext;
import org.hibernate.ejb.connection.InjectedDataSourceConnectionProvider;
import org.hibernate.ejb.instrument.InterceptFieldClassFileTransformer;
+import org.hibernate.ejb.packaging.ClassFilter;
+import org.hibernate.ejb.packaging.Entry;
+import org.hibernate.ejb.packaging.FileFilter;
+import org.hibernate.ejb.packaging.Filter;
import org.hibernate.ejb.packaging.JarVisitor;
+import org.hibernate.ejb.packaging.JarVisitorFactory;
import org.hibernate.ejb.packaging.NamedInputStream;
+import org.hibernate.ejb.packaging.PackageFilter;
import org.hibernate.ejb.packaging.PersistenceMetadata;
import org.hibernate.ejb.packaging.PersistenceXmlLoader;
-import org.hibernate.ejb.packaging.Filter;
-import org.hibernate.ejb.packaging.JarVisitorFactory;
-import org.hibernate.ejb.packaging.Entry;
-import org.hibernate.ejb.packaging.FileFilter;
-import org.hibernate.ejb.packaging.PackageFilter;
-import org.hibernate.ejb.packaging.ClassFilter;
import org.hibernate.ejb.transaction.JoinableCMTTransactionFactory;
import org.hibernate.ejb.util.ConfigurationHelper;
import org.hibernate.ejb.util.LogHelper;
@@ -77,10 +78,10 @@
import org.hibernate.util.ReflectHelper;
import org.hibernate.util.StringHelper;
import org.hibernate.util.XMLHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xml.sax.EntityResolver;
import org.xml.sax.SAXException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Allow a fine tuned configuration of an EJB 3.0 EntityManagerFactory
Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/Ejb3ConfigurationObjectFactory.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/Ejb3ConfigurationObjectFactory.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/Ejb3ConfigurationObjectFactory.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -4,6 +4,7 @@
import java.io.ByteArrayInputStream;
import java.io.ObjectInputStream;
import java.util.Hashtable;
+
import javax.naming.Context;
import javax.naming.Name;
import javax.naming.Reference;
Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/EntityManagerFactoryImpl.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/EntityManagerFactoryImpl.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/EntityManagerFactoryImpl.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -2,6 +2,7 @@
package org.hibernate.ejb;
import java.util.Map;
+
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContextType;
import javax.persistence.spi.PersistenceUnitTransactionType;
Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/EntityManagerImpl.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/EntityManagerImpl.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/EntityManagerImpl.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -2,15 +2,16 @@
package org.hibernate.ejb;
import java.util.Map;
+
import javax.persistence.PersistenceContextType;
import javax.persistence.PersistenceException;
import javax.persistence.spi.PersistenceUnitTransactionType;
import javax.transaction.Synchronization;
import org.hibernate.HibernateException;
+import org.hibernate.Interceptor;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
-import org.hibernate.Interceptor;
import org.hibernate.annotations.common.util.ReflectHelper;
import org.hibernate.cfg.Environment;
import org.hibernate.engine.SessionImplementor;
Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/HibernateEntityManagerFactory.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/HibernateEntityManagerFactory.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/HibernateEntityManagerFactory.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -2,6 +2,7 @@
package org.hibernate.ejb;
import java.io.Serializable;
+
import javax.persistence.EntityManagerFactory;
import org.hibernate.SessionFactory;
Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/HibernatePersistence.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/HibernatePersistence.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/HibernatePersistence.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -2,6 +2,7 @@
package org.hibernate.ejb;
import java.util.Map;
+
import javax.persistence.EntityManagerFactory;
import javax.persistence.spi.PersistenceUnitInfo;
Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/QueryImpl.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/QueryImpl.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/QueryImpl.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -23,18 +23,22 @@
*/
package org.hibernate.ejb;
+import static javax.persistence.TemporalType.DATE;
+import static javax.persistence.TemporalType.TIME;
+import static javax.persistence.TemporalType.TIMESTAMP;
+
import java.util.Calendar;
import java.util.Collection;
import java.util.Date;
+import java.util.HashSet;
import java.util.List;
-import java.util.HashSet;
import java.util.Set;
+
import javax.persistence.FlushModeType;
import javax.persistence.NoResultException;
import javax.persistence.NonUniqueResultException;
import javax.persistence.Query;
import javax.persistence.TemporalType;
-import static javax.persistence.TemporalType.*;
import javax.persistence.TransactionRequiredException;
import org.hibernate.FlushMode;
@@ -42,9 +46,9 @@
import org.hibernate.QueryParameterException;
import org.hibernate.SQLQuery;
import org.hibernate.TypeMismatchException;
-import org.hibernate.impl.AbstractQueryImpl;
import org.hibernate.ejb.util.ConfigurationHelper;
import org.hibernate.hql.QueryExecutionRequestException;
+import org.hibernate.impl.AbstractQueryImpl;
/**
* @author <a href="mailto:gavin@hibernate.org">Gavin King</a>
Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/TransactionImpl.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/TransactionImpl.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/TransactionImpl.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -7,8 +7,8 @@
import org.hibernate.HibernateException;
import org.hibernate.Session;
+import org.hibernate.StaleStateException;
import org.hibernate.Transaction;
-import org.hibernate.StaleStateException;
/**
* @author Gavin King
Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/connection/InjectedDataSourceConnectionProvider.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/connection/InjectedDataSourceConnectionProvider.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/connection/InjectedDataSourceConnectionProvider.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -1,16 +1,17 @@
//$Id$
package org.hibernate.ejb.connection;
-import java.util.Properties;
import java.sql.Connection;
import java.sql.SQLException;
+import java.util.Properties;
+
import javax.sql.DataSource;
import org.hibernate.HibernateException;
import org.hibernate.cfg.Environment;
import org.hibernate.connection.DatasourceConnectionProvider;
+import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.slf4j.Logger;
/**
* A connection provider that uses an injected <tt>DataSource</tt>.
Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/BeanCallback.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/BeanCallback.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/BeanCallback.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -6,8 +6,8 @@
*/
package org.hibernate.ejb.event;
+import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
/**
* @author <a href="mailto:kabir.khan@jboss.org">Kabir Khan</a>
Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/CallbackResolver.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/CallbackResolver.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/CallbackResolver.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -13,6 +13,7 @@
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
+
import javax.persistence.Entity;
import javax.persistence.EntityListeners;
import javax.persistence.ExcludeDefaultListeners;
Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/EJB3DeleteEventListener.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/EJB3DeleteEventListener.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/EJB3DeleteEventListener.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -3,8 +3,8 @@
import java.io.Serializable;
+import org.hibernate.event.DeleteEvent;
import org.hibernate.event.EventSource;
-import org.hibernate.event.DeleteEvent;
import org.hibernate.event.def.DefaultDeleteEventListener;
import org.hibernate.persister.entity.EntityPersister;
Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/EJB3MergeEventListener.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/EJB3MergeEventListener.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/EJB3MergeEventListener.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -5,7 +5,6 @@
import org.hibernate.event.EventSource;
import org.hibernate.event.def.DefaultMergeEventListener;
-import org.hibernate.persister.entity.EntityPersister;
/**
* Overrides the LifeCycle OnSave call to call the PrePersist operation
Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/EJB3PersistEventListener.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/EJB3PersistEventListener.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/EJB3PersistEventListener.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -3,11 +3,11 @@
import java.io.Serializable;
+import org.hibernate.engine.CascadingAction;
+import org.hibernate.engine.EJB3CascadeStyle;
+import org.hibernate.engine.EJB3CascadingAction;
import org.hibernate.event.EventSource;
import org.hibernate.event.def.DefaultPersistEventListener;
-import org.hibernate.engine.CascadingAction;
-import org.hibernate.engine.EJB3CascadingAction;
-import org.hibernate.engine.EJB3CascadeStyle;
/**
* Overrides the LifeCycle OnSave call to call the PrePersist operation
Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/EJB3SaveEventListener.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/EJB3SaveEventListener.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/EJB3SaveEventListener.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -5,7 +5,6 @@
import org.hibernate.event.EventSource;
import org.hibernate.event.def.DefaultSaveEventListener;
-import org.hibernate.persister.entity.EntityPersister;
/**
* Overrides the LifeCycle OnSave call to call the PrePersist operation
Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/EJB3SaveOrUpdateEventListener.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/EJB3SaveOrUpdateEventListener.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/EJB3SaveOrUpdateEventListener.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -5,7 +5,6 @@
import org.hibernate.event.EventSource;
import org.hibernate.event.def.DefaultSaveOrUpdateEventListener;
-import org.hibernate.persister.entity.EntityPersister;
/**
* Overrides the LifeCycle OnSave call to call the PrePersist operation
Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/EntityCallbackHandler.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/EntityCallbackHandler.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/EntityCallbackHandler.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -9,6 +9,7 @@
import java.io.Serializable;
import java.util.HashMap;
+
import javax.persistence.PostLoad;
import javax.persistence.PostPersist;
import javax.persistence.PostRemove;
@@ -17,8 +18,8 @@
import javax.persistence.PreRemove;
import javax.persistence.PreUpdate;
+import org.hibernate.annotations.common.reflection.ReflectionManager;
import org.hibernate.annotations.common.reflection.XClass;
-import org.hibernate.annotations.common.reflection.ReflectionManager;
/**
* Keep track of all lifecycle callbacks and listeners for a given persistence unit
Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/ListenerCallback.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/ListenerCallback.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/ListenerCallback.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -9,8 +9,8 @@
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
+import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
import org.hibernate.util.ReflectHelper;
Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/packaging/AbstractJarVisitor.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/packaging/AbstractJarVisitor.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/packaging/AbstractJarVisitor.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -12,6 +12,7 @@
import javassist.bytecode.AnnotationsAttribute;
import javassist.bytecode.ClassFile;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/packaging/ExplodedJarVisitor.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/packaging/ExplodedJarVisitor.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/packaging/ExplodedJarVisitor.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -11,8 +11,8 @@
import java.util.jar.JarFile;
import java.util.zip.ZipEntry;
+import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.slf4j.Logger;
/**
Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/packaging/FileZippedJarVisitor.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/packaging/FileZippedJarVisitor.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/packaging/FileZippedJarVisitor.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -2,12 +2,11 @@
package org.hibernate.ejb.packaging;
import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.net.URL;
import java.net.URISyntaxException;
+import java.net.URL;
import java.util.Enumeration;
import java.util.jar.JarFile;
import java.util.jar.JarInputStream;
Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/packaging/JarVisitor.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/packaging/JarVisitor.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/packaging/JarVisitor.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -1,8 +1,8 @@
// $Id$
package org.hibernate.ejb.packaging;
+import java.io.IOException;
import java.util.Set;
-import java.io.IOException;
/**
* @author Emmanuel Bernard
Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/packaging/PersistenceMetadata.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/packaging/PersistenceMetadata.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/packaging/PersistenceMetadata.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -1,12 +1,12 @@
package org.hibernate.ejb.packaging;
-import java.io.InputStream;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
+import java.util.Map;
import java.util.Properties;
import java.util.Set;
-import java.util.Map;
+
import javax.persistence.spi.PersistenceUnitTransactionType;
/**
Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/packaging/PersistenceXmlLoader.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/packaging/PersistenceXmlLoader.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/packaging/PersistenceXmlLoader.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -8,6 +8,7 @@
import java.util.List;
import java.util.Map;
import java.util.Properties;
+
import javax.persistence.PersistenceException;
import javax.persistence.spi.PersistenceUnitTransactionType;
import javax.xml.parsers.DocumentBuilder;
@@ -17,6 +18,8 @@
import org.hibernate.ejb.HibernatePersistence;
import org.hibernate.ejb.util.ConfigurationHelper;
import org.hibernate.util.StringHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -25,8 +28,6 @@
import org.xml.sax.ErrorHandler;
import org.xml.sax.InputSource;
import org.xml.sax.SAXParseException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Persistence.xml handler
Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/util/ConfigurationHelper.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/util/ConfigurationHelper.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/util/ConfigurationHelper.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -8,9 +8,9 @@
import javax.persistence.FlushModeType;
import javax.persistence.PersistenceException;
-import org.hibernate.FlushMode;
import org.hibernate.AssertionFailure;
import org.hibernate.CacheMode;
+import org.hibernate.FlushMode;
/**
* @author Emmanuel Bernard
Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/util/LogHelper.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/util/LogHelper.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/util/LogHelper.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -5,6 +5,7 @@
import java.util.Enumeration;
import java.util.List;
import java.util.Properties;
+
import javax.persistence.spi.PersistenceUnitInfo;
/**
Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/engine/EJB3CascadingAction.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/engine/EJB3CascadingAction.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/engine/EJB3CascadingAction.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -1,14 +1,14 @@
//$Id: $
package org.hibernate.engine;
+import java.util.Iterator;
import java.util.Map;
-import java.util.Iterator;
+import org.hibernate.HibernateException;
import org.hibernate.event.EventSource;
-import org.hibernate.HibernateException;
import org.hibernate.type.CollectionType;
+import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.slf4j.Logger;
/**
* Because of CascadingAction constructor visibility
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/Distributor.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/Distributor.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/Distributor.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -2,6 +2,7 @@
package org.hibernate.ejb.test;
import java.io.Serializable;
+
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/EntityManagerTest.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/EntityManagerTest.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/EntityManagerTest.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -9,6 +9,7 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
+
import javax.persistence.EntityManager;
import javax.persistence.FlushModeType;
import javax.persistence.Query;
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/Item.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/Item.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/Item.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -4,6 +4,7 @@
import java.io.Serializable;
import java.util.HashSet;
import java.util.Set;
+
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.EntityResult;
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/LastUpdateListener.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/LastUpdateListener.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/LastUpdateListener.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -2,6 +2,7 @@
package org.hibernate.ejb.test;
import java.util.Date;
+
import javax.persistence.PrePersist;
import javax.persistence.PreUpdate;
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/NoOpListener.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/NoOpListener.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/NoOpListener.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -1,8 +1,8 @@
//$Id: $
package org.hibernate.ejb.test;
+import org.hibernate.event.PreInsertEvent;
import org.hibernate.event.PreInsertEventListener;
-import org.hibernate.event.PreInsertEvent;
/**
* @author Emmanuel Bernard
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/QueryTest.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/QueryTest.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/QueryTest.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -4,6 +4,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+
import javax.persistence.EntityManager;
import javax.persistence.Query;
import javax.persistence.TemporalType;
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/Wallet.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/Wallet.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/Wallet.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -3,6 +3,7 @@
import java.io.Serializable;
import java.util.Date;
+
import javax.persistence.Entity;
import javax.persistence.Id;
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/association/Oven.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/association/Oven.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/association/Oven.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -2,11 +2,11 @@
package org.hibernate.ejb.test.association;
import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
import javax.persistence.OneToOne;
-import javax.persistence.JoinColumn;
-import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
-import javax.persistence.FetchType;
/**
* @author Emmanuel Bernard
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/CallbackAndDirtyTest.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/CallbackAndDirtyTest.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/CallbackAndDirtyTest.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -3,6 +3,7 @@
import java.util.Iterator;
import java.util.List;
+
import javax.persistence.EntityManager;
import org.hibernate.ejb.test.TestCase;
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/CountryChecker.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/CountryChecker.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/CountryChecker.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -5,6 +5,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+
import javax.persistence.EntityListeners;
/**
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/CountryNameCheckerListener.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/CountryNameCheckerListener.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/CountryNameCheckerListener.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -3,6 +3,7 @@
import java.util.ArrayList;
import java.util.List;
+
import javax.persistence.PrePersist;
import javax.persistence.PreUpdate;
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/Employee.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/Employee.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/Employee.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -2,6 +2,7 @@
package org.hibernate.ejb.test.callbacks;
import java.math.BigDecimal;
+
import javax.persistence.Entity;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/Plant.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/Plant.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/Plant.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -1,8 +1,8 @@
//$Id: $
package org.hibernate.ejb.test.callbacks;
+import javax.persistence.Entity;
import javax.persistence.Id;
-import javax.persistence.Entity;
import javax.persistence.PrePersist;
/**
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/RemoteControl.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/RemoteControl.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/RemoteControl.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -2,6 +2,7 @@
package org.hibernate.ejb.test.callbacks;
import java.util.Date;
+
import javax.persistence.Basic;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/Rythm.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/Rythm.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/Rythm.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -1,10 +1,10 @@
//$Id: $
package org.hibernate.ejb.test.callbacks;
-import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
import javax.persistence.Entity;
import javax.persistence.EntityListeners;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
/**
* @author Emmanuel Bernard
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/Television.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/Television.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/Television.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -7,8 +7,8 @@
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.OneToOne;
+import javax.persistence.PrePersist;
import javax.persistence.PreUpdate;
-import javax.persistence.PrePersist;
/**
* @author Emmanuel Bernard
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/VideoSystem.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/VideoSystem.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/VideoSystem.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -4,8 +4,8 @@
import javax.persistence.EntityListeners;
import javax.persistence.ExcludeSuperclassListeners;
import javax.persistence.MappedSuperclass;
+import javax.persistence.PrePersist;
import javax.persistence.PreUpdate;
-import javax.persistence.PrePersist;
/**
* @author Emmanuel Bernard
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/Conference.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/Conference.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/Conference.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -3,6 +3,7 @@
import java.io.Serializable;
import java.util.Date;
+
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.DiscriminatorColumn;
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/DeleteOrphanTest.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/DeleteOrphanTest.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/DeleteOrphanTest.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -7,6 +7,7 @@
import java.io.ObjectInputStream;
import java.io.ObjectOutput;
import java.io.ObjectOutputStream;
+
import javax.persistence.EntityManager;
import javax.persistence.EntityTransaction;
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/ExtractionDocument.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/ExtractionDocument.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/ExtractionDocument.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -2,6 +2,7 @@
package org.hibernate.ejb.test.cascade;
import java.io.Serializable;
+
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/ExtractionDocumentInfo.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/ExtractionDocumentInfo.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/ExtractionDocumentInfo.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -6,6 +6,7 @@
import java.util.Date;
import java.util.Iterator;
import java.util.List;
+
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/FetchTest.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/FetchTest.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/FetchTest.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -3,6 +3,7 @@
import java.util.ArrayList;
import java.util.Date;
+
import javax.persistence.EntityManager;
import javax.persistence.EntityTransaction;
import javax.persistence.Query;
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/Soldier.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/Soldier.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/Soldier.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -2,6 +2,7 @@
package org.hibernate.ejb.test.cascade;
import java.io.Serializable;
+
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.FetchType;
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/Soldier2.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/Soldier2.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/Soldier2.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -1,6 +1,7 @@
package org.hibernate.ejb.test.cascade;
import java.io.Serializable;
+
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/Troop.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/Troop.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/Troop.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -4,6 +4,7 @@
import java.io.Serializable;
import java.util.HashSet;
import java.util.Set;
+
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.FetchType;
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/Troop2.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/Troop2.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/Troop2.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -1,9 +1,10 @@
package org.hibernate.ejb.test.cascade;
import java.io.Serializable;
+
import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
/**
* @author Emmanuel Bernard
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/connection/DataSourceInjectionTest.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/connection/DataSourceInjectionTest.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/connection/DataSourceInjectionTest.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -2,9 +2,11 @@
package org.hibernate.ejb.test.connection;
import java.io.File;
+
import javax.persistence.EntityManagerFactory;
import junit.framework.TestCase;
+
import org.hibernate.ejb.HibernatePersistence;
/**
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/connection/FakeDataSource.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/connection/FakeDataSource.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/connection/FakeDataSource.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -4,6 +4,7 @@
import java.io.PrintWriter;
import java.sql.Connection;
import java.sql.SQLException;
+
import javax.sql.DataSource;
/**
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/connection/PersistenceUnitInfoImpl.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/connection/PersistenceUnitInfoImpl.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/connection/PersistenceUnitInfoImpl.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -5,6 +5,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
+
import javax.persistence.spi.ClassTransformer;
import javax.persistence.spi.PersistenceUnitInfo;
import javax.persistence.spi.PersistenceUnitTransactionType;
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ejb3configuration/ExceptionInterceptor.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ejb3configuration/ExceptionInterceptor.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ejb3configuration/ExceptionInterceptor.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -2,12 +2,8 @@
package org.hibernate.ejb.test.ejb3configuration;
import java.io.Serializable;
-import java.util.Iterator;
import org.hibernate.CallbackException;
-import org.hibernate.EntityMode;
-import org.hibernate.Interceptor;
-import org.hibernate.Transaction;
import org.hibernate.EmptyInterceptor;
import org.hibernate.type.Type;
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ejb3configuration/LocalExceptionInterceptor.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ejb3configuration/LocalExceptionInterceptor.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ejb3configuration/LocalExceptionInterceptor.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -3,8 +3,8 @@
import java.io.Serializable;
+import org.hibernate.CallbackException;
import org.hibernate.type.Type;
-import org.hibernate.CallbackException;
/**
* @author Emmanuel Bernard
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ejb3configuration/TestCase.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ejb3configuration/TestCase.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ejb3configuration/TestCase.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -6,6 +6,7 @@
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
+
import javax.persistence.Persistence;
import org.hibernate.cfg.Environment;
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Colony.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Colony.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Colony.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -2,8 +2,8 @@
package org.hibernate.ejb.test.emops;
import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
/**
* @author Emmanuel Bernard
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Competition.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Competition.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Competition.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -1,17 +1,17 @@
//$Id: $
package org.hibernate.ejb.test.emops;
-import java.util.Collection;
import java.util.ArrayList;
import java.util.List;
+
+import javax.persistence.CascadeType;
import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
import javax.persistence.ManyToMany;
-import javax.persistence.CascadeType;
-import javax.persistence.FetchType;
-import javax.persistence.JoinTable;
-import javax.persistence.JoinColumn;
/**
* @author Emmanuel Bernard
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Competitor.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Competitor.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Competitor.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -2,8 +2,8 @@
package org.hibernate.ejb.test.emops;
import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
/**
* @author Emmanuel Bernard
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Dress.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Dress.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Dress.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -1,8 +1,8 @@
//$Id: $
package org.hibernate.ejb.test.emops;
+import javax.persistence.Entity;
import javax.persistence.Id;
-import javax.persistence.Entity;
/**
* @author Emmanuel Bernard
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Empire.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Empire.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Empire.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -3,11 +3,12 @@
import java.util.HashSet;
import java.util.Set;
+
+import javax.persistence.CascadeType;
import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
import javax.persistence.OneToMany;
-import javax.persistence.CascadeType;
/**
* @author Emmanuel Bernard
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/FlushModeTest.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/FlushModeTest.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/FlushModeTest.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -1,8 +1,9 @@
//$Id: $
package org.hibernate.ejb.test.emops;
+import java.util.HashMap;
import java.util.Map;
-import java.util.HashMap;
+
import javax.persistence.EntityManager;
import org.hibernate.ejb.test.TestCase;
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/FlushTest.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/FlushTest.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/FlushTest.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -1,14 +1,14 @@
//$Id: $
package org.hibernate.ejb.test.emops;
+import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashSet;
import java.util.List;
-import java.util.ArrayList;
import java.util.Set;
-import java.util.HashSet;
+import javax.persistence.EntityManager;
import javax.persistence.Query;
-import javax.persistence.EntityManager;
import org.hibernate.ejb.test.TestCase;
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/MergeTest.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/MergeTest.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/MergeTest.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -1,8 +1,9 @@
//$Id: $
package org.hibernate.ejb.test.emops;
+import java.util.ArrayList;
import java.util.List;
-import java.util.ArrayList;
+
import javax.persistence.EntityManager;
import org.hibernate.ejb.test.TestCase;
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Music.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Music.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Music.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -1,10 +1,10 @@
//$Id: $
package org.hibernate.ejb.test.emops;
-import javax.persistence.Version;
-import javax.persistence.Id;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Version;
/**
* @author Emmanuel Bernard
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Race.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Race.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Race.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -1,14 +1,15 @@
//$Id: $
package org.hibernate.ejb.test.emops;
+import java.util.ArrayList;
import java.util.List;
-import java.util.ArrayList;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Entity;
import javax.persistence.OneToMany;
-import javax.persistence.CascadeType;
-import javax.persistence.FetchType;
import org.hibernate.annotations.IndexColumn;
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/RemoveTest.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/RemoveTest.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/RemoveTest.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -2,6 +2,7 @@
package org.hibernate.ejb.test.emops;
import java.util.Map;
+
import javax.persistence.EntityManager;
import javax.persistence.OptimisticLockException;
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/cascade/A.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/cascade/A.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/cascade/A.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -3,6 +3,7 @@
import java.util.HashSet;
import java.util.Set;
+
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.FetchType;
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/cascade/B1.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/cascade/B1.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/cascade/B1.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -3,6 +3,7 @@
import java.util.HashSet;
import java.util.Set;
+
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.FetchType;
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/cascade/B2.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/cascade/B2.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/cascade/B2.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -3,6 +3,7 @@
import java.util.HashSet;
import java.util.Set;
+
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.FetchType;
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/cascade/CascadePersistTest.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/cascade/CascadePersistTest.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/cascade/CascadePersistTest.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -3,8 +3,8 @@
import javax.persistence.EntityManager;
+import org.hibernate.Session;
import org.hibernate.ejb.test.TestCase;
-import org.hibernate.Session;
import org.hibernate.stat.Statistics;
/**
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/exception/Music.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/exception/Music.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/exception/Music.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -2,9 +2,10 @@
package org.hibernate.ejb.test.exception;
import java.io.Serializable;
+
import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
import javax.persistence.Version;
/**
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/inheritance/Fruit.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/inheritance/Fruit.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/inheritance/Fruit.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -2,10 +2,10 @@
package org.hibernate.ejb.test.inheritance;
import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
-import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
/**
* @author Emmanuel Bernard
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/lob/BlobTest.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/lob/BlobTest.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/lob/BlobTest.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -7,6 +7,7 @@
import java.sql.Blob;
import java.util.HashMap;
import java.util.Map;
+
import javax.persistence.EntityManager;
import org.hibernate.Hibernate;
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/lob/ImageReader.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/lob/ImageReader.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/lob/ImageReader.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -4,6 +4,7 @@
import java.io.Serializable;
import java.sql.Blob;
import java.sql.Clob;
+
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/lock/UnversionedLock.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/lock/UnversionedLock.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/lock/UnversionedLock.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -1,9 +1,9 @@
//$Id: $
package org.hibernate.ejb.test.lock;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Entity;
/**
* @author Emmanuel Bernard
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ops/Animal.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ops/Animal.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ops/Animal.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -2,8 +2,8 @@
package org.hibernate.ejb.test.ops;
import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
/**
* @author Emmanuel Bernard
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ops/GetLoadTest.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ops/GetLoadTest.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ops/GetLoadTest.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -3,6 +3,7 @@
import junit.framework.Test;
import junit.framework.TestSuite;
+
import org.hibernate.Hibernate;
import org.hibernate.Session;
import org.hibernate.Transaction;
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ops/MergeTest.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ops/MergeTest.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ops/MergeTest.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -3,6 +3,7 @@
import junit.framework.Test;
import junit.framework.TestSuite;
+
import org.hibernate.Session;
import org.hibernate.Transaction;
import org.hibernate.cfg.Configuration;
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ops/PersistTest.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ops/PersistTest.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ops/PersistTest.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -6,6 +6,7 @@
import junit.framework.Test;
import junit.framework.TestSuite;
+
import org.hibernate.PersistentObjectException;
import org.hibernate.Session;
import org.hibernate.Transaction;
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/pack/defaultpar/Money.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/pack/defaultpar/Money.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/pack/defaultpar/Money.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -2,8 +2,8 @@
package org.hibernate.ejb.test.pack.defaultpar;
import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
/**
* @author Emmanuel Bernard
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/pack/overridenpar/Bug.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/pack/overridenpar/Bug.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/pack/overridenpar/Bug.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -3,8 +3,8 @@
import javax.persistence.Column;
import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
/**
* @author Emmanuel Bernard
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/pack/spacepar/Bug.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/pack/spacepar/Bug.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/pack/spacepar/Bug.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -3,8 +3,8 @@
import javax.persistence.Column;
import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
/**
* @author Emmanuel Bernard
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/pack/war/Money.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/pack/war/Money.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/pack/war/Money.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -2,8 +2,8 @@
package org.hibernate.ejb.test.pack.war;
import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
/**
* @author Emmanuel Bernard
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/transaction/FlushAndTransactionTest.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/transaction/FlushAndTransactionTest.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/transaction/FlushAndTransactionTest.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -6,16 +6,16 @@
import javax.persistence.EntityManager;
import javax.persistence.LockModeType;
+import javax.persistence.OptimisticLockException;
+import javax.persistence.PersistenceException;
import javax.persistence.RollbackException;
import javax.persistence.TransactionRequiredException;
-import javax.persistence.PersistenceException;
-import javax.persistence.OptimisticLockException;
+import org.hibernate.Session;
import org.hibernate.cfg.Environment;
import org.hibernate.ejb.HibernateEntityManagerFactory;
import org.hibernate.ejb.test.TestCase;
import org.hibernate.stat.Statistics;
-import org.hibernate.Session;
/**
* @author Emmanuel Bernard
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/xml/Article.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/xml/Article.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/xml/Article.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -1,14 +1,14 @@
//$Id: $
package org.hibernate.ejb.test.xml;
+import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
import javax.persistence.Table;
-import javax.persistence.GeneratedValue;
-import javax.persistence.CascadeType;
-import javax.persistence.ManyToOne;
-import javax.persistence.JoinColumn;
/**
* @author Emmanuel Bernard
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/xml/CounterListener.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/xml/CounterListener.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/xml/CounterListener.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -2,8 +2,8 @@
package org.hibernate.ejb.test.xml;
import javax.persistence.PrePersist;
+import javax.persistence.PreRemove;
import javax.persistence.PreUpdate;
-import javax.persistence.PreRemove;
/**
* @author Emmanuel Bernard
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/xml/sequences/Article.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/xml/sequences/Article.java 2010-03-23 21:14:04 UTC (rev 19092)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/xml/sequences/Article.java 2010-03-23 21:24:49 UTC (rev 19093)
@@ -1,14 +1,14 @@
//$Id: $
package org.hibernate.ejb.test.xml.sequences;
+import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
import javax.persistence.Table;
-import javax.persistence.GeneratedValue;
-import javax.persistence.CascadeType;
-import javax.persistence.ManyToOne;
-import javax.persistence.JoinColumn;
/**
* @author Emmanuel Bernard
14 years, 1 month
- 1
- 0
Hibernate SVN: r19092 - in annotations/branches/v3_4_0_GA_CP/src: main/java/org/hibernate/cfg and 55 other directories.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2010-03-23 17:14:04 -0400 (Tue, 23 Mar 2010)
New Revision: 19092
Modified:
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/AccessType.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Any.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/AnyMetaDef.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/AnyMetaDefs.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/BatchSize.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Cache.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Cascade.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Check.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/CollectionId.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/CollectionOfElements.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Columns.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/DiscriminatorFormula.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Entity.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Fetch.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Filter.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/FilterDef.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/FilterDefs.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/FilterJoinTable.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/FilterJoinTables.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Filters.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/ForceDiscriminator.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/ForeignKey.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Formula.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Generated.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/GenericGenerator.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Immutable.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Index.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/IndexColumn.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/LazyCollection.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/LazyToOne.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Loader.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/ManyToAny.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/MapKey.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/MapKeyManyToMany.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/NamedNativeQueries.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/NamedNativeQuery.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/NamedQueries.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/NamedQuery.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/NaturalId.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/NotFound.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/OnDelete.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/OrderBy.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/ParamDef.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Parameter.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Parent.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Persister.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Proxy.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/SQLDelete.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/SQLInsert.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/SQLUpdate.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Sort.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Table.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Tables.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Target.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Tuplizer.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Tuplizers.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Type.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/TypeDef.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/TypeDefs.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Where.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/WhereJoinTable.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/AbstractPropertyHolder.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/AnnotationBinder.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/ClassPropertyHolder.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/EJB3DTDEntityResolver.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/Ejb3Column.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/Ejb3JoinColumn.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/ExtendedMappings.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/InheritanceState.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/ToOneFkSecondPass.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/CollectionBinder.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/EntityBinder.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/MapBinder.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/QueryBinder.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/ResultsetMappingSecondPass.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/SimpleValueBinder.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/TableBinder.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/reflection/EJB3OverridenAnnotationReader.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/reflection/EJB3ReflectionManager.java
annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/reflection/XMLContext.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Boat.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Company.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Country.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Customer.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Discount.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Flight.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/FlyingObject.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Passport.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Port.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/SecuredBindingTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Sky.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/TestCase.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Ticket.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/access/BigBed.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/any/PropertyList.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/any/PropertyMap.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/any/PropertySet.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/any/package-info.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/bytecode/ProxyBreakingTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cascade/Mouth.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/AId.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/ChildPk.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/CompositeIdTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/Order.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/OrderLine.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/OrderLinePk.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/ParentPk.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/SomeEntity.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/SomeEntityId.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/TvMagazin.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/TvProgram.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/TvProgramIdClass.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/Boy.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/LocalizedString.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/A.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/B.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/C.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/indexedCollection/IndexedCollectionOfElementsTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/indexedCollection/Sale.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/configuration/ConfigurationTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/configuration/package-info.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/DuplicateTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/Address.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/Country.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/FixedLeg.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/FloatLeg.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/LegalStructure.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/Person.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/RegionalArticle.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/RegionalArticlePk.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/Summary.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/Flight.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/PropertyDefaultMappingsTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/Ransom.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/package-info.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entitynonentity/Interaction.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/fetch/Branch.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/fetch/Person.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/fetch/Stay.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/generics/Dummy.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/generics/StateType.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/generics/WildEntity.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/genericsinheritance/Child.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/genericsinheritance/GenericsInheritanceTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/entities/Ball.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/entities/BreakDance.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/entities/Bunny.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/entities/FootballerPk.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Ball.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/BreakDance.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Bunny.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Department.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/FootballerPk.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Shoe.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Store.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/identifiercollection/IdentifierCollectionTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/identifiercollection/Passport.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/identifiercollection/Stamp.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/BasketItems.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/BasketItemsPK.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/Card.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/CardField.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/CardKey.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/Customer.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/Customers.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/Project.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/ShoppingBasketsPK.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/Store.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/StoreCustomer.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/StoreCustomerPK.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/A.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/Acces.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/BId.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/C.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/CId.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/immutable/ImmutableTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/AddressBook.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/AddressEntryPk.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Atmosphere.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Drawer.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/GenerationGroup.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/GenerationUser.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/IndexedCollectionTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/MapKeyTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Newspaper.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Painter.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/PaintingPk.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/PressReleaseAgency.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Software.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Trainee.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Training.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Version.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Wardrobe.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/Tomato.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/VegetablePk.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/Asset.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/Clothing.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/File.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/Folder.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/Parent.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/Pool.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/mixed/Folder.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/singletable/Music.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/union/Folder.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/interfaces/UserImpl.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/A.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/B.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/C.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/Cat.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/Death.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/DogPk.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/Life.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/loader/LoaderTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/loader/Team.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/BuildingCompany.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Cat.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/CatPk.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Company.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Employee.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Friend.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Group.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/GroupWithSet.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Inspector.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/InspectorPrefixes.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/KnownClient.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Man.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/ManPk.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Permission.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Store.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Supplier.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Woman.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/WomanPk.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/BiggestForest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Carz.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Child.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Customer.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Deal.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/DistrictUser.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ForestType.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Frame.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Lens.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Lotz.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/LotzPK.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneJoinTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneOnNonPkTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Node.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/NodePk.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Order.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/OrderLine.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Parent.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ParentPk.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/TreeType.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/User.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/UserPK.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/GenericObject.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/Item.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/Vendor.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/WarehouseItem.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ZItemCost.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/naturalid/State.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/notfound/Currency.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Child.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/City.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Order.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/OrderByTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/OrderID.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/OrderItemID.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Organisation.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/OrganisationUser.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Parent.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/ParentPk.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Person.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/PoliticalParty.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Street.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Trainer.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Troop.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/ComputerPk.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/OneToOneErrorTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/Owner.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/OwnerAddress.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/PartyAffiliate.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/SerialNumberPk.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/Hardware.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/persister/Card.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/persister/Deck.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/persister/EntityPersister.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/polymorphism/PolymorphismTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/query/Captain.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/query/CasimirParticle.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/query/Chaos.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/query/Night.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/quote/QuoteTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/quote/Role.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/quote/User.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/House.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Inhabitant.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/ItemCost.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Luggage.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Postman.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Rambler.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/ReferencedColumnNameTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Vendor.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/WarehouseItem.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/BusTrip.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/EJB3OverridenAnnotationReaderTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/LogListener.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/OtherLogListener.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/SocialSecurityNumber.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/XMLContextTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/strategy/Storm.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tableperclass/TablePerClassTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/target/Brand.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/target/LuggageImpl.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/target/Owner.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/target/OwnerImpl.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/target/TargetTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/Country.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/Cuisine.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/DataProxyHandler.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/DynamicComponentTuplizer.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/DynamicEntityTuplizer.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/DynamicInstantiator.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/ProxyHelper.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/TuplizerTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/various/Antenna.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/various/GeneratedTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/various/ProfessionalAgreement.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/ejb3/Manufacturer.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/AImpl.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/PrimeMinister.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/Sky.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/ZImpl.java
Log:
clean up unused imports
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/AccessType.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/AccessType.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/AccessType.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,9 +1,12 @@
//$Id$
package org.hibernate.annotations;
-import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Any.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Any.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Any.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -3,11 +3,13 @@
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static javax.persistence.FetchType.EAGER;
+
import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
import javax.persistence.Column;
import javax.persistence.FetchType;
-import static javax.persistence.FetchType.EAGER;
/**
* Define a ToOne association pointing to several entity types.
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/AnyMetaDef.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/AnyMetaDef.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/AnyMetaDef.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -5,9 +5,10 @@
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.PACKAGE;
import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.Retention;
+
/**
* Defines @Any and @manyToAny metadata
*
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/AnyMetaDefs.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/AnyMetaDefs.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/AnyMetaDefs.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -3,11 +3,10 @@
import static java.lang.annotation.ElementType.PACKAGE;
import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.FIELD;
-import java.lang.annotation.Retention;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.Retention;
+
/**
* Defines @Any and @ManyToAny set of metadata.
* Can be defined at the entity level or the package level
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/BatchSize.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/BatchSize.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/BatchSize.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,9 +1,12 @@
//$Id$
package org.hibernate.annotations;
-import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Cache.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Cache.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Cache.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,9 +1,12 @@
//$Id$
package org.hibernate.annotations;
-import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Cascade.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Cascade.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Cascade.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,8 +2,9 @@
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Check.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Check.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Check.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,9 +1,12 @@
//$Id$
package org.hibernate.annotations;
-import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/CollectionId.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/CollectionId.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/CollectionId.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,11 +1,13 @@
//$Id$
package org.hibernate.annotations;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.FIELD;
+
import javax.persistence.Column;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/CollectionOfElements.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/CollectionOfElements.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/CollectionOfElements.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -3,11 +3,13 @@
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static javax.persistence.FetchType.LAZY;
+
import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
+
import javax.persistence.FetchType;
-import static javax.persistence.FetchType.LAZY;
/**
* Annotation used to mark a collection as a collection of elements or
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Columns.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Columns.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Columns.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -3,9 +3,11 @@
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
+
import javax.persistence.Column;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/DiscriminatorFormula.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/DiscriminatorFormula.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/DiscriminatorFormula.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,8 +2,9 @@
package org.hibernate.annotations;
import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Entity.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Entity.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Entity.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,8 +2,9 @@
package org.hibernate.annotations;
import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Fetch.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Fetch.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Fetch.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,10 +1,10 @@
//$Id$
package org.hibernate.annotations;
-import java.lang.annotation.Target;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* Define the fetching strategy used for the given association
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Filter.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Filter.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Filter.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,9 +1,12 @@
//$Id$
package org.hibernate.annotations;
-import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/FilterDef.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/FilterDef.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/FilterDef.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -3,8 +3,9 @@
import static java.lang.annotation.ElementType.PACKAGE;
import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/FilterDefs.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/FilterDefs.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/FilterDefs.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -3,8 +3,9 @@
import static java.lang.annotation.ElementType.PACKAGE;
import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/FilterJoinTable.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/FilterJoinTable.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/FilterJoinTable.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,10 +1,10 @@
//$Id$
package org.hibernate.annotations;
-import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
-import java.lang.annotation.ElementType;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* Add filters to a join table collection
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/FilterJoinTables.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/FilterJoinTables.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/FilterJoinTables.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,10 +1,10 @@
//$Id$
package org.hibernate.annotations;
-import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
-import java.lang.annotation.ElementType;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* Add multiple @FilterJoinTable to a collection
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Filters.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Filters.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Filters.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,9 +1,12 @@
//$Id$
package org.hibernate.annotations;
-import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/ForceDiscriminator.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/ForceDiscriminator.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/ForceDiscriminator.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,10 +1,10 @@
//$Id$
package org.hibernate.annotations;
-import java.lang.annotation.Target;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* ForceDiscriminator flag
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/ForeignKey.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/ForeignKey.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/ForeignKey.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -4,8 +4,9 @@
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
@Target({FIELD, METHOD, TYPE})
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Formula.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Formula.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Formula.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,8 +2,9 @@
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Generated.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Generated.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Generated.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,10 +1,10 @@
//$Id$
package org.hibernate.annotations;
-import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
-import java.lang.annotation.ElementType;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* The annotated property is generated by the database
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/GenericGenerator.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/GenericGenerator.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/GenericGenerator.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,9 +1,13 @@
//$Id$
package org.hibernate.annotations;
-import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PACKAGE;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Immutable.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Immutable.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Immutable.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,7 +1,9 @@
//$Id$
package org.hibernate.annotations;
-import java.lang.annotation.*;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
/**
* Mark an Entity or a Collection as immutable. No annotation means the element is mutable.
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Index.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Index.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Index.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,8 +2,9 @@
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/IndexColumn.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/IndexColumn.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/IndexColumn.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,8 +2,9 @@
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/LazyCollection.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/LazyCollection.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/LazyCollection.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,10 +1,10 @@
//$Id$
package org.hibernate.annotations;
-import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
-import java.lang.annotation.ElementType;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* Define the lazy status of a collection
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/LazyToOne.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/LazyToOne.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/LazyToOne.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,10 +1,10 @@
//$Id$
package org.hibernate.annotations;
-import java.lang.annotation.Target;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* Define the lazy status of a ToOne association
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Loader.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Loader.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Loader.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,10 +1,11 @@
package org.hibernate.annotations;
-import static java.lang.annotation.ElementType.TYPE;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/ManyToAny.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/ManyToAny.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/ManyToAny.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,13 +1,15 @@
//$Id$
package org.hibernate.annotations;
+import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static javax.persistence.FetchType.EAGER;
+
import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
import javax.persistence.Column;
import javax.persistence.FetchType;
-import static javax.persistence.FetchType.EAGER;
/**
* Defined a ToMany association pointing to different entity types.
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/MapKey.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/MapKey.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/MapKey.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,11 +1,13 @@
//$Id$
package org.hibernate.annotations;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.FIELD;
+
import javax.persistence.Column;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/MapKeyManyToMany.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/MapKeyManyToMany.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/MapKeyManyToMany.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -5,6 +5,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+
import javax.persistence.JoinColumn;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/NamedNativeQueries.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/NamedNativeQueries.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/NamedNativeQueries.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,8 +2,9 @@
import static java.lang.annotation.ElementType.PACKAGE;
import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/NamedNativeQuery.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/NamedNativeQuery.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/NamedNativeQuery.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,8 +2,9 @@
import static java.lang.annotation.ElementType.PACKAGE;
import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/NamedQueries.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/NamedQueries.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/NamedQueries.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,8 +2,9 @@
import static java.lang.annotation.ElementType.PACKAGE;
import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/NamedQuery.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/NamedQuery.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/NamedQuery.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -3,8 +3,9 @@
import static java.lang.annotation.ElementType.PACKAGE;
import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/NaturalId.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/NaturalId.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/NaturalId.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,8 +2,9 @@
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/NotFound.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/NotFound.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/NotFound.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,8 +2,9 @@
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/OnDelete.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/OnDelete.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/OnDelete.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,8 +1,11 @@
package org.hibernate.annotations;
-import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/OrderBy.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/OrderBy.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/OrderBy.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,8 +2,9 @@
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/ParamDef.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/ParamDef.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/ParamDef.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,8 +1,9 @@
//$Id$
package org.hibernate.annotations;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Parameter.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Parameter.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Parameter.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,8 +1,9 @@
//$Id$
package org.hibernate.annotations;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Parent.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Parent.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Parent.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -3,8 +3,9 @@
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Persister.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Persister.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Persister.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,7 +1,9 @@
//$Id$
package org.hibernate.annotations;
-import java.lang.annotation.*;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
/**
* Specify a custom persister.
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Proxy.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Proxy.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Proxy.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,8 +2,9 @@
package org.hibernate.annotations;
import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/SQLDelete.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/SQLDelete.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/SQLDelete.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,11 +1,12 @@
//$Id$
package org.hibernate.annotations;
-import static java.lang.annotation.ElementType.TYPE;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/SQLInsert.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/SQLInsert.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/SQLInsert.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,11 +1,12 @@
//$Id$
package org.hibernate.annotations;
-import static java.lang.annotation.ElementType.TYPE;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/SQLUpdate.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/SQLUpdate.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/SQLUpdate.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,11 +1,12 @@
//$Id$
package org.hibernate.annotations;
-import static java.lang.annotation.ElementType.TYPE;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Sort.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Sort.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Sort.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -3,8 +3,9 @@
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Table.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Table.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Table.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,8 +2,9 @@
package org.hibernate.annotations;
import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Tables.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Tables.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Tables.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,8 +1,9 @@
package org.hibernate.annotations;
import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Target.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Target.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Target.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,8 +1,8 @@
//$Id$
package org.hibernate.annotations;
+import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
-import java.lang.annotation.ElementType;
import java.lang.annotation.RetentionPolicy;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Tuplizer.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Tuplizer.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Tuplizer.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,12 +1,13 @@
//$Id$
package org.hibernate.annotations;
-import java.lang.annotation.*;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import static java.lang.annotation.ElementType.TYPE;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.Retention;
+
/**
* Define a tuplizer for an entity or a component
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Tuplizers.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Tuplizers.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Tuplizers.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,8 +1,8 @@
//$Id$
package org.hibernate.annotations;
+import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
-import java.lang.annotation.ElementType;
import java.lang.annotation.RetentionPolicy;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Type.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Type.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Type.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -3,8 +3,9 @@
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/TypeDef.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/TypeDef.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/TypeDef.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -3,8 +3,9 @@
import static java.lang.annotation.ElementType.PACKAGE;
import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/TypeDefs.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/TypeDefs.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/TypeDefs.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -3,8 +3,9 @@
import static java.lang.annotation.ElementType.PACKAGE;
import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Where.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Where.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Where.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,8 +1,11 @@
package org.hibernate.annotations;
-import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/WhereJoinTable.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/WhereJoinTable.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/WhereJoinTable.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,10 +1,10 @@
//$Id$
package org.hibernate.annotations;
-import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
-import java.lang.annotation.ElementType;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* Where clause to add to the colleciton join table
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/AbstractPropertyHolder.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/AbstractPropertyHolder.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/AbstractPropertyHolder.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -3,6 +3,7 @@
import java.util.HashMap;
import java.util.Map;
+
import javax.persistence.AssociationOverride;
import javax.persistence.AssociationOverrides;
import javax.persistence.AttributeOverride;
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/AnnotationBinder.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/AnnotationBinder.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/AnnotationBinder.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -12,6 +12,7 @@
import java.util.Map;
import java.util.Properties;
import java.util.Set;
+
import javax.persistence.Basic;
import javax.persistence.Column;
import javax.persistence.DiscriminatorType;
@@ -71,6 +72,7 @@
import org.hibernate.annotations.ForeignKey;
import org.hibernate.annotations.Formula;
import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.annotations.GenericGenerators;
import org.hibernate.annotations.Index;
import org.hibernate.annotations.LazyToOne;
import org.hibernate.annotations.LazyToOneOption;
@@ -94,7 +96,6 @@
import org.hibernate.annotations.TypeDef;
import org.hibernate.annotations.TypeDefs;
import org.hibernate.annotations.Where;
-import org.hibernate.annotations.GenericGenerators;
import org.hibernate.annotations.common.reflection.ReflectionManager;
import org.hibernate.annotations.common.reflection.XAnnotatedElement;
import org.hibernate.annotations.common.reflection.XClass;
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/ClassPropertyHolder.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/ClassPropertyHolder.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/ClassPropertyHolder.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -3,6 +3,7 @@
import java.util.HashMap;
import java.util.Map;
+
import javax.persistence.JoinTable;
import org.hibernate.annotations.common.reflection.XClass;
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/EJB3DTDEntityResolver.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/EJB3DTDEntityResolver.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/EJB3DTDEntityResolver.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -4,10 +4,10 @@
import java.io.InputStream;
import org.hibernate.util.DTDEntityResolver;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/Ejb3Column.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/Ejb3Column.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/Ejb3Column.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -13,8 +13,8 @@
import org.hibernate.mapping.SimpleValue;
import org.hibernate.mapping.Table;
import org.hibernate.util.StringHelper;
+import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.slf4j.Logger;
/**
* Wrap state of an EJB3 @Column annotation
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/Ejb3JoinColumn.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/Ejb3JoinColumn.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/Ejb3JoinColumn.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -5,6 +5,7 @@
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
+
import javax.persistence.JoinColumn;
import javax.persistence.PrimaryKeyJoinColumn;
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/ExtendedMappings.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/ExtendedMappings.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/ExtendedMappings.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -6,6 +6,7 @@
import java.util.Map;
import java.util.Properties;
import java.util.Set;
+
import javax.persistence.Embeddable;
import javax.persistence.Entity;
import javax.persistence.MappedSuperclass;
@@ -22,8 +23,8 @@
import org.hibernate.mapping.Join;
import org.hibernate.mapping.PersistentClass;
import org.hibernate.mapping.Table;
+import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.slf4j.Logger;
/**
* Allow annotation related mappings
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/InheritanceState.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/InheritanceState.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/InheritanceState.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.cfg;
import java.util.Map;
+
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import javax.persistence.MappedSuperclass;
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/ToOneFkSecondPass.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/ToOneFkSecondPass.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/ToOneFkSecondPass.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -7,13 +7,13 @@
import org.hibernate.AssertionFailure;
import org.hibernate.MappingException;
import org.hibernate.cfg.annotations.TableBinder;
+import org.hibernate.mapping.Component;
+import org.hibernate.mapping.KeyValue;
import org.hibernate.mapping.ManyToOne;
import org.hibernate.mapping.OneToOne;
import org.hibernate.mapping.PersistentClass;
import org.hibernate.mapping.Property;
import org.hibernate.mapping.ToOne;
-import org.hibernate.mapping.KeyValue;
-import org.hibernate.mapping.Component;
import org.hibernate.util.StringHelper;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/CollectionBinder.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/CollectionBinder.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/CollectionBinder.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -7,6 +7,7 @@
import java.util.List;
import java.util.Map;
import java.util.StringTokenizer;
+
import javax.persistence.AttributeOverride;
import javax.persistence.AttributeOverrides;
import javax.persistence.Embeddable;
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/EntityBinder.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/EntityBinder.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/EntityBinder.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -6,6 +6,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+
import javax.persistence.Entity;
import javax.persistence.JoinColumn;
import javax.persistence.JoinTable;
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/MapBinder.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/MapBinder.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/MapBinder.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -5,6 +5,7 @@
import java.util.Iterator;
import java.util.Map;
import java.util.Random;
+
import javax.persistence.AttributeOverride;
import javax.persistence.AttributeOverrides;
@@ -12,8 +13,8 @@
import org.hibernate.AssertionFailure;
import org.hibernate.FetchMode;
import org.hibernate.MappingException;
+import org.hibernate.annotations.MapKey;
import org.hibernate.annotations.MapKeyManyToMany;
-import org.hibernate.annotations.MapKey;
import org.hibernate.annotations.common.reflection.XClass;
import org.hibernate.annotations.common.reflection.XProperty;
import org.hibernate.cfg.AnnotatedClassType;
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/QueryBinder.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/QueryBinder.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/QueryBinder.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.cfg.annotations;
import java.util.HashMap;
+
import javax.persistence.NamedNativeQueries;
import javax.persistence.NamedNativeQuery;
import javax.persistence.NamedQueries;
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/ResultsetMappingSecondPass.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/ResultsetMappingSecondPass.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/ResultsetMappingSecondPass.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -8,6 +8,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+
import javax.persistence.ColumnResult;
import javax.persistence.EntityResult;
import javax.persistence.FieldResult;
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/SimpleValueBinder.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/SimpleValueBinder.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/SimpleValueBinder.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -6,6 +6,7 @@
import java.util.Calendar;
import java.util.Date;
import java.util.Properties;
+
import javax.persistence.Enumerated;
import javax.persistence.Lob;
import javax.persistence.Temporal;
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/TableBinder.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/TableBinder.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/TableBinder.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -4,6 +4,7 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+
import javax.persistence.UniqueConstraint;
import org.hibernate.AnnotationException;
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/reflection/EJB3OverridenAnnotationReader.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/reflection/EJB3OverridenAnnotationReader.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/reflection/EJB3OverridenAnnotationReader.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -13,6 +13,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+
import javax.persistence.AssociationOverride;
import javax.persistence.AssociationOverrides;
import javax.persistence.AttributeOverride;
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/reflection/EJB3ReflectionManager.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/reflection/EJB3ReflectionManager.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/reflection/EJB3ReflectionManager.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -5,6 +5,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+
import javax.persistence.EntityListeners;
import javax.persistence.NamedNativeQuery;
import javax.persistence.NamedQuery;
Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/reflection/XMLContext.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/reflection/XMLContext.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/reflection/XMLContext.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -9,8 +9,8 @@
import org.dom4j.Document;
import org.dom4j.Element;
import org.hibernate.util.StringHelper;
+import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.slf4j.Logger;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Boat.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Boat.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Boat.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations;
import java.io.Serializable;
+
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Company.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Company.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Company.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -4,6 +4,7 @@
import java.io.Serializable;
import java.util.Date;
import java.util.Set;
+
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Country.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Country.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Country.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -6,6 +6,7 @@
*/
import java.io.Serializable;
+
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Customer.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Customer.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Customer.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,9 +1,12 @@
//$Id$
package org.hibernate.test.annotations;
+import static org.hibernate.annotations.CascadeType.ALL;
+
import java.io.Serializable;
import java.util.Collection;
import java.util.SortedSet;
+
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.FetchType;
@@ -14,7 +17,6 @@
import javax.persistence.OneToOne;
import org.hibernate.annotations.Cascade;
-import static org.hibernate.annotations.CascadeType.ALL;
import org.hibernate.annotations.Sort;
import org.hibernate.annotations.SortType;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Discount.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Discount.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Discount.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations;
import java.io.Serializable;
+
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Flight.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Flight.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Flight.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -4,6 +4,7 @@
import java.io.Serializable;
import java.util.Calendar;
import java.util.Date;
+
import javax.persistence.Basic;
import javax.persistence.CascadeType;
import javax.persistence.Column;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/FlyingObject.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/FlyingObject.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/FlyingObject.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations;
import java.io.Serializable;
+
import javax.persistence.Column;
import javax.persistence.MappedSuperclass;
import javax.persistence.Transient;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Passport.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Passport.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Passport.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations;
import java.io.Serializable;
+
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Port.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Port.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Port.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations;
import java.util.Set;
+
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/SecuredBindingTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/SecuredBindingTest.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/SecuredBindingTest.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -4,6 +4,7 @@
import java.util.Properties;
import junit.framework.TestCase;
+
import org.hibernate.HibernateException;
import org.hibernate.SessionFactory;
import org.hibernate.cfg.AnnotationConfiguration;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Sky.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Sky.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Sky.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations;
import java.io.Serializable;
+
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/TestCase.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/TestCase.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/TestCase.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -11,9 +11,6 @@
import java.util.HashSet;
import java.util.Set;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import org.hibernate.HibernateException;
import org.hibernate.Interceptor;
import org.hibernate.Session;
@@ -24,6 +21,8 @@
import org.hibernate.dialect.Dialect;
import org.hibernate.jdbc.Work;
import org.hibernate.tool.hbm2ddl.SchemaExport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A base class for all tests.
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Ticket.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Ticket.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Ticket.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations;
import java.io.Serializable;
+
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/access/BigBed.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/access/BigBed.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/access/BigBed.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,8 +1,8 @@
//$Id$
package org.hibernate.test.annotations.access;
+import javax.persistence.Column;
import javax.persistence.Entity;
-import javax.persistence.Column;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/any/PropertyList.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/any/PropertyList.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/any/PropertyList.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,19 +2,20 @@
import java.util.ArrayList;
import java.util.List;
+
+import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
import javax.persistence.Table;
-import javax.persistence.JoinTable;
-import javax.persistence.Column;
-import javax.persistence.JoinColumn;
-import org.hibernate.annotations.ManyToAny;
+import org.hibernate.annotations.Any;
import org.hibernate.annotations.Cascade;
+import org.hibernate.annotations.CascadeType;
import org.hibernate.annotations.IndexColumn;
-import org.hibernate.annotations.Any;
-import org.hibernate.annotations.CascadeType;
+import org.hibernate.annotations.ManyToAny;
@Entity
@Table( name = "property_list" )
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/any/PropertyMap.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/any/PropertyMap.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/any/PropertyMap.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
import java.util.HashMap;
import java.util.Map;
+
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/any/PropertySet.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/any/PropertySet.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/any/PropertySet.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
import java.util.ArrayList;
import java.util.List;
+
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/any/package-info.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/any/package-info.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/any/package-info.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -11,6 +11,6 @@
package org.hibernate.test.annotations.any;
+import org.hibernate.annotations.AnyMetaDef;
import org.hibernate.annotations.AnyMetaDefs;
-import org.hibernate.annotations.AnyMetaDef;
-import org.hibernate.annotations.MetaValue;
\ No newline at end of file
+import org.hibernate.annotations.MetaValue;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/bytecode/ProxyBreakingTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/bytecode/ProxyBreakingTest.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/bytecode/ProxyBreakingTest.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,11 +1,11 @@
//$Id$
package org.hibernate.test.annotations.bytecode;
+import org.hibernate.Hibernate;
import org.hibernate.Session;
import org.hibernate.Transaction;
-import org.hibernate.Hibernate;
+import org.hibernate.cfg.Configuration;
import org.hibernate.test.annotations.TestCase;
-import org.hibernate.cfg.Configuration;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cascade/Mouth.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cascade/Mouth.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cascade/Mouth.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,12 +2,13 @@
package org.hibernate.test.annotations.cascade;
import java.util.Collection;
+
import javax.persistence.CascadeType;
+import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.OneToMany;
-import javax.persistence.Column;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/AId.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/AId.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/AId.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.cid;
import java.io.Serializable;
+
import javax.persistence.Embeddable;
import javax.persistence.JoinColumn;
import javax.persistence.OneToOne;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/ChildPk.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/ChildPk.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/ChildPk.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.cid;
import java.io.Serializable;
+
import javax.persistence.Embeddable;
import javax.persistence.JoinColumn;
import javax.persistence.JoinColumns;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/CompositeIdTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/CompositeIdTest.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/CompositeIdTest.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -12,7 +12,6 @@
import org.hibernate.criterion.Disjunction;
import org.hibernate.criterion.Restrictions;
import org.hibernate.dialect.Dialect;
-import org.hibernate.dialect.HSQLDialect;
import org.hibernate.test.annotations.TestCase;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/Order.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/Order.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/Order.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,8 +1,8 @@
package org.hibernate.test.annotations.cid;
import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
import javax.persistence.Table;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/OrderLine.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/OrderLine.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/OrderLine.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,8 +1,8 @@
package org.hibernate.test.annotations.cid;
import javax.persistence.Entity;
+import javax.persistence.Id;
import javax.persistence.IdClass;
-import javax.persistence.Id;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/OrderLinePk.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/OrderLinePk.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/OrderLinePk.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,10 +1,11 @@
package org.hibernate.test.annotations.cid;
-import javax.persistence.ManyToOne;
-import javax.persistence.JoinColumn;
import java.io.Serializable;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+
/**
* @author Emmanuel Bernard
*/
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/ParentPk.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/ParentPk.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/ParentPk.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.cid;
import java.io.Serializable;
+
import javax.persistence.Column;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/SomeEntity.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/SomeEntity.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/SomeEntity.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,9 +1,10 @@
package org.hibernate.test.annotations.cid;
import java.io.Serializable;
+
+import javax.persistence.Basic;
import javax.persistence.Entity;
import javax.persistence.Id;
-import javax.persistence.Basic;
/**
* @author bartek
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/SomeEntityId.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/SomeEntityId.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/SomeEntityId.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,10 +1,9 @@
package org.hibernate.test.annotations.cid;
import java.io.Serializable;
+
import javax.persistence.Embeddable;
-import org.hibernate.annotations.*;
-
/**
* @author bartek
*/
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/TvMagazin.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/TvMagazin.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/TvMagazin.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.cid;
import java.util.Date;
+
import javax.persistence.AssociationOverride;
import javax.persistence.EmbeddedId;
import javax.persistence.Entity;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/TvProgram.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/TvProgram.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/TvProgram.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.cid;
import java.util.Date;
+
import javax.persistence.Column;
import javax.persistence.EmbeddedId;
import javax.persistence.Entity;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/TvProgramIdClass.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/TvProgramIdClass.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/TvProgramIdClass.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.cid;
import java.util.Date;
+
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/Boy.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/Boy.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/Boy.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -5,6 +5,7 @@
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
+
import javax.persistence.AttributeOverride;
import javax.persistence.AttributeOverrides;
import javax.persistence.Column;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/LocalizedString.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/LocalizedString.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/LocalizedString.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,18 +1,19 @@
//$Id$
package org.hibernate.test.annotations.collectionelement;
+import java.io.Serializable;
import java.util.HashMap;
+import java.util.Locale;
import java.util.Map;
-import java.util.Locale;
-import java.io.Serializable;
+
import javax.persistence.Column;
import javax.persistence.Embeddable;
import org.hibernate.annotations.CollectionOfElements;
import org.hibernate.annotations.Fetch;
-import org.hibernate.annotations.MapKey;
import org.hibernate.annotations.FetchMode;
import org.hibernate.annotations.Filter;
+import org.hibernate.annotations.MapKey;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/A.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/A.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/A.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -6,6 +6,7 @@
*/
import java.util.List;
+
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/B.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/B.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/B.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,11 +2,10 @@
package org.hibernate.test.annotations.collectionelement.deepcollectionelements;
import java.util.List;
+
import javax.persistence.Embeddable;
-import javax.persistence.Transient;
import javax.persistence.OneToMany;
-import org.hibernate.annotations.CollectionOfElements;
import org.hibernate.annotations.IndexColumn;
@Embeddable
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/C.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/C.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/C.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,10 +2,9 @@
package org.hibernate.test.annotations.collectionelement.deepcollectionelements;
import javax.persistence.Column;
-import javax.persistence.Embeddable;
-import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
@Entity
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/indexedCollection/IndexedCollectionOfElementsTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/indexedCollection/IndexedCollectionOfElementsTest.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/indexedCollection/IndexedCollectionOfElementsTest.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,8 +1,8 @@
//$
package org.hibernate.test.annotations.collectionelement.indexedCollection;
+import org.hibernate.Session;
import org.hibernate.test.annotations.TestCase;
-import org.hibernate.Session;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/indexedCollection/Sale.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/indexedCollection/Sale.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/indexedCollection/Sale.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,19 +1,20 @@
//$
package org.hibernate.test.annotations.collectionelement.indexedCollection;
+import java.util.ArrayList;
import java.util.List;
-import java.util.ArrayList;
+
+import javax.persistence.Column;
import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
import javax.persistence.JoinColumn;
import javax.persistence.JoinTable;
-import javax.persistence.Column;
-import org.hibernate.annotations.Type;
+import org.hibernate.annotations.CollectionId;
import org.hibernate.annotations.CollectionOfElements;
-import org.hibernate.annotations.CollectionId;
import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.annotations.Type;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/configuration/ConfigurationTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/configuration/ConfigurationTest.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/configuration/ConfigurationTest.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.configuration;
import junit.framework.TestCase;
+
import org.hibernate.cfg.AnnotationConfiguration;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/configuration/package-info.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/configuration/package-info.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/configuration/package-info.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,3 +2,4 @@
package org.hibernate.test.annotations.configuration;
import org.hibernate.annotations.GenericGenerator;
+
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/DuplicateTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/DuplicateTest.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/DuplicateTest.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.duplicatedgenerator;
import junit.framework.TestCase;
+
import org.hibernate.AnnotationException;
import org.hibernate.cfg.AnnotationConfiguration;
import org.hibernate.cfg.Environment;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/Address.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/Address.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/Address.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.embedded;
import java.io.Serializable;
+
import javax.persistence.Column;
import javax.persistence.Embeddable;
import javax.persistence.ManyToOne;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/Country.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/Country.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/Country.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.embedded;
import java.io.Serializable;
+
import javax.persistence.Column;
import javax.persistence.Embeddable;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/FixedLeg.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/FixedLeg.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/FixedLeg.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,6 +1,7 @@
package org.hibernate.test.annotations.embedded;
import java.text.NumberFormat;
+
import javax.persistence.Embeddable;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/FloatLeg.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/FloatLeg.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/FloatLeg.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,6 +1,7 @@
package org.hibernate.test.annotations.embedded;
import java.text.NumberFormat;
+
import javax.persistence.Embeddable;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/LegalStructure.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/LegalStructure.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/LegalStructure.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -3,6 +3,7 @@
import java.util.HashSet;
import java.util.Set;
+
import javax.persistence.Embeddable;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/Person.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/Person.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/Person.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.embedded;
import java.io.Serializable;
+
import javax.persistence.AttributeOverride;
import javax.persistence.AttributeOverrides;
import javax.persistence.Column;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/RegionalArticle.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/RegionalArticle.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/RegionalArticle.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.embedded;
import java.io.Serializable;
+
import javax.persistence.Entity;
import javax.persistence.Id;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/RegionalArticlePk.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/RegionalArticlePk.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/RegionalArticlePk.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.embedded;
import java.io.Serializable;
+
import javax.persistence.Embeddable;
import org.hibernate.annotations.AccessType;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/Summary.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/Summary.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/Summary.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,8 +1,8 @@
//$Id$
package org.hibernate.test.annotations.embedded;
+import javax.persistence.Column;
import javax.persistence.Embeddable;
-import javax.persistence.Column;
import org.hibernate.annotations.Parent;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/Flight.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/Flight.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/Flight.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.entity;
import java.io.Serializable;
+
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Inheritance;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/PropertyDefaultMappingsTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/PropertyDefaultMappingsTest.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/PropertyDefaultMappingsTest.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -3,11 +3,7 @@
import org.hibernate.Session;
import org.hibernate.Transaction;
-import org.hibernate.cfg.Configuration;
-import org.hibernate.cfg.Environment;
-import org.hibernate.dialect.DB2Dialect;
import org.hibernate.test.annotations.TestCase;
-import org.hibernate.util.ConfigHelper;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/Ransom.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/Ransom.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/Ransom.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.entity;
import java.util.Date;
+
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/package-info.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/package-info.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/package-info.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -32,3 +32,4 @@
import org.hibernate.annotations.Parameter;
import org.hibernate.annotations.TypeDef;
import org.hibernate.annotations.TypeDefs;
+
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entitynonentity/Interaction.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entitynonentity/Interaction.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entitynonentity/Interaction.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,8 +1,8 @@
//$Id$
package org.hibernate.test.annotations.entitynonentity;
+import javax.persistence.Column;
import javax.persistence.MappedSuperclass;
-import javax.persistence.Column;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/fetch/Branch.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/fetch/Branch.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/fetch/Branch.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,13 +1,14 @@
//$Id$
package org.hibernate.test.annotations.fetch;
+import java.util.HashSet;
import java.util.Set;
-import java.util.HashSet;
+
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
import javax.persistence.OneToMany;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/fetch/Person.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/fetch/Person.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/fetch/Person.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -6,6 +6,7 @@
import java.util.Collection;
import java.util.Date;
import java.util.List;
+
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.FetchType;
@@ -16,9 +17,9 @@
import org.hibernate.annotations.Fetch;
import org.hibernate.annotations.FetchMode;
+import org.hibernate.annotations.IndexColumn;
import org.hibernate.annotations.LazyCollection;
import org.hibernate.annotations.LazyCollectionOption;
-import org.hibernate.annotations.IndexColumn;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/fetch/Stay.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/fetch/Stay.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/fetch/Stay.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -3,6 +3,7 @@
import java.io.Serializable;
import java.util.Date;
+
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.FetchType;
@@ -12,10 +13,10 @@
import javax.persistence.ManyToOne;
import javax.persistence.Table;
+import org.hibernate.annotations.Fetch;
+import org.hibernate.annotations.FetchMode;
import org.hibernate.annotations.LazyToOne;
import org.hibernate.annotations.LazyToOneOption;
-import org.hibernate.annotations.Fetch;
-import org.hibernate.annotations.FetchMode;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/generics/Dummy.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/generics/Dummy.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/generics/Dummy.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,9 +1,9 @@
//$
package org.hibernate.test.annotations.generics;
+import javax.persistence.Entity;
+import javax.persistence.Id;
import javax.persistence.Transient;
-import javax.persistence.Id;
-import javax.persistence.Entity;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/generics/StateType.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/generics/StateType.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/generics/StateType.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,13 +2,13 @@
package org.hibernate.test.annotations.generics;
import java.io.Serializable;
+import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
-import java.sql.PreparedStatement;
import java.sql.Types;
+import org.hibernate.HibernateException;
import org.hibernate.usertype.UserType;
-import org.hibernate.HibernateException;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/generics/WildEntity.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/generics/WildEntity.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/generics/WildEntity.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.generics;
import java.io.Serializable;
+
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/genericsinheritance/Child.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/genericsinheritance/Child.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/genericsinheritance/Child.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,8 +1,8 @@
package org.hibernate.test.annotations.genericsinheritance;
-import javax.persistence.MappedSuperclass;
import javax.persistence.Id;
import javax.persistence.ManyToOne;
+import javax.persistence.MappedSuperclass;
@MappedSuperclass
public abstract class Child<P extends Parent> {
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/genericsinheritance/GenericsInheritanceTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/genericsinheritance/GenericsInheritanceTest.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/genericsinheritance/GenericsInheritanceTest.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,8 +1,8 @@
//$Id$
package org.hibernate.test.annotations.genericsinheritance;
+import org.hibernate.Session;
import org.hibernate.test.annotations.TestCase;
-import org.hibernate.Session;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/entities/Ball.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/entities/Ball.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/entities/Ball.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.id.entities;
import java.io.Serializable;
+
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/entities/BreakDance.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/entities/BreakDance.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/entities/BreakDance.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,10 +2,10 @@
package org.hibernate.test.annotations.id.entities;
import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
import javax.persistence.TableGenerator;
-import javax.persistence.GenerationType;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/entities/Bunny.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/entities/Bunny.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/entities/Bunny.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -5,8 +5,8 @@
import java.math.BigInteger;
import java.util.Set;
+import javax.persistence.CascadeType;
import javax.persistence.Column;
-import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/entities/FootballerPk.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/entities/FootballerPk.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/entities/FootballerPk.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.id.entities;
import java.io.Serializable;
+
import javax.persistence.Column;
import javax.persistence.Embeddable;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Ball.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Ball.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Ball.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.id.sequences.entities;
import java.io.Serializable;
+
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/BreakDance.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/BreakDance.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/BreakDance.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,10 +2,10 @@
package org.hibernate.test.annotations.id.sequences.entities;
import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
import javax.persistence.TableGenerator;
-import javax.persistence.GenerationType;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Bunny.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Bunny.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Bunny.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -5,8 +5,8 @@
import java.math.BigInteger;
import java.util.Set;
+import javax.persistence.CascadeType;
import javax.persistence.Column;
-import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Department.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Department.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Department.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.id.sequences.entities;
import java.io.Serializable;
+
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/FootballerPk.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/FootballerPk.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/FootballerPk.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.id.sequences.entities;
import java.io.Serializable;
+
import javax.persistence.Column;
import javax.persistence.Embeddable;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Shoe.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Shoe.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Shoe.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.id.sequences.entities;
import java.io.Serializable;
+
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Store.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Store.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Store.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.id.sequences.entities;
import java.io.Serializable;
+
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/identifiercollection/IdentifierCollectionTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/identifiercollection/IdentifierCollectionTest.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/identifiercollection/IdentifierCollectionTest.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,9 +1,9 @@
//$Id$
package org.hibernate.test.annotations.identifiercollection;
-import org.hibernate.test.annotations.TestCase;
import org.hibernate.Session;
import org.hibernate.Transaction;
+import org.hibernate.test.annotations.TestCase;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/identifiercollection/Passport.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/identifiercollection/Passport.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/identifiercollection/Passport.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -3,6 +3,7 @@
import java.util.ArrayList;
import java.util.Collection;
+
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/identifiercollection/Stamp.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/identifiercollection/Stamp.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/identifiercollection/Stamp.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,8 +2,8 @@
package org.hibernate.test.annotations.identifiercollection;
import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/BasketItems.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/BasketItems.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/BasketItems.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,17 +2,18 @@
package org.hibernate.test.annotations.idmanytoone;
import java.io.Serializable;
-import javax.persistence.IdClass;
-import javax.persistence.Id;
+
+import javax.persistence.Basic;
+import javax.persistence.CascadeType;
import javax.persistence.Column;
-import javax.persistence.CascadeType;
+import javax.persistence.Entity;
import javax.persistence.FetchType;
+import javax.persistence.Id;
+import javax.persistence.IdClass;
import javax.persistence.JoinColumn;
+import javax.persistence.JoinColumns;
+import javax.persistence.ManyToOne;
import javax.persistence.Table;
-import javax.persistence.ManyToOne;
-import javax.persistence.Basic;
-import javax.persistence.JoinColumns;
-import javax.persistence.Entity;
@Entity
@Table(name="BasketItems")
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/BasketItemsPK.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/BasketItemsPK.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/BasketItemsPK.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,15 +2,16 @@
package org.hibernate.test.annotations.idmanytoone;
import java.io.Serializable;
+
+import javax.persistence.Basic;
import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Embeddable;
+import javax.persistence.FetchType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.JoinColumns;
-import javax.persistence.Column;
import javax.persistence.ManyToOne;
-import javax.persistence.Basic;
-import javax.persistence.Embeddable;
-import javax.persistence.FetchType;
@Embeddable
public class BasketItemsPK implements Serializable {
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/Card.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/Card.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/Card.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -3,12 +3,13 @@
import java.io.Serializable;
import java.util.Set;
+
+import javax.persistence.CascadeType;
import javax.persistence.Embeddable;
import javax.persistence.Entity;
+import javax.persistence.FetchType;
import javax.persistence.Id;
import javax.persistence.ManyToOne;
-import javax.persistence.CascadeType;
-import javax.persistence.FetchType;
import javax.persistence.OneToMany;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/CardField.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/CardField.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/CardField.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,10 +2,11 @@
package org.hibernate.test.annotations.idmanytoone;
import java.io.Serializable;
+
+import javax.persistence.Embeddable;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.ManyToOne;
-import javax.persistence.Embeddable;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/CardKey.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/CardKey.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/CardKey.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,8 +2,8 @@
package org.hibernate.test.annotations.idmanytoone;
import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/Customer.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/Customer.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/Customer.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -3,11 +3,12 @@
import java.io.Serializable;
import java.util.Set;
-import javax.persistence.Table;
+
import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
import javax.persistence.OneToMany;
-import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
+import javax.persistence.Table;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/Customers.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/Customers.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/Customers.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,10 +2,11 @@
package org.hibernate.test.annotations.idmanytoone;
import java.io.Serializable;
-import javax.persistence.Id;
+
+import javax.persistence.CascadeType;
import javax.persistence.Column;
-import javax.persistence.CascadeType;
import javax.persistence.Entity;
+import javax.persistence.Id;
import javax.persistence.OneToMany;
import javax.persistence.Table;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/Project.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/Project.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/Project.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,8 +2,8 @@
package org.hibernate.test.annotations.idmanytoone;
import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/ShoppingBasketsPK.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/ShoppingBasketsPK.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/ShoppingBasketsPK.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,15 +2,16 @@
package org.hibernate.test.annotations.idmanytoone;
import java.io.Serializable;
+
+import javax.persistence.Basic;
import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Embeddable;
+import javax.persistence.FetchType;
import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinColumns;
import javax.persistence.ManyToOne;
-import javax.persistence.JoinColumns;
-import javax.persistence.FetchType;
-import javax.persistence.Basic;
-import javax.persistence.JoinColumn;
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
@Embeddable
public class ShoppingBasketsPK implements Serializable {
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/Store.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/Store.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/Store.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -3,11 +3,12 @@
import java.io.Serializable;
import java.util.Set;
-import javax.persistence.Table;
+
import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
import javax.persistence.OneToMany;
-import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
+import javax.persistence.Table;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/StoreCustomer.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/StoreCustomer.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/StoreCustomer.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,12 +2,13 @@
package org.hibernate.test.annotations.idmanytoone;
import java.io.Serializable;
+
+import javax.persistence.Entity;
import javax.persistence.Id;
-import javax.persistence.Table;
import javax.persistence.IdClass;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
-import javax.persistence.Entity;
+import javax.persistence.Table;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/StoreCustomerPK.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/StoreCustomerPK.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/StoreCustomerPK.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,9 +2,10 @@
package org.hibernate.test.annotations.idmanytoone;
import java.io.Serializable;
+
+import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
-import javax.persistence.Id;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/A.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/A.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/A.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.idmanytoone.alphabetical;
import java.util.List;
+
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.OneToMany;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/Acces.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/Acces.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/Acces.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -3,6 +3,7 @@
import java.io.Serializable;
import java.math.BigInteger;
+
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.ManyToOne;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/BId.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/BId.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/BId.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.idmanytoone.alphabetical;
import java.io.Serializable;
+
import javax.persistence.Embeddable;
import javax.persistence.JoinColumn;
import javax.persistence.JoinColumns;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/C.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/C.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/C.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.idmanytoone.alphabetical;
import java.util.List;
+
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.IdClass;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/CId.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/CId.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/CId.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.idmanytoone.alphabetical;
import java.io.Serializable;
+
import javax.persistence.Embeddable;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/immutable/ImmutableTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/immutable/ImmutableTest.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/immutable/ImmutableTest.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,8 +1,6 @@
//$Id$
package org.hibernate.test.annotations.immutable;
-import java.io.PrintWriter;
-import java.io.StringWriter;
import java.util.ArrayList;
import java.util.List;
@@ -11,12 +9,7 @@
import org.hibernate.Session;
import org.hibernate.Transaction;
import org.hibernate.cfg.AnnotationConfiguration;
-import org.hibernate.dialect.SQLServerDialect;
import org.hibernate.test.annotations.TestCase;
-import org.hibernate.test.annotations.fkcircularity.A;
-import org.hibernate.test.annotations.fkcircularity.B;
-import org.hibernate.test.annotations.fkcircularity.C;
-import org.hibernate.test.annotations.fkcircularity.D;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/AddressBook.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/AddressBook.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/AddressBook.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -3,13 +3,13 @@
import java.util.HashMap;
import java.util.Map;
+
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.MapKey;
import javax.persistence.OneToMany;
-import javax.persistence.JoinTable;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/AddressEntryPk.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/AddressEntryPk.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/AddressEntryPk.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.indexcoll;
import java.io.Serializable;
+
import javax.persistence.Embeddable;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Atmosphere.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Atmosphere.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Atmosphere.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -3,17 +3,18 @@
import java.util.HashMap;
import java.util.Map;
+
import javax.persistence.CascadeType;
+import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
import javax.persistence.ManyToMany;
-import javax.persistence.Column;
-import javax.persistence.JoinTable;
-import javax.persistence.JoinColumn;
+import org.hibernate.annotations.CollectionOfElements;
import org.hibernate.annotations.MapKey;
-import org.hibernate.annotations.CollectionOfElements;
import org.hibernate.annotations.MapKeyManyToMany;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Drawer.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Drawer.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Drawer.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.indexcoll;
import java.util.List;
+
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/GenerationGroup.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/GenerationGroup.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/GenerationGroup.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,8 +2,8 @@
package org.hibernate.test.annotations.indexcoll;
import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/GenerationUser.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/GenerationUser.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/GenerationUser.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,13 +1,14 @@
//$Id$
package org.hibernate.test.annotations.indexcoll;
+import java.util.HashMap;
import java.util.Map;
-import java.util.HashMap;
-import javax.persistence.OneToMany;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
import javax.persistence.Id;
-import javax.persistence.Entity;
import javax.persistence.MapKey;
-import javax.persistence.GeneratedValue;
+import javax.persistence.OneToMany;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/IndexedCollectionTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/IndexedCollectionTest.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/IndexedCollectionTest.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -6,9 +6,9 @@
import java.util.List;
import java.util.Map;
+import org.hibernate.Hibernate;
import org.hibernate.Session;
import org.hibernate.Transaction;
-import org.hibernate.Hibernate;
import org.hibernate.dialect.HSQLDialect;
import org.hibernate.test.annotations.RequiresDialect;
import org.hibernate.test.annotations.TestCase;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/MapKeyTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/MapKeyTest.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/MapKeyTest.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,9 +1,9 @@
//$Id$
package org.hibernate.test.annotations.indexcoll;
-import org.hibernate.test.annotations.TestCase;
import org.hibernate.Session;
import org.hibernate.Transaction;
+import org.hibernate.test.annotations.TestCase;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Newspaper.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Newspaper.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Newspaper.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -3,6 +3,7 @@
import java.util.HashMap;
import java.util.Map;
+
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Painter.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Painter.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Painter.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -3,6 +3,7 @@
import java.util.HashMap;
import java.util.Map;
+
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/PaintingPk.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/PaintingPk.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/PaintingPk.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.indexcoll;
import java.io.Serializable;
+
import javax.persistence.Embeddable;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/PressReleaseAgency.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/PressReleaseAgency.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/PressReleaseAgency.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -3,6 +3,7 @@
import java.util.HashMap;
import java.util.Map;
+
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Software.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Software.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Software.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,8 +1,9 @@
//$Id$
package org.hibernate.test.annotations.indexcoll;
+import java.util.HashMap;
import java.util.Map;
-import java.util.HashMap;
+
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.MapKey;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Trainee.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Trainee.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Trainee.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,8 +2,8 @@
package org.hibernate.test.annotations.indexcoll;
import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Training.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Training.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Training.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -3,11 +3,12 @@
import java.util.SortedMap;
import java.util.TreeMap;
+
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
+import javax.persistence.ManyToMany;
import javax.persistence.MapKey;
-import javax.persistence.ManyToMany;
import org.hibernate.annotations.Sort;
import org.hibernate.annotations.SortType;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Version.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Version.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Version.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,12 +1,12 @@
//$Id$
package org.hibernate.test.annotations.indexcoll;
+import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
-import javax.persistence.Column;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Wardrobe.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Wardrobe.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Wardrobe.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.indexcoll;
import java.util.List;
+
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/Tomato.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/Tomato.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/Tomato.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,10 +1,10 @@
//$Id$
package org.hibernate.test.annotations.inheritance;
+import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
-import javax.persistence.Column;
import org.hibernate.annotations.OnDelete;
import org.hibernate.annotations.OnDeleteAction;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/VegetablePk.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/VegetablePk.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/VegetablePk.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.inheritance;
import java.io.Serializable;
+
import javax.persistence.Embeddable;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/Asset.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/Asset.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/Asset.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -4,11 +4,11 @@
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/Clothing.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/Clothing.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/Clothing.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,12 +1,12 @@
//$Id$
package org.hibernate.test.annotations.inheritance.joined;
+import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
-import javax.persistence.Column;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/File.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/File.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/File.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,12 +1,12 @@
//$Id$
package org.hibernate.test.annotations.inheritance.joined;
+import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import javax.persistence.ManyToOne;
-import javax.persistence.Column;
import javax.persistence.Table;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/Folder.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/Folder.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/Folder.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -3,6 +3,7 @@
import java.util.HashSet;
import java.util.Set;
+
import javax.persistence.Entity;
import javax.persistence.OneToMany;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/Parent.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/Parent.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/Parent.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -3,6 +3,7 @@
import java.util.HashSet;
import java.util.Set;
+
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.FetchType;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/Pool.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/Pool.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/Pool.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,13 +1,13 @@
//$Id$
package org.hibernate.test.annotations.inheritance.joined;
+import javax.persistence.Column;
import javax.persistence.Entity;
-import javax.persistence.SecondaryTable;
-import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
+import javax.persistence.SecondaryTable;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/mixed/Folder.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/mixed/Folder.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/mixed/Folder.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -3,6 +3,7 @@
import java.util.HashSet;
import java.util.Set;
+
import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;
import javax.persistence.OneToMany;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/singletable/Music.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/singletable/Music.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/singletable/Music.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,9 +2,9 @@
package org.hibernate.test.annotations.inheritance.singletable;
import javax.persistence.Column;
-import javax.persistence.Entity;
import javax.persistence.DiscriminatorColumn;
import javax.persistence.DiscriminatorType;
+import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/union/Folder.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/union/Folder.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/union/Folder.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -3,6 +3,7 @@
import java.util.HashSet;
import java.util.Set;
+
import javax.persistence.Entity;
import javax.persistence.OneToMany;
import javax.persistence.Table;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/interfaces/UserImpl.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/interfaces/UserImpl.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/interfaces/UserImpl.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.interfaces;
import java.util.Collection;
+
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/A.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/A.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/A.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,8 +2,9 @@
package org.hibernate.test.annotations.join;
import java.util.Date;
+
+import javax.persistence.Column;
import javax.persistence.MappedSuperclass;
-import javax.persistence.Column;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/B.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/B.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/B.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -3,8 +3,8 @@
import javax.persistence.Column;
import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/C.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/C.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/C.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,8 +2,8 @@
package org.hibernate.test.annotations.join;
import javax.persistence.Column;
+import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;
-import javax.persistence.DiscriminatorValue;
import javax.persistence.SecondaryTable;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/Cat.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/Cat.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/Cat.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.join;
import java.io.Serializable;
+
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -10,12 +11,12 @@
import javax.persistence.SecondaryTables;
import javax.persistence.UniqueConstraint;
+import org.hibernate.annotations.FetchMode;
+import org.hibernate.annotations.ForeignKey;
import org.hibernate.annotations.Index;
+import org.hibernate.annotations.SQLInsert;
import org.hibernate.annotations.Table;
-import org.hibernate.annotations.ForeignKey;
import org.hibernate.annotations.Tables;
-import org.hibernate.annotations.FetchMode;
-import org.hibernate.annotations.SQLInsert;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/Death.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/Death.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/Death.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -3,13 +3,14 @@
import java.io.Serializable;
import java.util.Date;
+
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
+import javax.persistence.PrimaryKeyJoinColumn;
import javax.persistence.SecondaryTable;
-import javax.persistence.PrimaryKeyJoinColumn;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/DogPk.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/DogPk.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/DogPk.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.join;
import java.io.Serializable;
+
import javax.persistence.Embeddable;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/Life.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/Life.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/Life.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.join;
import java.io.Serializable;
+
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/loader/LoaderTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/loader/LoaderTest.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/loader/LoaderTest.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,8 +1,8 @@
//$Id$
package org.hibernate.test.annotations.loader;
+import java.util.Iterator;
import java.util.Set;
-import java.util.Iterator;
import org.hibernate.Session;
import org.hibernate.Transaction;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/loader/Team.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/loader/Team.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/loader/Team.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -12,11 +12,7 @@
import org.hibernate.annotations.Fetch;
import org.hibernate.annotations.FetchMode;
import org.hibernate.annotations.Loader;
-import org.hibernate.annotations.NamedNativeQueries;
-import org.hibernate.annotations.NamedNativeQuery;
-import javax.persistence.NamedQuery;
-
@Entity
public class Team {
private Long id;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/BuildingCompany.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/BuildingCompany.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/BuildingCompany.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,9 +2,10 @@
package org.hibernate.test.annotations.manytomany;
import java.util.Date;
+
import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Cat.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Cat.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Cat.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,15 +2,13 @@
package org.hibernate.test.annotations.manytomany;
import java.util.Set;
+
import javax.persistence.EmbeddedId;
import javax.persistence.Entity;
+import javax.persistence.JoinTable;
import javax.persistence.ManyToMany;
import javax.persistence.Table;
-import javax.persistence.JoinTable;
-import javax.persistence.JoinColumn;
-import org.hibernate.annotations.Index;
-
/**
* @author Emmanuel Bernard
*/
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/CatPk.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/CatPk.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/CatPk.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.manytomany;
import java.io.Serializable;
+
import javax.persistence.Column;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Company.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Company.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Company.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,8 +2,9 @@
package org.hibernate.test.annotations.manytomany;
import java.io.Serializable;
+
+import javax.persistence.Column;
import javax.persistence.MappedSuperclass;
-import javax.persistence.Column;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Employee.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Employee.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Employee.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -3,14 +3,15 @@
import java.io.Serializable;
import java.util.Collection;
+
import javax.persistence.CascadeType;
+import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import javax.persistence.ManyToMany;
-import javax.persistence.Column;
import org.hibernate.annotations.Cascade;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Friend.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Friend.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Friend.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -3,6 +3,7 @@
import java.io.Serializable;
import java.util.Set;
+
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Group.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Group.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Group.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.manytomany;
import java.util.Collection;
+
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.Id;
@@ -9,10 +10,10 @@
import javax.persistence.OrderBy;
import javax.persistence.Table;
-import org.hibernate.annotations.Where;
+import org.hibernate.annotations.Filter;
import org.hibernate.annotations.FilterDef;
-import org.hibernate.annotations.Filter;
import org.hibernate.annotations.FilterJoinTable;
+import org.hibernate.annotations.Where;
import org.hibernate.annotations.WhereJoinTable;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/GroupWithSet.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/GroupWithSet.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/GroupWithSet.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,23 +1,19 @@
//$Id$
package org.hibernate.test.annotations.manytomany;
-import java.util.Collection;
import java.util.Set;
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
import javax.persistence.ManyToMany;
import javax.persistence.OrderBy;
import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
-import org.hibernate.annotations.Where;
-import org.hibernate.annotations.FilterDef;
import org.hibernate.annotations.Filter;
+import org.hibernate.annotations.FilterDef;
import org.hibernate.annotations.FilterJoinTable;
+import org.hibernate.annotations.Where;
import org.hibernate.annotations.WhereJoinTable;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Inspector.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Inspector.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Inspector.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.manytomany;
import java.io.Serializable;
+
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/InspectorPrefixes.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/InspectorPrefixes.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/InspectorPrefixes.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -3,6 +3,7 @@
import java.util.ArrayList;
import java.util.List;
+
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.JoinColumn;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/KnownClient.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/KnownClient.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/KnownClient.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.manytomany;
import java.util.Set;
+
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Man.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Man.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Man.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -3,6 +3,7 @@
import java.io.Serializable;
import java.util.Set;
+
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.Id;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/ManPk.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/ManPk.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/ManPk.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,8 +2,9 @@
package org.hibernate.test.annotations.manytomany;
import java.io.Serializable;
+
+import javax.persistence.Column;
import javax.persistence.Embeddable;
-import javax.persistence.Column;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Permission.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Permission.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Permission.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.manytomany;
import java.util.Date;
+
import javax.persistence.Entity;
import javax.persistence.Id;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Store.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Store.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Store.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.manytomany;
import java.util.Set;
+
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Supplier.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Supplier.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Supplier.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.manytomany;
import java.util.Set;
+
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Woman.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Woman.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Woman.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -3,6 +3,7 @@
import java.io.Serializable;
import java.util.Set;
+
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.Id;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/WomanPk.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/WomanPk.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/WomanPk.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,8 +2,9 @@
package org.hibernate.test.annotations.manytomany;
import java.io.Serializable;
+
+import javax.persistence.Column;
import javax.persistence.Embeddable;
-import javax.persistence.Column;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/BiggestForest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/BiggestForest.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/BiggestForest.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,9 +2,9 @@
package org.hibernate.test.annotations.manytoone;
import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
import javax.persistence.OneToOne;
-import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Carz.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Carz.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Carz.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -3,15 +3,15 @@
import java.io.Serializable;
import java.util.Date;
+
+import javax.persistence.Column;
import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.Column;
-import javax.persistence.JoinColumns;
import javax.persistence.FetchType;
+import javax.persistence.Id;
import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Temporal;
import javax.persistence.TemporalType;
-import javax.persistence.Id;
-import javax.persistence.Temporal;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Child.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Child.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Child.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.manytoone;
import java.io.Serializable;
+
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Customer.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Customer.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Customer.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.manytoone;
import java.io.Serializable;
+
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Deal.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Deal.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Deal.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,10 +2,10 @@
package org.hibernate.test.annotations.manytoone;
import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
+import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
-import javax.persistence.JoinColumn;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/DistrictUser.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/DistrictUser.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/DistrictUser.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,6 +1,7 @@
package org.hibernate.test.annotations.manytoone;
import java.util.Date;
+
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ForestType.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ForestType.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ForestType.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,13 +2,14 @@
package org.hibernate.test.annotations.manytoone;
import java.util.Set;
+
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
import javax.persistence.OneToMany;
import javax.persistence.OneToOne;
-import javax.persistence.JoinTable;
-import javax.persistence.JoinColumn;
import org.hibernate.annotations.ForeignKey;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Frame.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Frame.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Frame.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,9 +1,9 @@
//$Id$
package org.hibernate.test.annotations.manytoone;
+import java.io.Serializable;
import java.util.Set;
-import java.io.Serializable;
-import javax.persistence.Column;
+
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Lens.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Lens.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Lens.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,10 +2,10 @@
package org.hibernate.test.annotations.manytoone;
import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
-import javax.persistence.JoinColumn;
-import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
import org.hibernate.annotations.Formula;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Lotz.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Lotz.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Lotz.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,14 +1,15 @@
//$Id$
package org.hibernate.test.annotations.manytoone;
+import java.io.Serializable;
import java.util.List;
-import java.io.Serializable;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.EmbeddedId;
import javax.persistence.Entity;
-import javax.persistence.EmbeddedId;
-import javax.persistence.Column;
import javax.persistence.FetchType;
import javax.persistence.OneToMany;
-import javax.persistence.CascadeType;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/LotzPK.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/LotzPK.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/LotzPK.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.manytoone;
import java.io.Serializable;
+
import javax.persistence.Column;
import javax.persistence.Embeddable;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneJoinTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneJoinTest.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneJoinTest.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,9 +1,9 @@
//$Id$
package org.hibernate.test.annotations.manytoone;
-import org.hibernate.test.annotations.TestCase;
import org.hibernate.Session;
import org.hibernate.Transaction;
+import org.hibernate.test.annotations.TestCase;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneOnNonPkTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneOnNonPkTest.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneOnNonPkTest.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,10 +1,7 @@
//$Id$
package org.hibernate.test.annotations.manytoone;
-import java.util.Date;
-
import org.hibernate.test.annotations.TestCase;
-import org.hibernate.Session;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Node.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Node.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Node.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.manytoone;
import java.io.Serializable;
+
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.FetchType;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/NodePk.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/NodePk.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/NodePk.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.manytoone;
import java.io.Serializable;
+
import javax.persistence.Column;
import javax.persistence.Embeddable;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Order.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Order.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Order.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -3,12 +3,13 @@
import java.io.Serializable;
import java.util.Set;
+
+import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
-import javax.persistence.Column;
+import javax.persistence.OneToMany;
import javax.persistence.Table;
-import javax.persistence.OneToMany;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/OrderLine.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/OrderLine.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/OrderLine.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,10 +2,10 @@
package org.hibernate.test.annotations.manytoone;
import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
+import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
-import javax.persistence.JoinColumn;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Parent.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Parent.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Parent.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.manytoone;
import java.io.Serializable;
+
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ParentPk.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ParentPk.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ParentPk.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.manytoone;
import java.io.Serializable;
+
import javax.persistence.Column;
import javax.persistence.Embeddable;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/TreeType.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/TreeType.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/TreeType.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,12 +2,12 @@
package org.hibernate.test.annotations.manytoone;
import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.JoinTable;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
import javax.persistence.JoinColumn;
-import javax.persistence.FetchType;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToOne;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/User.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/User.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/User.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
import java.util.Date;
import java.util.Set;
+
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/UserPK.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/UserPK.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/UserPK.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -3,6 +3,7 @@
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
+
import javax.persistence.Column;
public class UserPK implements Serializable {
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/GenericObject.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/GenericObject.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/GenericObject.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -3,6 +3,7 @@
import java.io.Serializable;
import java.rmi.server.UID;
+
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/Item.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/Item.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/Item.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,11 +1,7 @@
//$
package org.hibernate.test.annotations.manytoone.referencedcolumnname;
-import java.util.HashSet;
-import java.util.Set;
import javax.persistence.Entity;
-import javax.persistence.OneToMany;
-import javax.persistence.Transient;
@Entity
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -3,8 +3,8 @@
import java.math.BigDecimal;
+import org.hibernate.Session;
import org.hibernate.test.annotations.TestCase;
-import org.hibernate.Session;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/Vendor.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/Vendor.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/Vendor.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,11 +1,7 @@
//$
package org.hibernate.test.annotations.manytoone.referencedcolumnname;
-import java.util.HashSet;
-import java.util.Set;
import javax.persistence.Entity;
-import javax.persistence.OneToMany;
-import javax.persistence.Transient;
@Entity
public class Vendor extends GenericObject {
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/WarehouseItem.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/WarehouseItem.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/WarehouseItem.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.manytoone.referencedcolumnname;
import java.math.BigDecimal;
+
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.JoinColumn;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ZItemCost.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ZItemCost.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ZItemCost.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,11 +2,10 @@
package org.hibernate.test.annotations.manytoone.referencedcolumnname;
import java.math.BigDecimal;
+
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.ManyToOne;
-import javax.persistence.Transient;
-import javax.persistence.JoinColumn;
@Entity
public class ZItemCost extends GenericObject {
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/naturalid/State.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/naturalid/State.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/naturalid/State.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,9 +1,9 @@
//$Id$
package org.hibernate.test.annotations.naturalid;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Entity;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/notfound/Currency.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/notfound/Currency.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/notfound/Currency.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.notfound;
import java.io.Serializable;
+
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Child.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Child.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Child.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.onetomany;
import java.io.Serializable;
+
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/City.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/City.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/City.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -3,6 +3,7 @@
import java.util.ArrayList;
import java.util.List;
+
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Order.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Order.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Order.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,10 +1,9 @@
//$Id$
package org.hibernate.test.annotations.onetomany;
-import java.util.LinkedHashSet;
-import java.util.Set;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
+
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.IdClass;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/OrderByTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/OrderByTest.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/OrderByTest.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,8 +1,8 @@
//$Id$
package org.hibernate.test.annotations.onetomany;
+import org.hibernate.Session;
import org.hibernate.test.annotations.TestCase;
-import org.hibernate.Session;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/OrderID.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/OrderID.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/OrderID.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.onetomany;
import java.io.Serializable;
+
import javax.persistence.Column;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/OrderItemID.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/OrderItemID.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/OrderItemID.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.onetomany;
import java.io.Serializable;
+
import javax.persistence.Column;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Organisation.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Organisation.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Organisation.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -3,14 +3,15 @@
import java.io.Serializable;
import java.util.Set;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Column;
+import javax.persistence.FetchType;
import javax.persistence.Id;
import javax.persistence.OneToMany;
import javax.persistence.OrderBy;
-import javax.persistence.CascadeType;
-import javax.persistence.FetchType;
+import javax.persistence.Table;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/OrganisationUser.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/OrganisationUser.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/OrganisationUser.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.onetomany;
import java.io.Serializable;
+
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Parent.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Parent.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Parent.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -4,6 +4,7 @@
import java.io.Serializable;
import java.util.HashSet;
import java.util.Set;
+
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.Id;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/ParentPk.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/ParentPk.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/ParentPk.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.onetomany;
import java.io.Serializable;
+
import javax.persistence.Embeddable;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Person.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Person.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Person.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,12 +2,13 @@
package org.hibernate.test.annotations.onetomany;
import java.io.Serializable;
+
import javax.persistence.Column;
+import javax.persistence.Entity;
import javax.persistence.Id;
-import javax.persistence.Entity;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
import javax.persistence.Table;
-import javax.persistence.InheritanceType;
-import javax.persistence.Inheritance;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/PoliticalParty.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/PoliticalParty.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/PoliticalParty.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -3,6 +3,7 @@
import java.util.HashSet;
import java.util.Set;
+
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Street.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Street.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Street.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,11 +1,11 @@
//$Id$
package org.hibernate.test.annotations.onetomany;
+import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.ManyToOne;
-import javax.persistence.Column;
import org.hibernate.annotations.Formula;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Trainer.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Trainer.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Trainer.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.onetomany;
import java.util.Set;
+
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Troop.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Troop.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Troop.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -3,6 +3,7 @@
import java.util.HashSet;
import java.util.Set;
+
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.FetchType;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/ComputerPk.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/ComputerPk.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/ComputerPk.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.onetoone;
import java.io.Serializable;
+
import javax.persistence.Embeddable;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/OneToOneErrorTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/OneToOneErrorTest.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/OneToOneErrorTest.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,11 +1,10 @@
//$Id$
package org.hibernate.test.annotations.onetoone;
+import org.hibernate.AnnotationException;
+import org.hibernate.SessionFactory;
import org.hibernate.cfg.AnnotationConfiguration;
import org.hibernate.cfg.Environment;
-import org.hibernate.test.annotations.IncorrectEntity;
-import org.hibernate.SessionFactory;
-import org.hibernate.AnnotationException;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/Owner.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/Owner.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/Owner.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,12 +1,12 @@
//$Id$
package org.hibernate.test.annotations.onetoone;
+import javax.persistence.CascadeType;
import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
import javax.persistence.OneToOne;
import javax.persistence.PrimaryKeyJoinColumn;
-import javax.persistence.CascadeType;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/OwnerAddress.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/OwnerAddress.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/OwnerAddress.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,8 +2,8 @@
package org.hibernate.test.annotations.onetoone;
import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
import javax.persistence.OneToOne;
import org.hibernate.annotations.GenericGenerator;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/PartyAffiliate.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/PartyAffiliate.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/PartyAffiliate.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -4,7 +4,6 @@
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.OneToOne;
-import javax.persistence.PrimaryKeyJoinColumn;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/SerialNumberPk.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/SerialNumberPk.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/SerialNumberPk.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.onetoone;
import java.io.Serializable;
+
import javax.persistence.Embeddable;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/Hardware.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/Hardware.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/Hardware.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,7 +1,5 @@
package org.hibernate.test.annotations.onetoone.hhh4851;
-import java.util.ArrayList;
-import java.util.List;
import javax.persistence.DiscriminatorColumn;
import javax.persistence.DiscriminatorType;
import javax.persistence.DiscriminatorValue;
@@ -10,14 +8,9 @@
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.OneToMany;
import javax.persistence.OneToOne;
import javax.persistence.Table;
-import org.hibernate.annotations.Cascade;
-import org.hibernate.annotations.CascadeType;
-
@Entity
@Table
@Inheritance(strategy = InheritanceType.SINGLE_TABLE)
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/persister/Card.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/persister/Card.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/persister/Card.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,6 +1,7 @@
package org.hibernate.test.annotations.persister;
import java.io.Serializable;
+
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/persister/Deck.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/persister/Deck.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/persister/Deck.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
import java.io.Serializable;
import java.util.Set;
+
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.OneToMany;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/persister/EntityPersister.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/persister/EntityPersister.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/persister/EntityPersister.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,7 +1,6 @@
package org.hibernate.test.annotations.persister;
import org.hibernate.HibernateException;
-import org.hibernate.cache.CacheConcurrencyStrategy;
import org.hibernate.cache.access.EntityRegionAccessStrategy;
import org.hibernate.engine.Mapping;
import org.hibernate.engine.SessionFactoryImplementor;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/polymorphism/PolymorphismTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/polymorphism/PolymorphismTest.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/polymorphism/PolymorphismTest.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,9 +1,9 @@
//$Id$
package org.hibernate.test.annotations.polymorphism;
-import org.hibernate.test.annotations.TestCase;
import org.hibernate.Session;
import org.hibernate.Transaction;
+import org.hibernate.test.annotations.TestCase;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/query/Captain.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/query/Captain.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/query/Captain.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.query;
import java.io.Serializable;
+
import javax.persistence.ColumnResult;
import javax.persistence.Entity;
import javax.persistence.EntityResult;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/query/CasimirParticle.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/query/CasimirParticle.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/query/CasimirParticle.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,8 +2,8 @@
package org.hibernate.test.annotations.query;
import javax.persistence.Entity;
+import javax.persistence.Id;
import javax.persistence.Table;
-import javax.persistence.Id;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/query/Chaos.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/query/Chaos.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/query/Chaos.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,22 +1,22 @@
//$Id$
package org.hibernate.test.annotations.query;
+import java.util.HashSet;
import java.util.Set;
-import java.util.HashSet;
+
+import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.NamedQuery;
+import javax.persistence.JoinColumn;
import javax.persistence.NamedNativeQuery;
import javax.persistence.OneToMany;
-import javax.persistence.JoinColumn;
-import javax.persistence.Column;
+import javax.persistence.Table;
+import org.hibernate.annotations.Loader;
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.SQLDeleteAll;
import org.hibernate.annotations.SQLInsert;
import org.hibernate.annotations.SQLUpdate;
-import org.hibernate.annotations.SQLDelete;
-import org.hibernate.annotations.SQLDeleteAll;
-import org.hibernate.annotations.Loader;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/query/Night.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/query/Night.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/query/Night.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.query;
import java.util.Date;
+
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/quote/QuoteTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/quote/QuoteTest.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/quote/QuoteTest.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,9 +1,9 @@
//$Id$
package org.hibernate.test.annotations.quote;
-import org.hibernate.test.annotations.TestCase;
import org.hibernate.Session;
import org.hibernate.Transaction;
+import org.hibernate.test.annotations.TestCase;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/quote/Role.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/quote/Role.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/quote/Role.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,10 +2,11 @@
package org.hibernate.test.annotations.quote;
import java.io.Serializable;
-import javax.persistence.Id;
+
import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
-import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
import javax.persistence.Table;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/quote/User.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/quote/User.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/quote/User.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,14 +2,15 @@
package org.hibernate.test.annotations.quote;
import java.io.Serializable;
+import java.util.HashSet;
import java.util.Set;
-import java.util.HashSet;
-import javax.persistence.ManyToMany;
+
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
-import javax.persistence.Table;
import javax.persistence.GenerationType;
import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.Table;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/House.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/House.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/House.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -4,6 +4,7 @@
import java.io.Serializable;
import java.util.HashSet;
import java.util.Set;
+
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Inhabitant.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Inhabitant.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Inhabitant.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -4,6 +4,7 @@
import java.io.Serializable;
import java.util.HashSet;
import java.util.Set;
+
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/ItemCost.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/ItemCost.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/ItemCost.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,10 +1,11 @@
//$Id$
package org.hibernate.test.annotations.referencedcolumnname;
+import java.io.Serializable;
import java.math.BigDecimal;
-import java.io.Serializable;
+
+import javax.persistence.Entity;
import javax.persistence.Id;
-import javax.persistence.Entity;
import javax.persistence.ManyToOne;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Luggage.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Luggage.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Luggage.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -4,6 +4,7 @@
import java.io.Serializable;
import java.util.HashSet;
import java.util.Set;
+
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Postman.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Postman.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Postman.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.referencedcolumnname;
import java.io.Serializable;
+
import javax.persistence.Entity;
import javax.persistence.Id;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Rambler.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Rambler.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Rambler.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -4,6 +4,7 @@
import java.io.Serializable;
import java.util.HashSet;
import java.util.Set;
+
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/ReferencedColumnNameTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/ReferencedColumnNameTest.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/ReferencedColumnNameTest.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,8 +1,8 @@
//$Id$
package org.hibernate.test.annotations.referencedcolumnname;
+import java.math.BigDecimal;
import java.util.Iterator;
-import java.math.BigDecimal;
import org.hibernate.Session;
import org.hibernate.Transaction;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Vendor.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Vendor.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Vendor.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,8 +1,8 @@
//$Id$
package org.hibernate.test.annotations.referencedcolumnname;
+import javax.persistence.Entity;
import javax.persistence.Id;
-import javax.persistence.Entity;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/WarehouseItem.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/WarehouseItem.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/WarehouseItem.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,11 +2,12 @@
package org.hibernate.test.annotations.referencedcolumnname;
import java.math.BigDecimal;
+
import javax.persistence.Entity;
import javax.persistence.Id;
+import javax.persistence.JoinColumn;
import javax.persistence.JoinColumns;
import javax.persistence.ManyToOne;
-import javax.persistence.JoinColumn;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/BusTrip.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/BusTrip.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/BusTrip.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -4,6 +4,7 @@
import java.util.Date;
import java.util.List;
import java.util.Map;
+
import javax.persistence.EmbeddedId;
import javax.persistence.Entity;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/EJB3OverridenAnnotationReaderTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/EJB3OverridenAnnotationReaderTest.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/EJB3OverridenAnnotationReaderTest.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -8,6 +8,7 @@
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
+
import javax.persistence.AssociationOverrides;
import javax.persistence.AttributeOverrides;
import javax.persistence.Basic;
@@ -17,6 +18,7 @@
import javax.persistence.Embedded;
import javax.persistence.EmbeddedId;
import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.ExcludeDefaultListeners;
@@ -39,6 +41,9 @@
import javax.persistence.OneToMany;
import javax.persistence.OneToOne;
import javax.persistence.OrderBy;
+import javax.persistence.PostLoad;
+import javax.persistence.PostPersist;
+import javax.persistence.PrePersist;
import javax.persistence.PrimaryKeyJoinColumn;
import javax.persistence.PrimaryKeyJoinColumns;
import javax.persistence.SecondaryTable;
@@ -51,12 +56,9 @@
import javax.persistence.TemporalType;
import javax.persistence.Transient;
import javax.persistence.Version;
-import javax.persistence.PrePersist;
-import javax.persistence.EntityListeners;
-import javax.persistence.PostLoad;
-import javax.persistence.PostPersist;
import junit.framework.TestCase;
+
import org.dom4j.DocumentException;
import org.dom4j.io.SAXReader;
import org.hibernate.annotations.Columns;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/LogListener.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/LogListener.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/LogListener.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,8 +1,8 @@
//$Id$
package org.hibernate.test.annotations.reflection;
+import javax.persistence.PostPersist;
import javax.persistence.PrePersist;
-import javax.persistence.PostPersist;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/OtherLogListener.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/OtherLogListener.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/OtherLogListener.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,8 +1,8 @@
//$Id$
package org.hibernate.test.annotations.reflection;
+import javax.persistence.PostPersist;
import javax.persistence.PrePersist;
-import javax.persistence.PostPersist;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/SocialSecurityNumber.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/SocialSecurityNumber.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/SocialSecurityNumber.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.reflection;
import java.io.Serializable;
+
import javax.persistence.Embeddable;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/XMLContextTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/XMLContextTest.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/XMLContextTest.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -8,6 +8,7 @@
import java.util.List;
import junit.framework.TestCase;
+
import org.dom4j.io.SAXReader;
import org.hibernate.cfg.EJB3DTDEntityResolver;
import org.hibernate.cfg.annotations.reflection.XMLContext;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/strategy/Storm.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/strategy/Storm.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/strategy/Storm.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -6,8 +6,8 @@
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
+import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
-import javax.persistence.Table;
import org.hibernate.annotations.Index;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tableperclass/TablePerClassTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tableperclass/TablePerClassTest.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tableperclass/TablePerClassTest.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,12 +2,11 @@
package org.hibernate.test.annotations.tableperclass;
import java.util.List;
-import java.sql.SQLException;
+import org.hibernate.JDBCException;
import org.hibernate.Query;
import org.hibernate.Session;
import org.hibernate.Transaction;
-import org.hibernate.JDBCException;
import org.hibernate.test.annotations.TestCase;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/target/Brand.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/target/Brand.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/target/Brand.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,15 +1,16 @@
//$Id$
package org.hibernate.test.annotations.target;
+import java.util.HashMap;
import java.util.Map;
-import java.util.HashMap;
+
import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
import javax.persistence.ManyToMany;
+import org.hibernate.annotations.CollectionOfElements;
import org.hibernate.annotations.MapKey;
-import org.hibernate.annotations.CollectionOfElements;
import org.hibernate.annotations.MapKeyManyToMany;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/target/LuggageImpl.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/target/LuggageImpl.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/target/LuggageImpl.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,11 +1,10 @@
//$Id$
package org.hibernate.test.annotations.target;
+import javax.persistence.Embedded;
import javax.persistence.Entity;
-import javax.persistence.Id;
import javax.persistence.GeneratedValue;
-import javax.persistence.ManyToOne;
-import javax.persistence.Embedded;
+import javax.persistence.Id;
import org.hibernate.annotations.Target;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/target/Owner.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/target/Owner.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/target/Owner.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,7 +1,6 @@
//$Id$
package org.hibernate.test.annotations.target;
-import java.util.Map;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/target/OwnerImpl.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/target/OwnerImpl.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/target/OwnerImpl.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,11 +1,7 @@
//$Id$
package org.hibernate.test.annotations.target;
-import java.util.Map;
-import java.util.HashMap;
import javax.persistence.Embeddable;
-import org.hibernate.annotations.MapKey;
-import javax.persistence.ManyToMany;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/target/TargetTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/target/TargetTest.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/target/TargetTest.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,8 +1,8 @@
//$Id$
package org.hibernate.test.annotations.target;
+import org.hibernate.Session;
import org.hibernate.test.annotations.TestCase;
-import org.hibernate.Session;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/Country.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/Country.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/Country.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,8 +1,8 @@
//$Id$
package org.hibernate.test.annotations.tuplizer;
+import javax.persistence.Column;
import javax.persistence.Embeddable;
-import javax.persistence.Column;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/Cuisine.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/Cuisine.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/Cuisine.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,9 +1,9 @@
//$Id$
package org.hibernate.test.annotations.tuplizer;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Entity;
import org.hibernate.annotations.Tuplizer;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/DataProxyHandler.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/DataProxyHandler.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/DataProxyHandler.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,10 +1,10 @@
//$Id$
package org.hibernate.test.annotations.tuplizer;
+import java.io.Serializable;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.util.HashMap;
-import java.io.Serializable;
/**
* A simple {@link java.lang.reflect.InvocationHandler} to act as the handler for our generated
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/DynamicComponentTuplizer.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/DynamicComponentTuplizer.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/DynamicComponentTuplizer.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,16 +1,9 @@
//$Id$
package org.hibernate.test.annotations.tuplizer;
-import org.hibernate.tuple.entity.PojoEntityTuplizer;
-import org.hibernate.tuple.entity.EntityMetamodel;
+import org.hibernate.mapping.Component;
import org.hibernate.tuple.Instantiator;
import org.hibernate.tuple.component.PojoComponentTuplizer;
-import org.hibernate.mapping.PersistentClass;
-import org.hibernate.mapping.Component;
-import org.hibernate.proxy.ProxyFactory;
-import org.hibernate.property.Getter;
-import org.hibernate.property.Setter;
-import org.hibernate.HibernateException;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/DynamicEntityTuplizer.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/DynamicEntityTuplizer.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/DynamicEntityTuplizer.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,13 +1,13 @@
//$Id$
package org.hibernate.test.annotations.tuplizer;
-import org.hibernate.tuple.entity.PojoEntityTuplizer;
-import org.hibernate.tuple.entity.EntityMetamodel;
-import org.hibernate.tuple.Instantiator;
import org.hibernate.mapping.PersistentClass;
-import org.hibernate.proxy.ProxyFactory;
import org.hibernate.property.Getter;
import org.hibernate.property.Setter;
+import org.hibernate.proxy.ProxyFactory;
+import org.hibernate.tuple.Instantiator;
+import org.hibernate.tuple.entity.EntityMetamodel;
+import org.hibernate.tuple.entity.PojoEntityTuplizer;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/DynamicInstantiator.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/DynamicInstantiator.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/DynamicInstantiator.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,12 +2,12 @@
package org.hibernate.test.annotations.tuplizer;
import java.io.Serializable;
+import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Proxy;
-import java.lang.reflect.InvocationHandler;
+import org.hibernate.HibernateException;
import org.hibernate.tuple.Instantiator;
import org.hibernate.util.ReflectHelper;
-import org.hibernate.HibernateException;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/ProxyHelper.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/ProxyHelper.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/ProxyHelper.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,8 +2,8 @@
package org.hibernate.test.annotations.tuplizer;
import java.io.Serializable;
+import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Proxy;
-import java.lang.reflect.InvocationHandler;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/TuplizerTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/TuplizerTest.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/TuplizerTest.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,8 +1,8 @@
//$Id$
package org.hibernate.test.annotations.tuplizer;
+import org.hibernate.Session;
import org.hibernate.test.annotations.TestCase;
-import org.hibernate.Session;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/various/Antenna.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/various/Antenna.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/various/Antenna.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,9 +1,9 @@
//$Id$
package org.hibernate.test.annotations.various;
+import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
-import javax.persistence.Column;
import org.hibernate.annotations.Generated;
import org.hibernate.annotations.GenerationTime;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/various/GeneratedTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/various/GeneratedTest.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/various/GeneratedTest.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,9 +1,9 @@
//$Id$
package org.hibernate.test.annotations.various;
-import org.hibernate.test.annotations.TestCase;
import org.hibernate.Session;
import org.hibernate.Transaction;
+import org.hibernate.test.annotations.TestCase;
/**
* @author Emmanuel Bernard
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/various/ProfessionalAgreement.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/various/ProfessionalAgreement.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/various/ProfessionalAgreement.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.various;
import java.util.Date;
+
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/ejb3/Manufacturer.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/ejb3/Manufacturer.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/ejb3/Manufacturer.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -3,10 +3,11 @@
import java.util.HashSet;
import java.util.Set;
+
import javax.persistence.Entity;
import javax.persistence.Id;
+import javax.persistence.NamedQuery;
import javax.persistence.OneToMany;
-import javax.persistence.NamedQuery;
import javax.persistence.TableGenerator;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/AImpl.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/AImpl.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/AImpl.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -3,11 +3,11 @@
import javax.persistence.Column;
import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import javax.persistence.Table;
-import javax.persistence.GeneratedValue;
@Entity
@Inheritance( strategy = InheritanceType.JOINED )
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmTest.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmTest.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -4,7 +4,6 @@
import java.util.HashSet;
import org.hibernate.Session;
-import org.hibernate.cfg.Configuration;
import org.hibernate.test.annotations.TestCase;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -1,10 +1,7 @@
//$Id:HbmTest.java 9793 2006-04-26 02:20:18 -0400 (mer., 26 avr. 2006) epbernard $
package org.hibernate.test.annotations.xml.hbm;
-import java.util.HashSet;
-
import org.hibernate.Session;
-import org.hibernate.cfg.Configuration;
import org.hibernate.test.annotations.TestCase;
/**
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/PrimeMinister.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/PrimeMinister.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/PrimeMinister.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -2,6 +2,7 @@
package org.hibernate.test.annotations.xml.hbm;
import java.util.Set;
+
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/Sky.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/Sky.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/Sky.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -3,6 +3,7 @@
import java.util.HashSet;
import java.util.Set;
+
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/ZImpl.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/ZImpl.java 2010-03-23 20:59:05 UTC (rev 19091)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/ZImpl.java 2010-03-23 21:14:04 UTC (rev 19092)
@@ -4,13 +4,13 @@
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
-import javax.persistence.GeneratedValue;
@Entity
@Inheritance( strategy = InheritanceType.JOINED )
14 years, 1 month
- 1
- 0
Hibernate SVN: r19091 - in core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test: abstractembeddedcomponents/propertyref and 91 other directories.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2010-03-23 16:59:05 -0400 (Tue, 23 Mar 2010)
New Revision: 19091
Modified:
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/abstractembeddedcomponents/cid/AbstractCompositeIdTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/abstractembeddedcomponents/cid/MyInterfaceImpl.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/abstractembeddedcomponents/propertyref/AbstractComponentPropertyRefTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/abstractembeddedcomponents/propertyref/AddressImpl.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/abstractembeddedcomponents/propertyref/Server.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/abstractembeddedcomponents/propertyref/ServerImpl.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/any/Address.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/any/AnyTypeTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/any/ComplexPropertyValue.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/any/PropertySet.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/ast/ASTIteratorTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/ast/ASTUtilTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/batch/BatchTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/bidi/AuctionTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/bidi/AuctionTest2.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/bytecode/Bean.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/bytecode/BeanReflectionHelper.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/bytecode/cglib/CGLIBThreadLocalTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/bytecode/cglib/InvocationTargetExceptionTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/cascade/A.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/cascade/G.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/cascade/H.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/cascade/JobBatch.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/cascade/circle/Node.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/cascade/circle/Route.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/cascade/circle/Tour.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/cascade/circle/Vehicle.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/cid/Customer.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/collection/backref/map/compkey/BackrefCompositeMapKeyTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/collection/bag/BagOwner.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/collection/idbag/IdbagOwner.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/collection/list/ListOwner.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/collection/map/Parent.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/collection/set/Parent.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/component/basic/ComponentTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/component/cascading/collection/Definition.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/component/cascading/collection/LocalizedStrings.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/component/cascading/toone/CascadeToComponentAssociationTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/deletetransient/Address.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/deletetransient/Person.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/deletetransient/Suite.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/dialect/function/AnsiTrimEmulationFunctionTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/dialect/function/MySQLRoundFunctionTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/dialect/functional/cache/SQLFunctionsInterSystemsTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/dialect/unit/lockhint/AbstractLockHintTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/discriminator/DiscriminatorTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/dynamicentity/DataProxyHandler.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/dynamicentity/ProxyHelper.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/dynamicentity/interceptor/ProxyInterceptor.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/dynamicentity/tuplizer/MyEntityInstantiator.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/dynamicentity/tuplizer/MyEntityTuplizer.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/dynamicentity/tuplizer/TuplizerDynamicEntityTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/dynamicentity/tuplizer2/ImprovedTuplizerDynamicEntityTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/dynamicentity/tuplizer2/MyEntityInstantiator.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/dynamicentity/tuplizer2/MyEntityTuplizer.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/entitymode/dom4j/accessors/Dom4jAccessorTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/entitymode/dom4j/basic/Dom4jTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/entitymode/dom4j/many2one/Dom4jManyToOneTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/entitymode/map/subclass/SubclassDynamicMapTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/entitymode/multi/MultiRepresentationTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/entitymode/multi/Stock.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/event/collection/association/bidirectional/manytomany/BidirectionalManyToManyBagToSetCollectionEventTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/event/collection/association/bidirectional/manytomany/BidirectionalManyToManySetToSetCollectionEventTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/event/collection/association/bidirectional/manytomany/ParentWithBidirectionalManyToMany.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManyBagCollectionEventTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManyBagSubclassCollectionEventTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManySetCollectionEventTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/ParentWithBidirectionalOneToMany.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/ParentWithBidirectionalOneToManySubclass.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/event/collection/values/ParentWithCollectionOfValues.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/event/collection/values/ValuesBagCollectionEventTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/events/CallbackTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/exception/User.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/filter/Department.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/filter/DynamicFilterTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/filter/Order.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/filter/Product.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/filter/Salesperson.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/filter/hql/BasicFilteredBulkManipulationTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/filter/hql/JoinedFilteredBulkManipulationTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/generated/AbstractGeneratedPropertyTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/generated/PartiallyGeneratedComponentTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/generated/TimestampGeneratedValuesWithCachingTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/generated/TriggerGeneratedValuesWithCachingTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/generatedkeys/identity/MyEntity.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hql/Animal.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hql/BulkManipulationTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hql/ClassificationType.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hql/CriteriaClassicAggregationReturnTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hql/CriteriaHQLAlignmentTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hql/HQLTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hql/HqlParserTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hql/QueryTranslatorTestCase.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hql/SimpleEntityWithAssociation.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/OptimizerUnitTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/SequenceStyleConfigUnitTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/forcedtable/BasicForcedTableSequenceTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/forcedtable/HiLoForcedTableSequenceTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/forcedtable/PooledForcedTableSequenceTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/sequence/BasicSequenceTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/sequence/HiLoSequenceTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/sequence/PooledSequenceTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/table/BasicTableTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/table/HiLoTableTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/table/PooledTableTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/idprops/Order.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/insertordering/InsertOrderingTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/insertordering/User.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/instrument/buildtime/InstrumentTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/instrument/cases/TestDirtyCheckExecutable.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/instrument/cases/TestFetchAllExecutable.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/instrument/cases/TestInjectFieldInterceptorExecutable.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/instrument/cases/TestIsPropertyInitializedExecutable.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/instrument/cases/TestLazyManyToOneExecutable.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/instrument/cases/TestManyToOneProxyExecutable.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/instrument/cases/TestSharedPKOneToOneExecutable.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/instrument/domain/CustomBlobType.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/instrument/runtime/CGLIBInstrumentationTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/instrument/runtime/JavassistInstrumentationTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/interfaceproxy/DocumentInterceptor.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/join/OptionalJoinTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/jpa/AbstractJPATest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/jpa/Item.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/jpa/cascade/CascadeTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/jpa/fetch/Person.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/keymanytoone/bidir/component/Customer.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/keymanytoone/bidir/component/Order.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/keymanytoone/bidir/embedded/Customer.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/keymanytoone/bidir/embedded/Order.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/legacy/ABCTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/legacy/CacheTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/legacy/CustomPersister.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/legacy/CustomSQLTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/legacy/FooBarTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/legacy/LegacyTestCase.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/legacy/NonReflectiveBinderTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/legacy/SQLFunctionsTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/lob/LobHolder.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/lob/SerializableTypeTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/manytomany/ordered/Group.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/manytomany/ordered/User.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/manytomanyassociationclass/compositeid/ManyToManyAssociationClassCompositeIdTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/manytomanyassociationclass/surrogateid/assigned/ManyToManyAssociationClassAssignedIdTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/manytomanyassociationclass/surrogateid/generated/ManyToManyAssociationClassGeneratedIdTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/mapping/PersistentClassVisitorTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/mapping/ValueVisitorTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/mappingexception/User.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/naturalid/immutable/ImmutableNaturalIdTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/ondelete/OnDeleteTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/onetoone/optional/OptionalOneToOneTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/ops/Competition.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/ops/CreateTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/ops/Employee.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/ops/Employer.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/ops/GetLoadTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/ops/SaveOrUpdateTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/ops/VersionedEntity.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/pagination/PaginationTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/propertyref/basic/Person.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/proxy/Container.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/querycache/Item.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/readonly/ReadOnlyVersionedNodesTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/readonly/VersionedNode.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/reattachment/CollectionReattachmentTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/reattachment/Parent.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/reattachment/ProxyReattachmentTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/rowid/RowIdTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/sql/hand/Group.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/sql/hand/MonetaryAmount.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/sql/hand/custom/CustomSQLTestSupport.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/sql/hand/identity/CustomInsertSQLWithIdentityColumnTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/sql/hand/query/NativeSQLQueriesTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/stateless/fetching/StatelessSessionFetchingTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/subclassfilter/Employee.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/tm/CMTTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/typeparameters/DefaultValueIntegerType.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/usercollection/parameterized/DefaultableListType.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/usercollection/parameterized/Entity.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/usercollection/parameterized/ParameterizedUserCollectionTypeTest.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/util/dtd/Parent.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/version/db/User.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/version/sybase/User.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/where/NumericTrueFalseType.java
Log:
clean up unused imports
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/abstractembeddedcomponents/cid/AbstractCompositeIdTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/abstractembeddedcomponents/cid/AbstractCompositeIdTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/abstractembeddedcomponents/cid/AbstractCompositeIdTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,12 +1,12 @@
package org.hibernate.test.abstractembeddedcomponents.cid;
+import junit.framework.Test;
+
import org.hibernate.Session;
import org.hibernate.Transaction;
import org.hibernate.junit.functional.FunctionalTestCase;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
-import junit.framework.Test;
-
/**
* @author Steve Ebersole
*/
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/abstractembeddedcomponents/cid/MyInterfaceImpl.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/abstractembeddedcomponents/cid/MyInterfaceImpl.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/abstractembeddedcomponents/cid/MyInterfaceImpl.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,6 +1,5 @@
package org.hibernate.test.abstractembeddedcomponents.cid;
-import org.hibernate.test.abstractembeddedcomponents.cid.MyInterface;
/**
* @author Steve Ebersole
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/abstractembeddedcomponents/propertyref/AbstractComponentPropertyRefTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/abstractembeddedcomponents/propertyref/AbstractComponentPropertyRefTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/abstractembeddedcomponents/propertyref/AbstractComponentPropertyRefTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,12 +1,12 @@
package org.hibernate.test.abstractembeddedcomponents.propertyref;
+import junit.framework.Test;
+
import org.hibernate.Session;
import org.hibernate.Transaction;
import org.hibernate.junit.functional.FunctionalTestCase;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
-import junit.framework.Test;
-
/**
* @author Steve Ebersole
*/
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/abstractembeddedcomponents/propertyref/AddressImpl.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/abstractembeddedcomponents/propertyref/AddressImpl.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/abstractembeddedcomponents/propertyref/AddressImpl.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,6 +1,5 @@
package org.hibernate.test.abstractembeddedcomponents.propertyref;
-import org.hibernate.test.abstractembeddedcomponents.propertyref.Address;
/**
* @author Steve Ebersole
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/abstractembeddedcomponents/propertyref/Server.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/abstractembeddedcomponents/propertyref/Server.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/abstractembeddedcomponents/propertyref/Server.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,6 +1,5 @@
package org.hibernate.test.abstractembeddedcomponents.propertyref;
-import org.hibernate.test.abstractembeddedcomponents.propertyref.Address;
/**
* @author Steve Ebersole
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/abstractembeddedcomponents/propertyref/ServerImpl.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/abstractembeddedcomponents/propertyref/ServerImpl.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/abstractembeddedcomponents/propertyref/ServerImpl.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,7 +1,5 @@
package org.hibernate.test.abstractembeddedcomponents.propertyref;
-import org.hibernate.test.abstractembeddedcomponents.propertyref.Address;
-import org.hibernate.test.abstractembeddedcomponents.propertyref.Server;
/**
* @author Steve Ebersole
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/any/Address.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/any/Address.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/any/Address.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,7 +1,7 @@
package org.hibernate.test.any;
+import java.util.HashSet;
import java.util.Set;
-import java.util.HashSet;
/**
* todo: describe Address
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/any/AnyTypeTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/any/AnyTypeTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/any/AnyTypeTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,11 +1,11 @@
package org.hibernate.test.any;
+import junit.framework.Test;
+
import org.hibernate.Session;
+import org.hibernate.junit.functional.FunctionalTestCase;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
-import org.hibernate.junit.functional.FunctionalTestCase;
-import junit.framework.Test;
-
/**
* todo: describe AnyTypeTest
*
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/any/ComplexPropertyValue.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/any/ComplexPropertyValue.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/any/ComplexPropertyValue.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,8 +1,8 @@
package org.hibernate.test.any;
-import java.util.Map;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.Map;
/**
* todo: describe ${NAME}
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/any/PropertySet.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/any/PropertySet.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/any/PropertySet.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,7 +1,7 @@
package org.hibernate.test.any;
+import java.util.HashMap;
import java.util.Map;
-import java.util.HashMap;
/**
* todo: describe PropertySet
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/ast/ASTIteratorTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/ast/ASTIteratorTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/ast/ASTIteratorTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -3,8 +3,6 @@
import java.io.PrintWriter;
-import antlr.ASTFactory;
-import antlr.collections.AST;
import junit.framework.Test;
import junit.framework.TestSuite;
@@ -16,6 +14,9 @@
import org.hibernate.hql.ast.util.ASTUtil;
import org.hibernate.junit.UnitTestCase;
+import antlr.ASTFactory;
+import antlr.collections.AST;
+
/**
* Test ASTIterator.
*/
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/ast/ASTUtilTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/ast/ASTUtilTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/ast/ASTUtilTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,14 +1,15 @@
// $Id: ASTUtilTest.java 10977 2006-12-12 23:28:04Z steve.ebersole(a)jboss.com $
package org.hibernate.test.ast;
-import antlr.ASTFactory;
-import antlr.collections.AST;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.hibernate.hql.ast.util.ASTUtil;
import org.hibernate.junit.UnitTestCase;
+import antlr.ASTFactory;
+import antlr.collections.AST;
+
/**
* Unit test for ASTUtil.
*/
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/batch/BatchTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/batch/BatchTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/batch/BatchTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -10,10 +10,10 @@
import org.hibernate.ScrollableResults;
import org.hibernate.Session;
import org.hibernate.Transaction;
+import org.hibernate.cfg.Configuration;
+import org.hibernate.cfg.Environment;
import org.hibernate.junit.functional.FunctionalTestCase;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
-import org.hibernate.cfg.Configuration;
-import org.hibernate.cfg.Environment;
/**
* This is how to do batch processing in Hibernate.
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/bidi/AuctionTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/bidi/AuctionTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/bidi/AuctionTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -9,9 +9,9 @@
import org.hibernate.Hibernate;
import org.hibernate.Session;
import org.hibernate.Transaction;
+import org.hibernate.dialect.PostgreSQLDialect;
import org.hibernate.junit.functional.FunctionalTestCase;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
-import org.hibernate.dialect.PostgreSQLDialect;
/**
* @author Gavin King
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/bidi/AuctionTest2.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/bidi/AuctionTest2.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/bidi/AuctionTest2.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -4,14 +4,14 @@
import java.math.BigDecimal;
import java.util.Date;
+import junit.framework.Test;
+
import org.hibernate.Hibernate;
import org.hibernate.Session;
import org.hibernate.Transaction;
import org.hibernate.junit.functional.FunctionalTestCase;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
-import junit.framework.Test;
-
/**
* @author Gavin King
*/
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/bytecode/Bean.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/bytecode/Bean.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/bytecode/Bean.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,7 +1,7 @@
package org.hibernate.test.bytecode;
+import java.text.ParseException;
import java.util.Date;
-import java.text.ParseException;
/**
* @author Steve Ebersole
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/bytecode/BeanReflectionHelper.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/bytecode/BeanReflectionHelper.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/bytecode/BeanReflectionHelper.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,11 +1,11 @@
package org.hibernate.test.bytecode;
+import java.util.Date;
+
import org.hibernate.property.BasicPropertyAccessor;
import org.hibernate.property.Getter;
import org.hibernate.property.Setter;
-import java.util.Date;
-
/**
* @author Steve Ebersole
*/
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/bytecode/cglib/CGLIBThreadLocalTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/bytecode/cglib/CGLIBThreadLocalTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/bytecode/cglib/CGLIBThreadLocalTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,15 +1,17 @@
package org.hibernate.test.bytecode.cglib;
-import org.hibernate.junit.functional.*;
-import org.hibernate.cfg.*;
-import org.hibernate.*;
-import org.hibernate.proxy.*;
-import org.hibernate.test.bytecode.*;
-import junit.framework.*;
+import java.lang.reflect.Field;
-import java.lang.reflect.*;
+import junit.framework.TestSuite;
+import org.hibernate.Session;
+import org.hibernate.cfg.Environment;
+import org.hibernate.junit.functional.FunctionalTestCase;
+import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
+import org.hibernate.proxy.HibernateProxy;
+import org.hibernate.test.bytecode.ProxyBean;
+
/**
* Test that the static thread local callback object is cleared out of the proxy class after instantiated.
* This tests that the memory leak reported by HHH-2481 hasn't been re-introduced.
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/bytecode/cglib/InvocationTargetExceptionTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/bytecode/cglib/InvocationTargetExceptionTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/bytecode/cglib/InvocationTargetExceptionTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,15 +1,16 @@
package org.hibernate.test.bytecode.cglib;
-import org.hibernate.test.bytecode.Bean;
+import java.text.ParseException;
+
+import junit.framework.TestSuite;
+
+import org.hibernate.Hibernate;
import org.hibernate.Session;
-import org.hibernate.Hibernate;
+import org.hibernate.cfg.Environment;
import org.hibernate.junit.functional.FunctionalTestCase;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
-import org.hibernate.cfg.Environment;
-import junit.framework.TestSuite;
+import org.hibernate.test.bytecode.Bean;
-import java.text.ParseException;
-
/**
* Test that the Javassist-based lazy initializer properly handles
* InvocationTargetExceptions
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/cascade/A.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/cascade/A.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/cascade/A.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -26,8 +26,8 @@
package org.hibernate.test.cascade;
+import java.util.HashSet;
import java.util.Set;
-import java.util.HashSet;
/**
* @author <a href="mailto:ovidiu@feodorov.com">Ovidiu Feodorov</a>
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/cascade/G.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/cascade/G.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/cascade/G.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -26,8 +26,8 @@
package org.hibernate.test.cascade;
+import java.util.HashSet;
import java.util.Set;
-import java.util.HashSet;
/**
* @author <a href="mailto:ovidiu@feodorov.com">Ovidiu Feodorov</a>
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/cascade/H.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/cascade/H.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/cascade/H.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -26,8 +26,8 @@
package org.hibernate.test.cascade;
+import java.util.HashSet;
import java.util.Set;
-import java.util.HashSet;
/**
* @author <a href="mailto:ovidiu@feodorov.com">Ovidiu Feodorov</a>
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/cascade/JobBatch.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/cascade/JobBatch.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/cascade/JobBatch.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -2,8 +2,8 @@
package org.hibernate.test.cascade;
import java.util.Date;
+import java.util.HashSet;
import java.util.Set;
-import java.util.HashSet;
/**
* Implementation of JobBatch.
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/cascade/circle/Node.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/cascade/circle/Node.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/cascade/circle/Node.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -26,11 +26,9 @@
package org.hibernate.test.cascade.circle;
-import java.util.ArrayList;
+import java.util.HashSet;
import java.util.Iterator;
-import java.util.List;
import java.util.Set;
-import java.util.HashSet;
public class Node {
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/cascade/circle/Route.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/cascade/circle/Route.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/cascade/circle/Route.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -26,11 +26,9 @@
package org.hibernate.test.cascade.circle;
-import java.util.ArrayList;
+import java.util.HashSet;
import java.util.Iterator;
-import java.util.List;
import java.util.Set;
-import java.util.HashSet;
public class Route {
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/cascade/circle/Tour.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/cascade/circle/Tour.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/cascade/circle/Tour.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -25,10 +25,8 @@
*/
package org.hibernate.test.cascade.circle;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
import java.util.HashSet;
+import java.util.Set;
public class Tour {
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/cascade/circle/Vehicle.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/cascade/circle/Vehicle.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/cascade/circle/Vehicle.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -26,8 +26,8 @@
package org.hibernate.test.cascade.circle;
+import java.util.HashSet;
import java.util.Set;
-import java.util.HashSet;
public class Vehicle {
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/cid/Customer.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/cid/Customer.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/cid/Customer.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,10 +1,10 @@
//$Id: Customer.java 4806 2004-11-25 14:37:00Z steveebersole $
package org.hibernate.test.cid;
+import java.math.BigDecimal;
import java.util.ArrayList;
+import java.util.GregorianCalendar;
import java.util.List;
-import java.util.GregorianCalendar;
-import java.math.BigDecimal;
/**
* @author Gavin King
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/collection/backref/map/compkey/BackrefCompositeMapKeyTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/collection/backref/map/compkey/BackrefCompositeMapKeyTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/collection/backref/map/compkey/BackrefCompositeMapKeyTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -17,12 +17,12 @@
import junit.framework.Test;
+import org.hibernate.Hibernate;
+import org.hibernate.LockMode;
+import org.hibernate.Session;
+import org.hibernate.Transaction;
import org.hibernate.junit.functional.FunctionalTestCase;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
-import org.hibernate.Session;
-import org.hibernate.Transaction;
-import org.hibernate.LockMode;
-import org.hibernate.Hibernate;
import org.hibernate.util.SerializationHelper;
/**
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/collection/bag/BagOwner.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/collection/bag/BagOwner.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/collection/bag/BagOwner.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,7 +1,7 @@
package org.hibernate.test.collection.bag;
+import java.util.ArrayList;
import java.util.List;
-import java.util.ArrayList;
/**
* {@inheritDoc}
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/collection/idbag/IdbagOwner.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/collection/idbag/IdbagOwner.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/collection/idbag/IdbagOwner.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,7 +1,7 @@
package org.hibernate.test.collection.idbag;
+import java.util.ArrayList;
import java.util.List;
-import java.util.ArrayList;
/**
* {@inheritDoc}
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/collection/list/ListOwner.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/collection/list/ListOwner.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/collection/list/ListOwner.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,7 +1,7 @@
package org.hibernate.test.collection.list;
+import java.util.ArrayList;
import java.util.List;
-import java.util.ArrayList;
/**
* {@inheritDoc}
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/collection/map/Parent.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/collection/map/Parent.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/collection/map/Parent.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,7 +1,7 @@
package org.hibernate.test.collection.map;
+import java.util.HashMap;
import java.util.Map;
-import java.util.HashMap;
/**
* todo: describe Parent
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/collection/set/Parent.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/collection/set/Parent.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/collection/set/Parent.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,7 +1,7 @@
package org.hibernate.test.collection.set;
+import java.util.HashSet;
import java.util.Set;
-import java.util.HashSet;
/**
* todo: describe Parent
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/component/basic/ComponentTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/component/basic/ComponentTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/component/basic/ComponentTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -7,16 +7,16 @@
import junit.framework.Test;
+import org.hibernate.Hibernate;
import org.hibernate.Session;
import org.hibernate.Transaction;
-import org.hibernate.Hibernate;
import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment;
import org.hibernate.cfg.Mappings;
import org.hibernate.criterion.Property;
import org.hibernate.dialect.Dialect;
+import org.hibernate.dialect.SybaseASE15Dialect;
import org.hibernate.dialect.function.SQLFunction;
-import org.hibernate.dialect.SybaseASE15Dialect;
import org.hibernate.junit.functional.FunctionalTestCase;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
import org.hibernate.mapping.Component;
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/component/cascading/collection/Definition.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/component/cascading/collection/Definition.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/component/cascading/collection/Definition.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,7 +1,7 @@
package org.hibernate.test.component.cascading.collection;
+import java.util.HashSet;
import java.util.Set;
-import java.util.HashSet;
/**
* {@inheritDoc}
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/component/cascading/collection/LocalizedStrings.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/component/cascading/collection/LocalizedStrings.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/component/cascading/collection/LocalizedStrings.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,8 +1,8 @@
package org.hibernate.test.component.cascading.collection;
+import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
-import java.util.HashMap;
/**
* {@inheritDoc}
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/component/cascading/toone/CascadeToComponentAssociationTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/component/cascading/toone/CascadeToComponentAssociationTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/component/cascading/toone/CascadeToComponentAssociationTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -2,9 +2,9 @@
import junit.framework.Test;
+import org.hibernate.Session;
import org.hibernate.junit.functional.FunctionalTestCase;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
-import org.hibernate.Session;
/**
* {@inheritDoc}
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/deletetransient/Address.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/deletetransient/Address.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/deletetransient/Address.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,7 +1,7 @@
package org.hibernate.test.deletetransient;
+import java.util.HashSet;
import java.util.Set;
-import java.util.HashSet;
/**
* todo: describe Address
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/deletetransient/Person.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/deletetransient/Person.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/deletetransient/Person.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,9 +1,9 @@
package org.hibernate.test.deletetransient;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
import java.util.Set;
-import java.util.HashSet;
-import java.util.Collection;
-import java.util.ArrayList;
/**
* todo: describe Person
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/deletetransient/Suite.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/deletetransient/Suite.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/deletetransient/Suite.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,9 +1,7 @@
package org.hibernate.test.deletetransient;
-import java.util.Set;
import java.util.HashSet;
-import java.util.Collection;
-import java.util.ArrayList;
+import java.util.Set;
/**
*
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/dialect/function/AnsiTrimEmulationFunctionTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/dialect/function/AnsiTrimEmulationFunctionTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/dialect/function/AnsiTrimEmulationFunctionTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -23,8 +23,8 @@
*/
package org.hibernate.test.dialect.function;
+import java.util.ArrayList;
import java.util.List;
-import java.util.ArrayList;
import junit.framework.TestCase;
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/dialect/function/MySQLRoundFunctionTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/dialect/function/MySQLRoundFunctionTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/dialect/function/MySQLRoundFunctionTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -28,7 +28,6 @@
import org.hibernate.Query;
import org.hibernate.Session;
import org.hibernate.Transaction;
-import org.hibernate.dialect.Dialect;
import org.hibernate.dialect.MySQLDialect;
import org.hibernate.junit.functional.FunctionalTestCase;
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/dialect/functional/cache/SQLFunctionsInterSystemsTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/dialect/functional/cache/SQLFunctionsInterSystemsTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/dialect/functional/cache/SQLFunctionsInterSystemsTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -11,8 +11,6 @@
import java.util.Map;
import junit.framework.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.hibernate.Hibernate;
import org.hibernate.LockMode;
@@ -36,6 +34,8 @@
import org.hibernate.test.legacy.Fixed;
import org.hibernate.test.legacy.Simple;
import org.hibernate.test.legacy.Single;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Tests for function support on CacheSQL...
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/dialect/unit/lockhint/AbstractLockHintTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/dialect/unit/lockhint/AbstractLockHintTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/dialect/unit/lockhint/AbstractLockHintTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,12 +1,12 @@
package org.hibernate.test.dialect.unit.lockhint;
+import java.util.Collections;
import java.util.HashMap;
-import java.util.Collections;
+import org.hibernate.LockMode;
+import org.hibernate.dialect.Dialect;
import org.hibernate.junit.UnitTestCase;
-import org.hibernate.dialect.Dialect;
import org.hibernate.util.StringHelper;
-import org.hibernate.LockMode;
/**
* {@inheritDoc}
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/discriminator/DiscriminatorTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/discriminator/DiscriminatorTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/discriminator/DiscriminatorTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -10,11 +10,11 @@
import org.hibernate.Hibernate;
import org.hibernate.Session;
import org.hibernate.Transaction;
-import org.hibernate.proxy.HibernateProxy;
import org.hibernate.criterion.Property;
import org.hibernate.criterion.Restrictions;
import org.hibernate.junit.functional.FunctionalTestCase;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
+import org.hibernate.proxy.HibernateProxy;
/**
* @author Gavin King
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/dynamicentity/DataProxyHandler.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/dynamicentity/DataProxyHandler.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/dynamicentity/DataProxyHandler.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,9 +1,9 @@
package org.hibernate.test.dynamicentity;
+import java.io.Serializable;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.util.HashMap;
-import java.io.Serializable;
/**
* A simple {@link InvocationHandler} to act as the handler for our generated
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/dynamicentity/ProxyHelper.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/dynamicentity/ProxyHelper.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/dynamicentity/ProxyHelper.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,8 +1,8 @@
package org.hibernate.test.dynamicentity;
import java.io.Serializable;
+import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Proxy;
-import java.lang.reflect.InvocationHandler;
/**
* @author <a href="mailto:steve@hibernate.org">Steve Ebersole </a>
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/dynamicentity/interceptor/ProxyInterceptor.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/dynamicentity/interceptor/ProxyInterceptor.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/dynamicentity/interceptor/ProxyInterceptor.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,16 +1,14 @@
package org.hibernate.test.dynamicentity.interceptor;
+import java.io.Serializable;
+import java.lang.reflect.Proxy;
+
import org.hibernate.EmptyInterceptor;
import org.hibernate.EntityMode;
import org.hibernate.test.dynamicentity.Company;
import org.hibernate.test.dynamicentity.Customer;
import org.hibernate.test.dynamicentity.ProxyHelper;
-import org.hibernate.test.dynamicentity.DataProxyHandler;
-import java.io.Serializable;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Proxy;
-
/**
* Our custom {@link org.hibernate.Interceptor} impl which performs the
* interpretation of entity-name -> proxy instance and vice-versa.
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/dynamicentity/tuplizer/MyEntityInstantiator.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/dynamicentity/tuplizer/MyEntityInstantiator.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/dynamicentity/tuplizer/MyEntityInstantiator.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,19 +1,19 @@
package org.hibernate.test.dynamicentity.tuplizer;
-import org.hibernate.tuple.Instantiator;
+import java.io.Serializable;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Proxy;
+
+import org.hibernate.HibernateException;
+import org.hibernate.test.dynamicentity.Address;
+import org.hibernate.test.dynamicentity.Company;
import org.hibernate.test.dynamicentity.Customer;
-import org.hibernate.test.dynamicentity.ProxyHelper;
-import org.hibernate.test.dynamicentity.Company;
import org.hibernate.test.dynamicentity.DataProxyHandler;
-import org.hibernate.test.dynamicentity.Address;
import org.hibernate.test.dynamicentity.Person;
+import org.hibernate.test.dynamicentity.ProxyHelper;
+import org.hibernate.tuple.Instantiator;
import org.hibernate.util.ReflectHelper;
-import org.hibernate.HibernateException;
-import java.io.Serializable;
-import java.lang.reflect.Proxy;
-import java.lang.reflect.InvocationHandler;
-
/**
* @author <a href="mailto:steve@hibernate.org">Steve Ebersole </a>
*/
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/dynamicentity/tuplizer/MyEntityTuplizer.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/dynamicentity/tuplizer/MyEntityTuplizer.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/dynamicentity/tuplizer/MyEntityTuplizer.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,12 +1,12 @@
package org.hibernate.test.dynamicentity.tuplizer;
-import org.hibernate.tuple.entity.PojoEntityTuplizer;
-import org.hibernate.tuple.entity.EntityMetamodel;
-import org.hibernate.tuple.Instantiator;
import org.hibernate.mapping.PersistentClass;
-import org.hibernate.proxy.ProxyFactory;
import org.hibernate.property.Getter;
import org.hibernate.property.Setter;
+import org.hibernate.proxy.ProxyFactory;
+import org.hibernate.tuple.Instantiator;
+import org.hibernate.tuple.entity.EntityMetamodel;
+import org.hibernate.tuple.entity.PojoEntityTuplizer;
/**
* @author Steve Ebersole
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/dynamicentity/tuplizer/TuplizerDynamicEntityTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/dynamicentity/tuplizer/TuplizerDynamicEntityTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/dynamicentity/tuplizer/TuplizerDynamicEntityTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,20 +1,20 @@
package org.hibernate.test.dynamicentity.tuplizer;
-import org.hibernate.test.dynamicentity.Company;
-import org.hibernate.test.dynamicentity.ProxyHelper;
-import org.hibernate.test.dynamicentity.Customer;
-import org.hibernate.test.dynamicentity.Address;
-import org.hibernate.test.dynamicentity.Person;
+import java.util.HashSet;
+
+import junit.framework.TestSuite;
+
+import org.hibernate.Hibernate;
import org.hibernate.Session;
-import org.hibernate.Hibernate;
import org.hibernate.cfg.Configuration;
import org.hibernate.junit.functional.FunctionalTestCase;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
+import org.hibernate.test.dynamicentity.Address;
+import org.hibernate.test.dynamicentity.Company;
+import org.hibernate.test.dynamicentity.Customer;
+import org.hibernate.test.dynamicentity.Person;
+import org.hibernate.test.dynamicentity.ProxyHelper;
-import junit.framework.TestSuite;
-
-import java.util.HashSet;
-
/**
* Demonstrates use of Tuplizers to allow the use of JDK
* {@link java.lang.reflect.Proxy dynamic proxies} as our
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/dynamicentity/tuplizer2/ImprovedTuplizerDynamicEntityTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/dynamicentity/tuplizer2/ImprovedTuplizerDynamicEntityTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/dynamicentity/tuplizer2/ImprovedTuplizerDynamicEntityTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -24,22 +24,22 @@
*/
package org.hibernate.test.dynamicentity.tuplizer2;
-import org.hibernate.test.dynamicentity.Company;
-import org.hibernate.test.dynamicentity.ProxyHelper;
-import org.hibernate.test.dynamicentity.Customer;
-import org.hibernate.test.dynamicentity.Address;
-import org.hibernate.test.dynamicentity.Person;
+import java.util.HashSet;
+
+import junit.framework.TestSuite;
+
+import org.hibernate.EntityMode;
+import org.hibernate.Hibernate;
import org.hibernate.Session;
-import org.hibernate.Hibernate;
-import org.hibernate.EntityMode;
import org.hibernate.cfg.Configuration;
import org.hibernate.junit.functional.FunctionalTestCase;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
+import org.hibernate.test.dynamicentity.Address;
+import org.hibernate.test.dynamicentity.Company;
+import org.hibernate.test.dynamicentity.Customer;
+import org.hibernate.test.dynamicentity.Person;
+import org.hibernate.test.dynamicentity.ProxyHelper;
-import junit.framework.TestSuite;
-
-import java.util.HashSet;
-
/**
* Demonstrates use of Tuplizers to allow the use of JDK
* {@link java.lang.reflect.Proxy dynamic proxies} as our
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/dynamicentity/tuplizer2/MyEntityInstantiator.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/dynamicentity/tuplizer2/MyEntityInstantiator.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/dynamicentity/tuplizer2/MyEntityInstantiator.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -24,17 +24,17 @@
*/
package org.hibernate.test.dynamicentity.tuplizer2;
-import org.hibernate.tuple.Instantiator;
+import java.io.Serializable;
+
+import org.hibernate.HibernateException;
+import org.hibernate.test.dynamicentity.Address;
+import org.hibernate.test.dynamicentity.Company;
import org.hibernate.test.dynamicentity.Customer;
+import org.hibernate.test.dynamicentity.Person;
import org.hibernate.test.dynamicentity.ProxyHelper;
-import org.hibernate.test.dynamicentity.Company;
-import org.hibernate.test.dynamicentity.Address;
-import org.hibernate.test.dynamicentity.Person;
+import org.hibernate.tuple.Instantiator;
import org.hibernate.util.ReflectHelper;
-import org.hibernate.HibernateException;
-import java.io.Serializable;
-
/**
* @author Steve Ebersole
*/
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/dynamicentity/tuplizer2/MyEntityTuplizer.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/dynamicentity/tuplizer2/MyEntityTuplizer.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/dynamicentity/tuplizer2/MyEntityTuplizer.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -24,17 +24,17 @@
*/
package org.hibernate.test.dynamicentity.tuplizer2;
-import org.hibernate.tuple.entity.PojoEntityTuplizer;
-import org.hibernate.tuple.entity.EntityMetamodel;
-import org.hibernate.tuple.Instantiator;
+import org.hibernate.EntityNameResolver;
+import org.hibernate.engine.SessionFactoryImplementor;
import org.hibernate.mapping.PersistentClass;
-import org.hibernate.proxy.ProxyFactory;
import org.hibernate.property.Getter;
import org.hibernate.property.Setter;
+import org.hibernate.proxy.ProxyFactory;
+import org.hibernate.test.dynamicentity.ProxyHelper;
import org.hibernate.test.dynamicentity.tuplizer.MyEntityInstantiator;
-import org.hibernate.test.dynamicentity.ProxyHelper;
-import org.hibernate.engine.SessionFactoryImplementor;
-import org.hibernate.EntityNameResolver;
+import org.hibernate.tuple.Instantiator;
+import org.hibernate.tuple.entity.EntityMetamodel;
+import org.hibernate.tuple.entity.PojoEntityTuplizer;
/**
* @author Steve Ebersole
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/entitymode/dom4j/accessors/Dom4jAccessorTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/entitymode/dom4j/accessors/Dom4jAccessorTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/entitymode/dom4j/accessors/Dom4jAccessorTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -4,10 +4,10 @@
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
+
import org.dom4j.DocumentFactory;
import org.dom4j.Element;
import org.dom4j.util.NodeComparator;
-
import org.hibernate.EntityMode;
import org.hibernate.engine.SessionFactoryImplementor;
import org.hibernate.mapping.Property;
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/entitymode/dom4j/basic/Dom4jTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/entitymode/dom4j/basic/Dom4jTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/entitymode/dom4j/basic/Dom4jTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -4,9 +4,9 @@
import java.util.Map;
import junit.framework.Test;
+
import org.dom4j.DocumentFactory;
import org.dom4j.Element;
-
import org.hibernate.EntityMode;
import org.hibernate.Session;
import org.hibernate.Transaction;
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/entitymode/dom4j/many2one/Dom4jManyToOneTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/entitymode/dom4j/many2one/Dom4jManyToOneTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/entitymode/dom4j/many2one/Dom4jManyToOneTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -3,10 +3,10 @@
import java.util.List;
import junit.framework.Test;
+
import org.dom4j.Element;
import org.dom4j.io.OutputFormat;
import org.dom4j.io.XMLWriter;
-
import org.hibernate.EntityMode;
import org.hibernate.Session;
import org.hibernate.Transaction;
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/entitymode/map/subclass/SubclassDynamicMapTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/entitymode/map/subclass/SubclassDynamicMapTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/entitymode/map/subclass/SubclassDynamicMapTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -25,8 +25,8 @@
import java.util.HashMap;
+import org.hibernate.Session;
import org.hibernate.junit.functional.FunctionalTestCase;
-import org.hibernate.Session;
/**
* TODO : javadoc
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/entitymode/multi/MultiRepresentationTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/entitymode/multi/MultiRepresentationTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/entitymode/multi/MultiRepresentationTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -6,12 +6,11 @@
import java.util.List;
import junit.framework.Test;
-import junit.framework.TestSuite;
+
import org.dom4j.DocumentFactory;
import org.dom4j.Element;
import org.dom4j.io.OutputFormat;
import org.dom4j.io.XMLWriter;
-
import org.hibernate.EntityMode;
import org.hibernate.Transaction;
import org.hibernate.classic.Session;
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/entitymode/multi/Stock.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/entitymode/multi/Stock.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/entitymode/multi/Stock.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,8 +1,8 @@
// $Id: Stock.java 10977 2006-12-12 23:28:04Z steve.ebersole(a)jboss.com $
package org.hibernate.test.entitymode.multi;
+import java.util.HashSet;
import java.util.Set;
-import java.util.HashSet;
/**
* POJO implementation of Stock entity.
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/event/collection/association/bidirectional/manytomany/BidirectionalManyToManyBagToSetCollectionEventTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/event/collection/association/bidirectional/manytomany/BidirectionalManyToManyBagToSetCollectionEventTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/event/collection/association/bidirectional/manytomany/BidirectionalManyToManyBagToSetCollectionEventTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -29,7 +29,6 @@
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
import org.hibernate.test.event.collection.ParentWithCollection;
import org.hibernate.test.event.collection.association.AbstractAssociationCollectionEventTest;
-import org.hibernate.test.event.collection.association.bidirectional.manytomany.ParentWithBidirectionalManyToMany;
/**
*
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/event/collection/association/bidirectional/manytomany/BidirectionalManyToManySetToSetCollectionEventTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/event/collection/association/bidirectional/manytomany/BidirectionalManyToManySetToSetCollectionEventTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/event/collection/association/bidirectional/manytomany/BidirectionalManyToManySetToSetCollectionEventTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -29,7 +29,6 @@
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
import org.hibernate.test.event.collection.ParentWithCollection;
import org.hibernate.test.event.collection.association.AbstractAssociationCollectionEventTest;
-import org.hibernate.test.event.collection.association.bidirectional.manytomany.ParentWithBidirectionalManyToMany;
/**
*
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/event/collection/association/bidirectional/manytomany/ParentWithBidirectionalManyToMany.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/event/collection/association/bidirectional/manytomany/ParentWithBidirectionalManyToMany.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/event/collection/association/bidirectional/manytomany/ParentWithBidirectionalManyToMany.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -25,8 +25,8 @@
import java.util.HashSet;
import java.util.Iterator;
+import org.hibernate.test.event.collection.AbstractParentWithCollection;
import org.hibernate.test.event.collection.Child;
-import org.hibernate.test.event.collection.AbstractParentWithCollection;
/**
*
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManyBagCollectionEventTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManyBagCollectionEventTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManyBagCollectionEventTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -30,8 +30,6 @@
import org.hibernate.test.event.collection.Child;
import org.hibernate.test.event.collection.ParentWithCollection;
import org.hibernate.test.event.collection.association.AbstractAssociationCollectionEventTest;
-import org.hibernate.test.event.collection.association.bidirectional.onetomany.ChildWithManyToOne;
-import org.hibernate.test.event.collection.association.bidirectional.onetomany.ParentWithBidirectionalOneToMany;
/**
*
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManyBagSubclassCollectionEventTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManyBagSubclassCollectionEventTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManyBagSubclassCollectionEventTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -21,17 +21,10 @@
*/
package org.hibernate.test.event.collection.association.bidirectional.onetomany;
-import java.util.ArrayList;
-import java.util.Collection;
-
import junit.framework.Test;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
-import org.hibernate.test.event.collection.Child;
import org.hibernate.test.event.collection.ParentWithCollection;
-import org.hibernate.test.event.collection.association.AbstractAssociationCollectionEventTest;
-import org.hibernate.test.event.collection.association.bidirectional.onetomany.ChildWithManyToOne;
-import org.hibernate.test.event.collection.association.bidirectional.onetomany.ParentWithBidirectionalOneToMany;
/**
*
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManySetCollectionEventTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManySetCollectionEventTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManySetCollectionEventTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -30,8 +30,6 @@
import org.hibernate.test.event.collection.Child;
import org.hibernate.test.event.collection.ParentWithCollection;
import org.hibernate.test.event.collection.association.AbstractAssociationCollectionEventTest;
-import org.hibernate.test.event.collection.association.bidirectional.onetomany.ChildWithManyToOne;
-import org.hibernate.test.event.collection.association.bidirectional.onetomany.ParentWithBidirectionalOneToMany;
/**
*
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/ParentWithBidirectionalOneToMany.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/ParentWithBidirectionalOneToMany.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/ParentWithBidirectionalOneToMany.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -24,8 +24,8 @@
import java.util.Collection;
import java.util.Iterator;
+import org.hibernate.test.event.collection.AbstractParentWithCollection;
import org.hibernate.test.event.collection.Child;
-import org.hibernate.test.event.collection.AbstractParentWithCollection;
/**
*
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/ParentWithBidirectionalOneToManySubclass.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/ParentWithBidirectionalOneToManySubclass.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/ParentWithBidirectionalOneToManySubclass.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -21,12 +21,7 @@
*/
package org.hibernate.test.event.collection.association.bidirectional.onetomany;
-import java.util.Collection;
-import java.util.Iterator;
-import org.hibernate.test.event.collection.Child;
-import org.hibernate.test.event.collection.AbstractParentWithCollection;
-
/**
*
* @author Gail Badner
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/event/collection/values/ParentWithCollectionOfValues.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/event/collection/values/ParentWithCollectionOfValues.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/event/collection/values/ParentWithCollectionOfValues.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -21,11 +21,9 @@
*/
package org.hibernate.test.event.collection.values;
-import java.util.Collection;
-
+import org.hibernate.test.event.collection.AbstractParentWithCollection;
import org.hibernate.test.event.collection.Child;
import org.hibernate.test.event.collection.ChildValue;
-import org.hibernate.test.event.collection.AbstractParentWithCollection;
/**
*
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/event/collection/values/ValuesBagCollectionEventTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/event/collection/values/ValuesBagCollectionEventTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/event/collection/values/ValuesBagCollectionEventTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -29,7 +29,6 @@
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
import org.hibernate.test.event.collection.AbstractCollectionEventTest;
import org.hibernate.test.event.collection.ParentWithCollection;
-import org.hibernate.test.event.collection.values.ParentWithCollectionOfValues;
/**
*
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/events/CallbackTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/events/CallbackTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/events/CallbackTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -25,14 +25,14 @@
import java.util.Set;
+import org.hibernate.HibernateException;
import org.hibernate.SessionFactory;
import org.hibernate.SessionFactoryObserver;
-import org.hibernate.HibernateException;
import org.hibernate.cfg.Configuration;
+import org.hibernate.event.DeleteEvent;
import org.hibernate.event.DeleteEventListener;
import org.hibernate.event.Destructible;
import org.hibernate.event.Initializable;
-import org.hibernate.event.DeleteEvent;
import org.hibernate.junit.functional.FunctionalTestCase;
/**
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/exception/User.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/exception/User.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/exception/User.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,8 +1,8 @@
// $Id: User.java 4746 2004-11-11 20:57:28Z steveebersole $
package org.hibernate.test.exception;
+import java.util.HashSet;
import java.util.Set;
-import java.util.HashSet;
/**
* Implementation of User.
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/filter/Department.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/filter/Department.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/filter/Department.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,8 +1,8 @@
// $Id: Department.java 4448 2004-08-28 02:29:05Z steveebersole $
package org.hibernate.test.filter;
+import java.util.HashSet;
import java.util.Set;
-import java.util.HashSet;
/**
* Implementation of Department.
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/filter/DynamicFilterTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/filter/DynamicFilterTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/filter/DynamicFilterTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -11,28 +11,28 @@
import junit.framework.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.hibernate.Criteria;
import org.hibernate.EntityMode;
import org.hibernate.FetchMode;
import org.hibernate.Hibernate;
import org.hibernate.Session;
import org.hibernate.Transaction;
-import org.hibernate.Criteria;
-import org.hibernate.impl.SessionFactoryImpl;
-import org.hibernate.engine.SessionImplementor;
import org.hibernate.cache.CacheKey;
import org.hibernate.cache.entry.CollectionCacheEntry;
import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment;
-import org.hibernate.criterion.Restrictions;
import org.hibernate.criterion.DetachedCriteria;
import org.hibernate.criterion.Property;
+import org.hibernate.criterion.Restrictions;
import org.hibernate.criterion.Subqueries;
+import org.hibernate.engine.SessionImplementor;
+import org.hibernate.impl.SessionFactoryImpl;
import org.hibernate.junit.functional.FunctionalTestCase;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
import org.hibernate.persister.collection.CollectionPersister;
import org.hibernate.transform.DistinctRootEntityResultTransformer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Implementation of DynamicFilterTest.
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/filter/Order.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/filter/Order.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/filter/Order.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,9 +1,9 @@
// $Id: Order.java 4222 2004-08-10 05:19:46Z steveebersole $
package org.hibernate.test.filter;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import java.util.ArrayList;
/**
* @author Steve Ebersole
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/filter/Product.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/filter/Product.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/filter/Product.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,9 +1,9 @@
// $Id: Product.java 6507 2005-04-25 16:57:32Z steveebersole $
package org.hibernate.test.filter;
-import java.util.Set;
import java.util.Date;
import java.util.HashSet;
+import java.util.Set;
/**
* @author Steve Ebersole
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/filter/Salesperson.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/filter/Salesperson.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/filter/Salesperson.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,9 +1,9 @@
// $Id: Salesperson.java 4448 2004-08-28 02:29:05Z steveebersole $
package org.hibernate.test.filter;
+import java.util.Date;
+import java.util.HashSet;
import java.util.Set;
-import java.util.HashSet;
-import java.util.Date;
/**
* Implementation of Salesperson.
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/filter/hql/BasicFilteredBulkManipulationTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/filter/hql/BasicFilteredBulkManipulationTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/filter/hql/BasicFilteredBulkManipulationTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -24,8 +24,8 @@
*/
package org.hibernate.test.filter.hql;
+import org.hibernate.Session;
import org.hibernate.junit.functional.FunctionalTestCase;
-import org.hibernate.Session;
/**
* Tests for application of filters
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/filter/hql/JoinedFilteredBulkManipulationTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/filter/hql/JoinedFilteredBulkManipulationTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/filter/hql/JoinedFilteredBulkManipulationTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -26,8 +26,8 @@
import java.util.Date;
+import org.hibernate.Session;
import org.hibernate.junit.functional.FunctionalTestCase;
-import org.hibernate.Session;
/**
* TODO : javadoc
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/generated/AbstractGeneratedPropertyTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/generated/AbstractGeneratedPropertyTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/generated/AbstractGeneratedPropertyTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,9 +1,9 @@
// $Id: AbstractGeneratedPropertyTest.java 10976 2006-12-12 23:22:26Z steve.ebersole(a)jboss.com $
package org.hibernate.test.generated;
+import org.hibernate.Hibernate;
import org.hibernate.Session;
import org.hibernate.Transaction;
-import org.hibernate.Hibernate;
import org.hibernate.junit.functional.DatabaseSpecificFunctionalTestCase;
/**
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/generated/PartiallyGeneratedComponentTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/generated/PartiallyGeneratedComponentTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/generated/PartiallyGeneratedComponentTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -2,11 +2,11 @@
import junit.framework.Test;
+import org.hibernate.Session;
+import org.hibernate.dialect.Dialect;
+import org.hibernate.dialect.Oracle9iDialect;
import org.hibernate.junit.functional.DatabaseSpecificFunctionalTestCase;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.dialect.Oracle9iDialect;
-import org.hibernate.Session;
/**
* {@inheritDoc}
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/generated/TimestampGeneratedValuesWithCachingTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/generated/TimestampGeneratedValuesWithCachingTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/generated/TimestampGeneratedValuesWithCachingTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -4,11 +4,11 @@
import junit.framework.Test;
import org.hibernate.dialect.Dialect;
-import org.hibernate.dialect.SybaseDialect;
+import org.hibernate.dialect.SQLServerDialect;
import org.hibernate.dialect.Sybase11Dialect;
+import org.hibernate.dialect.SybaseASE15Dialect;
import org.hibernate.dialect.SybaseAnywhereDialect;
-import org.hibernate.dialect.SybaseASE15Dialect;
-import org.hibernate.dialect.SQLServerDialect;
+import org.hibernate.dialect.SybaseDialect;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
/**
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/generated/TriggerGeneratedValuesWithCachingTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/generated/TriggerGeneratedValuesWithCachingTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/generated/TriggerGeneratedValuesWithCachingTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,12 +1,12 @@
// $Id: TriggerGeneratedValuesWithCachingTest.java 10977 2006-12-12 23:28:04Z steve.ebersole(a)jboss.com $
package org.hibernate.test.generated;
+import junit.framework.Test;
+
+import org.hibernate.dialect.Dialect;
import org.hibernate.dialect.Oracle9iDialect;
-import org.hibernate.dialect.Dialect;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
-import junit.framework.Test;
-
/**
* Implementation of TriggerGeneratedValuesWithoutCachingTest.
*
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/generatedkeys/identity/MyEntity.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/generatedkeys/identity/MyEntity.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/generatedkeys/identity/MyEntity.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,7 +1,7 @@
package org.hibernate.test.generatedkeys.identity;
+import java.util.HashSet;
import java.util.Set;
-import java.util.HashSet;
/**
* @author Steve Ebersole
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -13,8 +13,6 @@
import java.util.Map;
import junit.framework.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.hibernate.Hibernate;
import org.hibernate.HibernateException;
@@ -30,7 +28,6 @@
import org.hibernate.dialect.HSQLDialect;
import org.hibernate.dialect.MySQLDialect;
import org.hibernate.dialect.Oracle8iDialect;
-
import org.hibernate.dialect.PostgreSQLDialect;
import org.hibernate.dialect.SQLServerDialect;
import org.hibernate.dialect.Sybase11Dialect;
@@ -55,6 +52,8 @@
import org.hibernate.type.ManyToOneType;
import org.hibernate.type.Type;
import org.hibernate.util.StringHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Tests the integration of the new AST parser into the loading of query results using
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hql/Animal.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hql/Animal.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hql/Animal.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,8 +1,8 @@
//$Id: Animal.java 7445 2005-07-10 16:51:17Z oneovthafew $
package org.hibernate.test.hql;
+import java.util.HashSet;
import java.util.Set;
-import java.util.HashSet;
/**
* @author Gavin King
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hql/BulkManipulationTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hql/BulkManipulationTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hql/BulkManipulationTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -16,7 +16,6 @@
import org.hibernate.junit.functional.FunctionalTestCase;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
import org.hibernate.persister.entity.EntityPersister;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hql/ClassificationType.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hql/ClassificationType.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hql/ClassificationType.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,15 +1,15 @@
package org.hibernate.test.hql;
-import org.hibernate.usertype.EnhancedUserType;
-import org.hibernate.HibernateException;
-import org.hibernate.Hibernate;
-
+import java.io.Serializable;
+import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
-import java.sql.PreparedStatement;
import java.sql.Types;
-import java.io.Serializable;
+import org.hibernate.Hibernate;
+import org.hibernate.HibernateException;
+import org.hibernate.usertype.EnhancedUserType;
+
/**
* A custom type for mapping {@link org.hibernate.test.hql.Classification} instances
* to the respective db column.
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hql/CriteriaClassicAggregationReturnTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hql/CriteriaClassicAggregationReturnTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hql/CriteriaClassicAggregationReturnTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -4,15 +4,15 @@
import junit.framework.Test;
+import org.hibernate.Hibernate;
import org.hibernate.cfg.Configuration;
+import org.hibernate.dialect.function.ClassicAvgFunction;
import org.hibernate.dialect.function.ClassicCountFunction;
-import org.hibernate.dialect.function.ClassicAvgFunction;
import org.hibernate.dialect.function.ClassicSumFunction;
-import org.hibernate.hql.ast.QueryTranslatorImpl;
import org.hibernate.hql.QueryTranslator;
import org.hibernate.hql.QueryTranslatorFactory;
+import org.hibernate.hql.ast.QueryTranslatorImpl;
import org.hibernate.hql.classic.ClassicQueryTranslatorFactory;
-import org.hibernate.Hibernate;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
/**
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hql/CriteriaHQLAlignmentTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hql/CriteriaHQLAlignmentTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hql/CriteriaHQLAlignmentTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -8,7 +8,6 @@
import junit.framework.Test;
import org.hibernate.Hibernate;
-import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
import org.hibernate.classic.Session;
import org.hibernate.criterion.Projections;
import org.hibernate.hql.QueryTranslator;
@@ -16,6 +15,7 @@
import org.hibernate.hql.ast.QueryTranslatorImpl;
import org.hibernate.hql.ast.tree.SelectClause;
import org.hibernate.hql.classic.ClassicQueryTranslatorFactory;
+import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
/**
* Tests cases for ensuring alignment between HQL and Criteria behavior.
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hql/HQLTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hql/HQLTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hql/HQLTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -9,7 +9,6 @@
import java.util.List;
import java.util.Map;
-import antlr.RecognitionException;
import junit.framework.Test;
import org.hibernate.Hibernate;
@@ -41,6 +40,8 @@
import org.hibernate.hql.ast.tree.SelectClause;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
+import antlr.RecognitionException;
+
/**
* Tests cases where the AST based query translator and the 'classic' query translator generate identical SQL.
*
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hql/HqlParserTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hql/HqlParserTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hql/HqlParserTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -5,9 +5,6 @@
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
-import antlr.RecognitionException;
-import antlr.TokenStreamException;
-import antlr.collections.AST;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
@@ -17,6 +14,10 @@
import org.hibernate.hql.ast.util.ASTIterator;
import org.hibernate.hql.ast.util.ASTPrinter;
+import antlr.RecognitionException;
+import antlr.TokenStreamException;
+import antlr.collections.AST;
+
/**
* Tests the HQL parser on various inputs, just makes sure that the first phase of the parser
* works properly (i.e. no unexpected syntax errors).
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hql/QueryTranslatorTestCase.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hql/QueryTranslatorTestCase.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hql/QueryTranslatorTestCase.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -20,7 +20,6 @@
import org.hibernate.EntityMode;
import org.hibernate.MappingException;
import org.hibernate.QueryException;
-import org.hibernate.junit.functional.FunctionalTestCase;
import org.hibernate.classic.Session;
import org.hibernate.engine.SessionFactoryImplementor;
import org.hibernate.engine.query.HQLQueryPlan;
@@ -31,6 +30,7 @@
import org.hibernate.hql.ast.QueryTranslatorImpl;
import org.hibernate.hql.ast.util.ASTPrinter;
import org.hibernate.hql.classic.ClassicQueryTranslatorFactory;
+import org.hibernate.junit.functional.FunctionalTestCase;
import org.hibernate.type.Type;
import org.hibernate.type.TypeFactory;
import org.hibernate.util.StringHelper;
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hql/SimpleEntityWithAssociation.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hql/SimpleEntityWithAssociation.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hql/SimpleEntityWithAssociation.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,7 +1,7 @@
package org.hibernate.test.hql;
+import java.util.HashSet;
import java.util.Set;
-import java.util.HashSet;
/**
* @author Steve Ebersole
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/OptimizerUnitTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/OptimizerUnitTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/OptimizerUnitTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -3,10 +3,10 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.hibernate.junit.UnitTestCase;
+import org.hibernate.id.enhanced.AccessCallback;
import org.hibernate.id.enhanced.Optimizer;
import org.hibernate.id.enhanced.OptimizerFactory;
-import org.hibernate.id.enhanced.AccessCallback;
+import org.hibernate.junit.UnitTestCase;
/**
* {@inheritDoc}
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/SequenceStyleConfigUnitTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/SequenceStyleConfigUnitTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/SequenceStyleConfigUnitTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -5,14 +5,14 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.hibernate.junit.UnitTestCase;
+import org.hibernate.Hibernate;
+import org.hibernate.MappingException;
import org.hibernate.dialect.Dialect;
+import org.hibernate.id.enhanced.OptimizerFactory;
+import org.hibernate.id.enhanced.SequenceStructure;
import org.hibernate.id.enhanced.SequenceStyleGenerator;
-import org.hibernate.id.enhanced.SequenceStructure;
-import org.hibernate.id.enhanced.OptimizerFactory;
import org.hibernate.id.enhanced.TableStructure;
-import org.hibernate.Hibernate;
-import org.hibernate.MappingException;
+import org.hibernate.junit.UnitTestCase;
/**
* Tests that SequenceStyleGenerator configures itself as expected
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/forcedtable/BasicForcedTableSequenceTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/forcedtable/BasicForcedTableSequenceTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/forcedtable/BasicForcedTableSequenceTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -2,11 +2,11 @@
import junit.framework.Test;
+import org.hibernate.Session;
+import org.hibernate.id.enhanced.SequenceStyleGenerator;
import org.hibernate.junit.functional.DatabaseSpecificFunctionalTestCase;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
import org.hibernate.persister.entity.EntityPersister;
-import org.hibernate.id.enhanced.SequenceStyleGenerator;
-import org.hibernate.Session;
/**
* {@inheritDoc}
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/forcedtable/HiLoForcedTableSequenceTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/forcedtable/HiLoForcedTableSequenceTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/forcedtable/HiLoForcedTableSequenceTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -2,12 +2,12 @@
import junit.framework.Test;
+import org.hibernate.Session;
+import org.hibernate.id.enhanced.OptimizerFactory;
+import org.hibernate.id.enhanced.SequenceStyleGenerator;
import org.hibernate.junit.functional.DatabaseSpecificFunctionalTestCase;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
import org.hibernate.persister.entity.EntityPersister;
-import org.hibernate.id.enhanced.OptimizerFactory;
-import org.hibernate.id.enhanced.SequenceStyleGenerator;
-import org.hibernate.Session;
/**
* {@inheritDoc}
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/forcedtable/PooledForcedTableSequenceTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/forcedtable/PooledForcedTableSequenceTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/forcedtable/PooledForcedTableSequenceTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -2,12 +2,12 @@
import junit.framework.Test;
+import org.hibernate.Session;
+import org.hibernate.id.enhanced.OptimizerFactory;
+import org.hibernate.id.enhanced.SequenceStyleGenerator;
import org.hibernate.junit.functional.DatabaseSpecificFunctionalTestCase;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
import org.hibernate.persister.entity.EntityPersister;
-import org.hibernate.id.enhanced.OptimizerFactory;
-import org.hibernate.id.enhanced.SequenceStyleGenerator;
-import org.hibernate.Session;
/**
* {@inheritDoc}
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/sequence/BasicSequenceTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/sequence/BasicSequenceTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/sequence/BasicSequenceTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -2,10 +2,10 @@
import junit.framework.Test;
-import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
-import org.hibernate.junit.functional.FunctionalTestCase;
import org.hibernate.Session;
import org.hibernate.id.enhanced.SequenceStyleGenerator;
+import org.hibernate.junit.functional.FunctionalTestCase;
+import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
import org.hibernate.persister.entity.EntityPersister;
/**
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/sequence/HiLoSequenceTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/sequence/HiLoSequenceTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/sequence/HiLoSequenceTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -2,11 +2,11 @@
import junit.framework.Test;
-import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
-import org.hibernate.junit.functional.FunctionalTestCase;
import org.hibernate.Session;
import org.hibernate.id.enhanced.OptimizerFactory;
import org.hibernate.id.enhanced.SequenceStyleGenerator;
+import org.hibernate.junit.functional.FunctionalTestCase;
+import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
import org.hibernate.persister.entity.EntityPersister;
/**
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/sequence/PooledSequenceTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/sequence/PooledSequenceTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/sequence/PooledSequenceTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -2,12 +2,12 @@
import junit.framework.Test;
+import org.hibernate.Session;
+import org.hibernate.id.enhanced.OptimizerFactory;
+import org.hibernate.id.enhanced.SequenceStyleGenerator;
+import org.hibernate.junit.functional.FunctionalTestCase;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
-import org.hibernate.junit.functional.FunctionalTestCase;
import org.hibernate.persister.entity.EntityPersister;
-import org.hibernate.id.enhanced.OptimizerFactory;
-import org.hibernate.id.enhanced.SequenceStyleGenerator;
-import org.hibernate.Session;
/**
* {@inheritDoc}
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/table/BasicTableTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/table/BasicTableTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/table/BasicTableTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -2,11 +2,11 @@
import junit.framework.Test;
+import org.hibernate.Session;
+import org.hibernate.id.enhanced.TableGenerator;
import org.hibernate.junit.functional.FunctionalTestCase;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
import org.hibernate.persister.entity.EntityPersister;
-import org.hibernate.id.enhanced.TableGenerator;
-import org.hibernate.Session;
/**
* {@inheritDoc}
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/table/HiLoTableTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/table/HiLoTableTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/table/HiLoTableTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -2,12 +2,12 @@
import junit.framework.Test;
+import org.hibernate.Session;
+import org.hibernate.id.enhanced.OptimizerFactory;
+import org.hibernate.id.enhanced.TableGenerator;
import org.hibernate.junit.functional.FunctionalTestCase;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
import org.hibernate.persister.entity.EntityPersister;
-import org.hibernate.id.enhanced.OptimizerFactory;
-import org.hibernate.id.enhanced.TableGenerator;
-import org.hibernate.Session;
/**
* {@inheritDoc}
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/table/PooledTableTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/table/PooledTableTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/table/PooledTableTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -2,12 +2,12 @@
import junit.framework.Test;
+import org.hibernate.Session;
+import org.hibernate.id.enhanced.OptimizerFactory;
+import org.hibernate.id.enhanced.TableGenerator;
import org.hibernate.junit.functional.FunctionalTestCase;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
import org.hibernate.persister.entity.EntityPersister;
-import org.hibernate.id.enhanced.OptimizerFactory;
-import org.hibernate.id.enhanced.TableGenerator;
-import org.hibernate.Session;
/**
* {@inheritDoc}
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/idprops/Order.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/idprops/Order.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/idprops/Order.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,8 +1,8 @@
package org.hibernate.test.idprops;
import java.util.Date;
+import java.util.HashSet;
import java.util.Set;
-import java.util.HashSet;
/**
* {@inheritDoc}
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/insertordering/InsertOrderingTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/insertordering/InsertOrderingTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/insertordering/InsertOrderingTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,25 +1,25 @@
package org.hibernate.test.insertordering;
-import java.util.List;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Iterator;
-import java.sql.SQLException;
-import java.sql.PreparedStatement;
+import java.util.List;
import junit.framework.Test;
-import org.hibernate.junit.functional.FunctionalTestCase;
-import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
+import org.hibernate.HibernateException;
+import org.hibernate.Interceptor;
+import org.hibernate.Session;
import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment;
-import org.hibernate.Session;
-import org.hibernate.Interceptor;
-import org.hibernate.HibernateException;
+import org.hibernate.jdbc.Batcher;
+import org.hibernate.jdbc.BatcherFactory;
import org.hibernate.jdbc.BatchingBatcher;
import org.hibernate.jdbc.ConnectionManager;
import org.hibernate.jdbc.Expectation;
-import org.hibernate.jdbc.BatcherFactory;
-import org.hibernate.jdbc.Batcher;
+import org.hibernate.junit.functional.FunctionalTestCase;
+import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
/**
* {@inheritDoc}
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/insertordering/User.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/insertordering/User.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/insertordering/User.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,8 +1,8 @@
package org.hibernate.test.insertordering;
-import java.util.Set;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.Set;
/**
* {@inheritDoc}
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/instrument/buildtime/InstrumentTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/instrument/buildtime/InstrumentTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/instrument/buildtime/InstrumentTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -5,18 +5,18 @@
import junit.framework.TestSuite;
import org.hibernate.intercept.FieldInterceptionHelper;
-import org.hibernate.test.instrument.domain.Document;
+import org.hibernate.junit.UnitTestCase;
+import org.hibernate.test.instrument.cases.Executable;
import org.hibernate.test.instrument.cases.TestDirtyCheckExecutable;
import org.hibernate.test.instrument.cases.TestFetchAllExecutable;
+import org.hibernate.test.instrument.cases.TestInjectFieldInterceptorExecutable;
+import org.hibernate.test.instrument.cases.TestIsPropertyInitializedExecutable;
import org.hibernate.test.instrument.cases.TestLazyExecutable;
import org.hibernate.test.instrument.cases.TestLazyManyToOneExecutable;
-import org.hibernate.test.instrument.cases.TestInjectFieldInterceptorExecutable;
-import org.hibernate.test.instrument.cases.TestIsPropertyInitializedExecutable;
import org.hibernate.test.instrument.cases.TestLazyPropertyCustomTypeExecutable;
import org.hibernate.test.instrument.cases.TestManyToOneProxyExecutable;
import org.hibernate.test.instrument.cases.TestSharedPKOneToOneExecutable;
-import org.hibernate.test.instrument.cases.Executable;
-import org.hibernate.junit.UnitTestCase;
+import org.hibernate.test.instrument.domain.Document;
/**
* @author Gavin King
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/instrument/cases/TestDirtyCheckExecutable.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/instrument/cases/TestDirtyCheckExecutable.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/instrument/cases/TestDirtyCheckExecutable.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,14 +1,14 @@
package org.hibernate.test.instrument.cases;
+import java.util.Iterator;
+import java.util.List;
+
+import junit.framework.Assert;
+
import org.hibernate.Session;
import org.hibernate.Transaction;
import org.hibernate.test.instrument.domain.Folder;
-import java.util.List;
-import java.util.Iterator;
-
-import junit.framework.Assert;
-
/**
* @author Steve Ebersole
*/
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/instrument/cases/TestFetchAllExecutable.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/instrument/cases/TestFetchAllExecutable.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/instrument/cases/TestFetchAllExecutable.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,12 +1,13 @@
package org.hibernate.test.instrument.cases;
+import junit.framework.Assert;
+
+import org.hibernate.Hibernate;
import org.hibernate.Session;
-import org.hibernate.Hibernate;
import org.hibernate.Transaction;
-import org.hibernate.test.instrument.domain.Owner;
import org.hibernate.test.instrument.domain.Document;
import org.hibernate.test.instrument.domain.Folder;
-import junit.framework.Assert;
+import org.hibernate.test.instrument.domain.Owner;
/**
* @author Steve Ebersole
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/instrument/cases/TestInjectFieldInterceptorExecutable.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/instrument/cases/TestInjectFieldInterceptorExecutable.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/instrument/cases/TestInjectFieldInterceptorExecutable.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,10 +1,10 @@
package org.hibernate.test.instrument.cases;
+import java.util.HashSet;
+
+import org.hibernate.intercept.FieldInterceptionHelper;
import org.hibernate.test.instrument.domain.Document;
-import org.hibernate.intercept.FieldInterceptionHelper;
-import java.util.HashSet;
-
/**
* @author Steve Ebersole
*/
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/instrument/cases/TestIsPropertyInitializedExecutable.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/instrument/cases/TestIsPropertyInitializedExecutable.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/instrument/cases/TestIsPropertyInitializedExecutable.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,13 +1,14 @@
//$Id: $
package org.hibernate.test.instrument.cases;
+import junit.framework.Assert;
+
+import org.hibernate.Hibernate;
import org.hibernate.Session;
import org.hibernate.Transaction;
-import org.hibernate.Hibernate;
-import org.hibernate.test.instrument.domain.Owner;
import org.hibernate.test.instrument.domain.Document;
import org.hibernate.test.instrument.domain.Folder;
-import junit.framework.Assert;
+import org.hibernate.test.instrument.domain.Owner;
/**
* @author Steve Ebersole
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/instrument/cases/TestLazyManyToOneExecutable.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/instrument/cases/TestLazyManyToOneExecutable.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/instrument/cases/TestLazyManyToOneExecutable.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,13 +1,13 @@
package org.hibernate.test.instrument.cases;
+import junit.framework.Assert;
+
+import org.hibernate.Hibernate;
import org.hibernate.Session;
import org.hibernate.Transaction;
-import org.hibernate.Hibernate;
-import org.hibernate.test.instrument.domain.Owner;
import org.hibernate.test.instrument.domain.Document;
import org.hibernate.test.instrument.domain.Folder;
-import org.hibernate.test.instrument.cases.AbstractExecutable;
-import junit.framework.Assert;
+import org.hibernate.test.instrument.domain.Owner;
/**
* @author Steve Ebersole
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/instrument/cases/TestManyToOneProxyExecutable.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/instrument/cases/TestManyToOneProxyExecutable.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/instrument/cases/TestManyToOneProxyExecutable.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,10 +1,11 @@
package org.hibernate.test.instrument.cases;
+import junit.framework.Assert;
+
+import org.hibernate.Hibernate;
import org.hibernate.Session;
import org.hibernate.Transaction;
-import org.hibernate.Hibernate;
import org.hibernate.test.instrument.domain.Entity;
-import junit.framework.Assert;
/**
*
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/instrument/cases/TestSharedPKOneToOneExecutable.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/instrument/cases/TestSharedPKOneToOneExecutable.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/instrument/cases/TestSharedPKOneToOneExecutable.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,12 +1,13 @@
package org.hibernate.test.instrument.cases;
+import junit.framework.Assert;
+
+import org.hibernate.Hibernate;
import org.hibernate.Session;
import org.hibernate.Transaction;
-import org.hibernate.Hibernate;
import org.hibernate.test.instrument.domain.EntityWithOneToOnes;
+import org.hibernate.test.instrument.domain.OneToOneNoProxy;
import org.hibernate.test.instrument.domain.OneToOneProxy;
-import org.hibernate.test.instrument.domain.OneToOneNoProxy;
-import junit.framework.Assert;
/**
*
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/instrument/domain/CustomBlobType.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/instrument/domain/CustomBlobType.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/instrument/domain/CustomBlobType.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -7,8 +7,8 @@
import java.sql.Types;
import java.util.Arrays;
+import org.hibernate.Hibernate;
import org.hibernate.HibernateException;
-import org.hibernate.Hibernate;
import org.hibernate.usertype.UserType;
/**
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/instrument/runtime/CGLIBInstrumentationTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/instrument/runtime/CGLIBInstrumentationTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/instrument/runtime/CGLIBInstrumentationTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,10 +1,11 @@
package org.hibernate.test.instrument.runtime;
-import org.hibernate.bytecode.BytecodeProvider;
-import org.hibernate.bytecode.cglib.BytecodeProviderImpl;
import junit.framework.Test;
import junit.framework.TestSuite;
+import org.hibernate.bytecode.BytecodeProvider;
+import org.hibernate.bytecode.cglib.BytecodeProviderImpl;
+
/**
* @author Steve Ebersole
*/
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/instrument/runtime/JavassistInstrumentationTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/instrument/runtime/JavassistInstrumentationTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/instrument/runtime/JavassistInstrumentationTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,11 +1,12 @@
//$Id: $
package org.hibernate.test.instrument.runtime;
-import org.hibernate.bytecode.BytecodeProvider;
-import org.hibernate.bytecode.javassist.BytecodeProviderImpl;
import junit.framework.Test;
import junit.framework.TestSuite;
+import org.hibernate.bytecode.BytecodeProvider;
+import org.hibernate.bytecode.javassist.BytecodeProviderImpl;
+
/**
* @author Steve Ebersole
*/
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/interfaceproxy/DocumentInterceptor.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/interfaceproxy/DocumentInterceptor.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/interfaceproxy/DocumentInterceptor.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -6,9 +6,9 @@
import java.util.Iterator;
import org.hibernate.CallbackException;
+import org.hibernate.EntityMode;
import org.hibernate.Interceptor;
import org.hibernate.Transaction;
-import org.hibernate.EntityMode;
import org.hibernate.type.Type;
/**
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/join/OptionalJoinTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/join/OptionalJoinTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/join/OptionalJoinTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -4,15 +4,15 @@
/**
* @author Chris Jones and Gail Badner
*/
+import java.util.List;
+
+import junit.framework.Test;
+
+import org.hibernate.Session;
+import org.hibernate.Transaction;
import org.hibernate.junit.functional.FunctionalTestCase;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
-import org.hibernate.Session;
-import org.hibernate.Transaction;
-import junit.framework.Test;
-import java.sql.ResultSet;
-import java.util.List;
-
public class OptionalJoinTest extends FunctionalTestCase {
public OptionalJoinTest(String name) {
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/jpa/AbstractJPATest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/jpa/AbstractJPATest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/jpa/AbstractJPATest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,22 +1,22 @@
package org.hibernate.test.jpa;
+import java.io.Serializable;
+
import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment;
-import org.hibernate.proxy.EntityNotFoundDelegate;
-import org.hibernate.event.def.DefaultPersistEventListener;
-import org.hibernate.event.def.DefaultAutoFlushEventListener;
-import org.hibernate.event.def.DefaultFlushEventListener;
-import org.hibernate.event.def.DefaultFlushEntityEventListener;
+import org.hibernate.engine.CascadingAction;
import org.hibernate.event.AutoFlushEventListener;
+import org.hibernate.event.FlushEntityEventListener;
import org.hibernate.event.FlushEventListener;
import org.hibernate.event.PersistEventListener;
-import org.hibernate.event.FlushEntityEventListener;
-import org.hibernate.engine.CascadingAction;
+import org.hibernate.event.def.DefaultAutoFlushEventListener;
+import org.hibernate.event.def.DefaultFlushEntityEventListener;
+import org.hibernate.event.def.DefaultFlushEventListener;
+import org.hibernate.event.def.DefaultPersistEventListener;
+import org.hibernate.junit.functional.FunctionalTestCase;
+import org.hibernate.proxy.EntityNotFoundDelegate;
import org.hibernate.util.IdentityMap;
-import org.hibernate.junit.functional.FunctionalTestCase;
-import java.io.Serializable;
-
/**
* An abstract test for all JPA spec related tests.
*
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/jpa/Item.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/jpa/Item.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/jpa/Item.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,7 +1,7 @@
package org.hibernate.test.jpa;
+import java.util.HashSet;
import java.util.Set;
-import java.util.HashSet;
/**
* @author Steve Ebersole
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/jpa/cascade/CascadeTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/jpa/cascade/CascadeTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/jpa/cascade/CascadeTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,19 +1,13 @@
package org.hibernate.test.jpa.cascade;
-import org.hibernate.test.jpa.AbstractJPATest;
+import junit.framework.Test;
+
import org.hibernate.Session;
import org.hibernate.TransientObjectException;
-import org.hibernate.EntityMode;
-import org.hibernate.HibernateException;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
-import org.hibernate.engine.Status;
-import org.hibernate.persister.entity.EntityPersister;
-import org.hibernate.event.FlushEntityEventListener;
-import org.hibernate.event.FlushEntityEvent;
-import org.hibernate.cfg.Configuration;
+import org.hibernate.test.jpa.AbstractJPATest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import junit.framework.Test;
/**
* According to the JPA spec, persist()ing an entity should throw an exception
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/jpa/fetch/Person.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/jpa/fetch/Person.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/jpa/fetch/Person.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,9 +1,9 @@
package org.hibernate.test.jpa.fetch;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
-import java.util.ArrayList;
/**
* Copied over from annotations test suite...
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/keymanytoone/bidir/component/Customer.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/keymanytoone/bidir/component/Customer.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/keymanytoone/bidir/component/Customer.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,7 +1,7 @@
package org.hibernate.test.keymanytoone.bidir.component;
+import java.util.ArrayList;
import java.util.Collection;
-import java.util.ArrayList;
/**
* {@inheritDoc}
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/keymanytoone/bidir/component/Order.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/keymanytoone/bidir/component/Order.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/keymanytoone/bidir/component/Order.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,8 +1,8 @@
package org.hibernate.test.keymanytoone.bidir.component;
import java.io.Serializable;
+import java.util.HashSet;
import java.util.Set;
-import java.util.HashSet;
/**
* {@inheritDoc}
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/keymanytoone/bidir/embedded/Customer.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/keymanytoone/bidir/embedded/Customer.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/keymanytoone/bidir/embedded/Customer.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,7 +1,7 @@
package org.hibernate.test.keymanytoone.bidir.embedded;
+import java.util.ArrayList;
import java.util.Collection;
-import java.util.ArrayList;
/**
* {@inheritDoc}
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/keymanytoone/bidir/embedded/Order.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/keymanytoone/bidir/embedded/Order.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/keymanytoone/bidir/embedded/Order.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,8 +1,8 @@
package org.hibernate.test.keymanytoone.bidir.embedded;
+import java.io.Serializable;
+import java.util.HashSet;
import java.util.Set;
-import java.util.HashSet;
-import java.io.Serializable;
/**
* {@inheritDoc}
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/legacy/ABCTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/legacy/ABCTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/legacy/ABCTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -4,10 +4,10 @@
import java.util.List;
import junit.framework.Test;
-import junit.framework.TestSuite;
import junit.textui.TestRunner;
+
+import org.hibernate.Transaction;
import org.hibernate.classic.Session;
-import org.hibernate.Transaction;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/legacy/CacheTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/legacy/CacheTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/legacy/CacheTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -7,8 +7,8 @@
import org.hibernate.cache.Cache;
import org.hibernate.cache.CacheConcurrencyStrategy;
import org.hibernate.cache.CacheProvider;
+import org.hibernate.cache.HashtableCacheProvider;
import org.hibernate.cache.ReadWriteCache;
-import org.hibernate.cache.HashtableCacheProvider;
import org.hibernate.cache.access.SoftLock;
import org.hibernate.junit.UnitTestCase;
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/legacy/CustomPersister.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/legacy/CustomPersister.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/legacy/CustomPersister.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -2,17 +2,15 @@
package org.hibernate.test.legacy;
import java.io.Serializable;
+import java.util.Comparator;
import java.util.Hashtable;
import java.util.Map;
-import java.util.Comparator;
import org.hibernate.EntityMode;
import org.hibernate.Hibernate;
import org.hibernate.HibernateException;
import org.hibernate.LockMode;
import org.hibernate.MappingException;
-import org.hibernate.tuple.entity.EntityMetamodel;
-import org.hibernate.cache.CacheConcurrencyStrategy;
import org.hibernate.cache.access.EntityRegionAccessStrategy;
import org.hibernate.cache.entry.CacheEntryStructure;
import org.hibernate.cache.entry.UnstructuredCacheEntry;
@@ -33,6 +31,7 @@
import org.hibernate.persister.entity.EntityPersister;
import org.hibernate.sql.QuerySelect;
import org.hibernate.sql.Select;
+import org.hibernate.tuple.entity.EntityMetamodel;
import org.hibernate.type.Type;
import org.hibernate.type.VersionType;
import org.hibernate.util.EqualsHelper;
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/legacy/CustomSQLTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/legacy/CustomSQLTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/legacy/CustomSQLTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -2,19 +2,17 @@
package org.hibernate.test.legacy;
import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
import junit.framework.Test;
import org.hibernate.HibernateException;
-import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
import org.hibernate.classic.Session;
import org.hibernate.dialect.DB2Dialect;
import org.hibernate.dialect.MySQLDialect;
import org.hibernate.dialect.SQLServerDialect;
import org.hibernate.dialect.SybaseASE15Dialect;
import org.hibernate.dialect.SybaseDialect;
+import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
/**
* @author MAX
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/legacy/FooBarTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/legacy/FooBarTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/legacy/FooBarTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -34,7 +34,6 @@
import org.hibernate.QueryException;
import org.hibernate.ScrollableResults;
import org.hibernate.Transaction;
-import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment;
import org.hibernate.classic.Session;
import org.hibernate.connection.ConnectionProvider;
@@ -45,14 +44,11 @@
import org.hibernate.criterion.Restrictions;
import org.hibernate.dialect.DB2Dialect;
import org.hibernate.dialect.DerbyDialect;
-import org.hibernate.dialect.Dialect;
import org.hibernate.dialect.HSQLDialect;
import org.hibernate.dialect.InterbaseDialect;
import org.hibernate.dialect.MckoiDialect;
import org.hibernate.dialect.MySQLDialect;
import org.hibernate.dialect.Oracle8iDialect;
-//import org.hibernate.dialect.Oracle9Dialect;
-//import org.hibernate.dialect.OracleDialect;
import org.hibernate.dialect.PointbaseDialect;
import org.hibernate.dialect.PostgreSQLDialect;
import org.hibernate.dialect.SAPDBDialect;
@@ -62,7 +58,6 @@
import org.hibernate.dialect.TimesTenDialect;
import org.hibernate.engine.SessionFactoryImplementor;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
-//import org.hibernate.mapping.RootClass;
import org.hibernate.proxy.HibernateProxy;
import org.hibernate.type.Type;
import org.hibernate.util.JoinedIterator;
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/legacy/LegacyTestCase.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/legacy/LegacyTestCase.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/legacy/LegacyTestCase.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -2,10 +2,10 @@
import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment;
+import org.hibernate.dialect.Dialect;
import org.hibernate.hql.classic.ClassicQueryTranslatorFactory;
+import org.hibernate.junit.functional.FunctionalTestCase;
import org.hibernate.util.StringHelper;
-import org.hibernate.junit.functional.FunctionalTestCase;
-import org.hibernate.dialect.Dialect;
/**
* @author Steve Ebersole
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/legacy/NonReflectiveBinderTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/legacy/NonReflectiveBinderTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/legacy/NonReflectiveBinderTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -8,13 +8,13 @@
import junit.framework.TestSuite;
import org.hibernate.cfg.Configuration;
+import org.hibernate.junit.UnitTestCase;
import org.hibernate.mapping.Bag;
import org.hibernate.mapping.Collection;
import org.hibernate.mapping.Component;
import org.hibernate.mapping.MetaAttribute;
import org.hibernate.mapping.PersistentClass;
import org.hibernate.mapping.Property;
-import org.hibernate.junit.UnitTestCase;
public class NonReflectiveBinderTest extends UnitTestCase {
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/legacy/SQLFunctionsTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/legacy/SQLFunctionsTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/legacy/SQLFunctionsTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -10,8 +10,6 @@
import java.util.Map;
import junit.framework.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.hibernate.Hibernate;
import org.hibernate.Query;
@@ -23,15 +21,17 @@
import org.hibernate.dialect.InterbaseDialect;
import org.hibernate.dialect.MckoiDialect;
import org.hibernate.dialect.MySQLDialect;
-import org.hibernate.dialect.SybaseDialect;
+import org.hibernate.dialect.Oracle9iDialect;
+import org.hibernate.dialect.SQLServerDialect;
import org.hibernate.dialect.Sybase11Dialect;
import org.hibernate.dialect.SybaseASE15Dialect;
import org.hibernate.dialect.SybaseAnywhereDialect;
+import org.hibernate.dialect.SybaseDialect;
import org.hibernate.dialect.TimesTenDialect;
-import org.hibernate.dialect.SQLServerDialect;
-import org.hibernate.dialect.Oracle9iDialect;
import org.hibernate.dialect.function.SQLFunction;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class SQLFunctionsTest extends LegacyTestCase {
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/lob/LobHolder.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/lob/LobHolder.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/lob/LobHolder.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,8 +1,8 @@
package org.hibernate.test.lob;
import java.io.Serializable;
+import java.sql.Blob;
import java.sql.Clob;
-import java.sql.Blob;
/**
* An entity containing all kinds of good LOB-type data...
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/lob/SerializableTypeTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/lob/SerializableTypeTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/lob/SerializableTypeTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -4,11 +4,10 @@
import junit.framework.Test;
import org.hibernate.Session;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.dialect.SybaseDialect;
import org.hibernate.dialect.Sybase11Dialect;
import org.hibernate.dialect.SybaseASE15Dialect;
import org.hibernate.dialect.SybaseAnywhereDialect;
+import org.hibernate.dialect.SybaseDialect;
import org.hibernate.junit.functional.FunctionalTestCase;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/manytomany/ordered/Group.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/manytomany/ordered/Group.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/manytomany/ordered/Group.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,8 +1,8 @@
package org.hibernate.test.manytomany.ordered;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.List;
-import java.util.ArrayList;
public class Group implements Serializable {
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/manytomany/ordered/User.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/manytomany/ordered/User.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/manytomany/ordered/User.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,8 +1,8 @@
package org.hibernate.test.manytomany.ordered;
import java.io.Serializable;
+import java.util.HashSet;
import java.util.Set;
-import java.util.HashSet;
public class User implements Serializable {
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/manytomanyassociationclass/compositeid/ManyToManyAssociationClassCompositeIdTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/manytomanyassociationclass/compositeid/ManyToManyAssociationClassCompositeIdTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/manytomanyassociationclass/compositeid/ManyToManyAssociationClassCompositeIdTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -26,9 +26,9 @@
import junit.framework.Test;
+import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
import org.hibernate.test.manytomanyassociationclass.AbstractManyToManyAssociationClassTest;
import org.hibernate.test.manytomanyassociationclass.Membership;
-import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
/**
* Tests on many-to-many association using an association class with a composite ID containing
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/manytomanyassociationclass/surrogateid/assigned/ManyToManyAssociationClassAssignedIdTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/manytomanyassociationclass/surrogateid/assigned/ManyToManyAssociationClassAssignedIdTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/manytomanyassociationclass/surrogateid/assigned/ManyToManyAssociationClassAssignedIdTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -26,9 +26,9 @@
import junit.framework.Test;
+import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
import org.hibernate.test.manytomanyassociationclass.AbstractManyToManyAssociationClassTest;
import org.hibernate.test.manytomanyassociationclass.Membership;
-import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
/**
* Tests on many-to-many association using an association class with a surrogate ID that is assigned.
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/manytomanyassociationclass/surrogateid/generated/ManyToManyAssociationClassGeneratedIdTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/manytomanyassociationclass/surrogateid/generated/ManyToManyAssociationClassGeneratedIdTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/manytomanyassociationclass/surrogateid/generated/ManyToManyAssociationClassGeneratedIdTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -28,11 +28,11 @@
import junit.framework.Test;
+import org.hibernate.Session;
import org.hibernate.exception.ConstraintViolationException;
+import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
import org.hibernate.test.manytomanyassociationclass.AbstractManyToManyAssociationClassTest;
import org.hibernate.test.manytomanyassociationclass.Membership;
-import org.hibernate.Session;
-import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
/**
* Tests on many-to-many association using an association class with a surrogate ID that is generated.
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/mapping/PersistentClassVisitorTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/mapping/PersistentClassVisitorTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/mapping/PersistentClassVisitorTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -7,13 +7,13 @@
import junit.framework.Test;
import junit.framework.TestSuite;
+import org.hibernate.junit.UnitTestCase;
import org.hibernate.mapping.JoinedSubclass;
import org.hibernate.mapping.PersistentClassVisitor;
import org.hibernate.mapping.RootClass;
import org.hibernate.mapping.SingleTableSubclass;
import org.hibernate.mapping.Subclass;
import org.hibernate.mapping.UnionSubclass;
-import org.hibernate.junit.UnitTestCase;
/**
* @author max
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/mapping/ValueVisitorTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/mapping/ValueVisitorTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/mapping/ValueVisitorTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -7,6 +7,7 @@
import junit.framework.Test;
import junit.framework.TestSuite;
+import org.hibernate.junit.UnitTestCase;
import org.hibernate.mapping.Any;
import org.hibernate.mapping.Array;
import org.hibernate.mapping.Bag;
@@ -24,7 +25,6 @@
import org.hibernate.mapping.SimpleValue;
import org.hibernate.mapping.Table;
import org.hibernate.mapping.ValueVisitor;
-import org.hibernate.junit.UnitTestCase;
/**
* @author max
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/mappingexception/User.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/mappingexception/User.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/mappingexception/User.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,8 +1,6 @@
// $Id: User.java 4746 2004-11-11 20:57:28Z steveebersole $
package org.hibernate.test.mappingexception;
-import java.util.Set;
-import java.util.HashSet;
/**
*
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/naturalid/immutable/ImmutableNaturalIdTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/naturalid/immutable/ImmutableNaturalIdTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/naturalid/immutable/ImmutableNaturalIdTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -17,9 +17,9 @@
import junit.framework.Test;
+import org.hibernate.HibernateException;
import org.hibernate.Session;
import org.hibernate.Transaction;
-import org.hibernate.HibernateException;
import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment;
import org.hibernate.criterion.Restrictions;
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/ondelete/OnDeleteTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/ondelete/OnDeleteTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/ondelete/OnDeleteTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -9,8 +9,6 @@
import org.hibernate.Transaction;
import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment;
-import org.hibernate.dialect.MySQLDialect;
-import org.hibernate.dialect.MySQLInnoDBDialect;
import org.hibernate.junit.functional.FunctionalTestCase;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
import org.hibernate.stat.Statistics;
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/onetoone/optional/OptionalOneToOneTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/onetoone/optional/OptionalOneToOneTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/onetoone/optional/OptionalOneToOneTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -2,11 +2,11 @@
import junit.framework.Test;
+import org.hibernate.Session;
+import org.hibernate.cfg.Configuration;
+import org.hibernate.cfg.Environment;
import org.hibernate.junit.functional.FunctionalTestCase;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
-import org.hibernate.cfg.Configuration;
-import org.hibernate.cfg.Environment;
-import org.hibernate.Session;
/**
* @author Gavin King
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/ops/Competition.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/ops/Competition.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/ops/Competition.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,8 +1,8 @@
//$Id: $
package org.hibernate.test.ops;
+import java.util.ArrayList;
import java.util.List;
-import java.util.ArrayList;
/**
* @author Emmanuel Bernard
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/ops/CreateTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/ops/CreateTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/ops/CreateTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -9,8 +9,8 @@
import org.hibernate.PersistentObjectException;
import org.hibernate.Session;
import org.hibernate.Transaction;
+import org.hibernate.exception.ConstraintViolationException;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
-import org.hibernate.exception.ConstraintViolationException;
/**
* @author Gavin King
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/ops/Employee.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/ops/Employee.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/ops/Employee.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,8 +1,8 @@
//$Id: Employee.java 5686 2005-02-12 07:27:32Z steveebersole $
package org.hibernate.test.ops;
+import java.io.Serializable;
import java.util.Collection;
-import java.io.Serializable;
/**
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/ops/Employer.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/ops/Employer.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/ops/Employer.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,8 +1,8 @@
//$Id: Employer.java 8670 2005-11-25 17:36:29Z epbernard $
package org.hibernate.test.ops;
+import java.io.Serializable;
import java.util.Collection;
-import java.io.Serializable;
/**
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/ops/GetLoadTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/ops/GetLoadTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/ops/GetLoadTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -6,10 +6,10 @@
import org.hibernate.Hibernate;
import org.hibernate.Session;
import org.hibernate.Transaction;
+import org.hibernate.cfg.Configuration;
+import org.hibernate.cfg.Environment;
import org.hibernate.junit.functional.FunctionalTestCase;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
-import org.hibernate.cfg.Configuration;
-import org.hibernate.cfg.Environment;
/**
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/ops/SaveOrUpdateTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/ops/SaveOrUpdateTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/ops/SaveOrUpdateTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -6,12 +6,12 @@
import org.hibernate.Hibernate;
import org.hibernate.Session;
import org.hibernate.Transaction;
-import org.hibernate.junit.functional.FunctionalTestCase;
-import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
-import org.hibernate.intercept.FieldInterceptionHelper;
import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment;
import org.hibernate.criterion.Projections;
+import org.hibernate.intercept.FieldInterceptionHelper;
+import org.hibernate.junit.functional.FunctionalTestCase;
+import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
/**
* @author Gavin King
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/ops/VersionedEntity.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/ops/VersionedEntity.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/ops/VersionedEntity.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,7 +1,7 @@
package org.hibernate.test.ops;
+import java.util.HashSet;
import java.util.Set;
-import java.util.HashSet;
/**
* VersionedEntity
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/pagination/PaginationTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/pagination/PaginationTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/pagination/PaginationTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -28,10 +28,10 @@
import junit.framework.Test;
+import org.hibernate.Criteria;
+import org.hibernate.Query;
+import org.hibernate.SQLQuery;
import org.hibernate.Session;
-import org.hibernate.SQLQuery;
-import org.hibernate.Query;
-import org.hibernate.Criteria;
import org.hibernate.criterion.Order;
import org.hibernate.junit.functional.FunctionalTestCase;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/propertyref/basic/Person.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/propertyref/basic/Person.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/propertyref/basic/Person.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,10 +1,10 @@
//$Id: Person.java 10396 2006-09-01 08:48:02 -0500 (Fri, 01 Sep 2006) steve.ebersole(a)jboss.com $
package org.hibernate.test.propertyref.basic;
+import java.util.ArrayList;
import java.util.HashSet;
+import java.util.List;
import java.util.Set;
-import java.util.List;
-import java.util.ArrayList;
/**
* @author gavin
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/proxy/Container.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/proxy/Container.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/proxy/Container.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,8 +1,8 @@
package org.hibernate.test.proxy;
+import java.io.Serializable;
+import java.util.HashSet;
import java.util.Set;
-import java.util.HashSet;
-import java.io.Serializable;
/**
* @author Steve Ebersole
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/querycache/Item.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/querycache/Item.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/querycache/Item.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,8 +1,6 @@
//$Id: Item.java 9587 2006-03-09 21:38:26Z steve.ebersole(a)jboss.com $
package org.hibernate.test.querycache;
-import java.util.Set;
-import java.util.HashSet;
/**
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/readonly/ReadOnlyVersionedNodesTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/readonly/ReadOnlyVersionedNodesTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/readonly/ReadOnlyVersionedNodesTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -28,10 +28,10 @@
import junit.framework.Test;
import org.hibernate.Session;
+import org.hibernate.cfg.Configuration;
+import org.hibernate.cfg.Environment;
import org.hibernate.junit.functional.FunctionalTestCase;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
-import org.hibernate.cfg.Configuration;
-import org.hibernate.cfg.Environment;
/**
* @author Gail Badner
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/readonly/VersionedNode.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/readonly/VersionedNode.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/readonly/VersionedNode.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -25,8 +25,8 @@
*/
package org.hibernate.test.readonly;
-import java.util.Set;
-import java.util.HashSet;
+import java.util.HashSet;
+import java.util.Set;
/**
* VersionedNode
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/reattachment/CollectionReattachmentTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/reattachment/CollectionReattachmentTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/reattachment/CollectionReattachmentTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -2,9 +2,9 @@
import junit.framework.Test;
+import org.hibernate.Session;
import org.hibernate.junit.functional.FunctionalTestCase;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
-import org.hibernate.Session;
/**
* Test of collection reattachment semantics
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/reattachment/Parent.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/reattachment/Parent.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/reattachment/Parent.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,7 +1,7 @@
package org.hibernate.test.reattachment;
+import java.util.HashSet;
import java.util.Set;
-import java.util.HashSet;
/**
* Parent entity
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/reattachment/ProxyReattachmentTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/reattachment/ProxyReattachmentTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/reattachment/ProxyReattachmentTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,14 +1,14 @@
package org.hibernate.test.reattachment;
+import java.util.HashSet;
+import java.util.Iterator;
import java.util.Set;
-import java.util.Iterator;
-import java.util.HashSet;
import junit.framework.Test;
+import org.hibernate.Session;
import org.hibernate.junit.functional.FunctionalTestCase;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
-import org.hibernate.Session;
/**
* Test of proxy reattachment semantics
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/rowid/RowIdTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/rowid/RowIdTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/rowid/RowIdTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -2,18 +2,18 @@
package org.hibernate.test.rowid;
import java.math.BigDecimal;
+import java.sql.SQLException;
import java.sql.Statement;
-import java.sql.SQLException;
import junit.framework.Test;
import org.hibernate.Session;
import org.hibernate.Transaction;
-import org.hibernate.engine.SessionFactoryImplementor;
import org.hibernate.dialect.Dialect;
import org.hibernate.dialect.Oracle9iDialect;
+import org.hibernate.engine.SessionFactoryImplementor;
+import org.hibernate.junit.functional.DatabaseSpecificFunctionalTestCase;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
-import org.hibernate.junit.functional.DatabaseSpecificFunctionalTestCase;
/**
* @author Gavin King
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/sql/hand/Group.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/sql/hand/Group.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/sql/hand/Group.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -21,8 +21,8 @@
*/
package org.hibernate.test.sql.hand;
+import java.util.ArrayList;
import java.util.List;
-import java.util.ArrayList;
/**
* TODO : javadoc
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/sql/hand/MonetaryAmount.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/sql/hand/MonetaryAmount.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/sql/hand/MonetaryAmount.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,8 +1,8 @@
package org.hibernate.test.sql.hand;
+import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Currency;
-import java.io.Serializable;
/**
* Represents a monetary amount as value and currency.
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/sql/hand/custom/CustomSQLTestSupport.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/sql/hand/custom/CustomSQLTestSupport.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/sql/hand/custom/CustomSQLTestSupport.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -7,10 +7,10 @@
import org.hibernate.LockMode;
import org.hibernate.Session;
import org.hibernate.Transaction;
+import org.hibernate.junit.functional.DatabaseSpecificFunctionalTestCase;
import org.hibernate.test.sql.hand.Employment;
import org.hibernate.test.sql.hand.Organization;
import org.hibernate.test.sql.hand.Person;
-import org.hibernate.junit.functional.DatabaseSpecificFunctionalTestCase;
/**
* Abstract test case defining tests for the support for user-supplied (aka
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/sql/hand/identity/CustomInsertSQLWithIdentityColumnTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/sql/hand/identity/CustomInsertSQLWithIdentityColumnTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/sql/hand/identity/CustomInsertSQLWithIdentityColumnTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,11 +1,12 @@
package org.hibernate.test.sql.hand.identity;
import junit.framework.Test;
+
+import org.hibernate.JDBCException;
+import org.hibernate.Session;
+import org.hibernate.dialect.Dialect;
+import org.hibernate.junit.functional.DatabaseSpecificFunctionalTestCase;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
-import org.hibernate.junit.functional.DatabaseSpecificFunctionalTestCase;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.Session;
-import org.hibernate.JDBCException;
import org.hibernate.test.sql.hand.Organization;
/**
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/sql/hand/query/NativeSQLQueriesTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/sql/hand/query/NativeSQLQueriesTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/sql/hand/query/NativeSQLQueriesTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -3,10 +3,10 @@
import java.io.Serializable;
import java.math.BigDecimal;
import java.math.BigInteger;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.HashMap;
import junit.framework.Test;
@@ -15,22 +15,22 @@
import org.hibernate.Query;
import org.hibernate.Session;
import org.hibernate.Transaction;
+import org.hibernate.cfg.Configuration;
+import org.hibernate.cfg.Environment;
+import org.hibernate.junit.functional.FunctionalTestCase;
+import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
+import org.hibernate.test.sql.hand.Dimension;
+import org.hibernate.test.sql.hand.Employment;
+import org.hibernate.test.sql.hand.Group;
+import org.hibernate.test.sql.hand.Order;
import org.hibernate.test.sql.hand.Organization;
import org.hibernate.test.sql.hand.Person;
-import org.hibernate.test.sql.hand.Employment;
import org.hibernate.test.sql.hand.Product;
-import org.hibernate.test.sql.hand.Order;
-import org.hibernate.test.sql.hand.Dimension;
import org.hibernate.test.sql.hand.SpaceShip;
import org.hibernate.test.sql.hand.Speech;
-import org.hibernate.test.sql.hand.Group;
-import org.hibernate.cfg.Configuration;
-import org.hibernate.cfg.Environment;
-import org.hibernate.junit.functional.FunctionalTestCase;
-import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
+import org.hibernate.transform.BasicTransformerAdapter;
import org.hibernate.transform.DistinctRootEntityResultTransformer;
import org.hibernate.transform.Transformers;
-import org.hibernate.transform.BasicTransformerAdapter;
/**
* Tests of various features of native SQL queries.
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/stateless/fetching/StatelessSessionFetchingTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/stateless/fetching/StatelessSessionFetchingTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/stateless/fetching/StatelessSessionFetchingTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -25,15 +25,14 @@
import junit.framework.Test;
-import org.hibernate.junit.functional.FunctionalTestCase;
-import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
+import org.hibernate.Hibernate;
+import org.hibernate.Session;
+import org.hibernate.StatelessSession;
import org.hibernate.cfg.Configuration;
-import org.hibernate.cfg.ImprovedNamingStrategy;
import org.hibernate.cfg.DefaultNamingStrategy;
+import org.hibernate.junit.functional.FunctionalTestCase;
+import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
import org.hibernate.util.StringHelper;
-import org.hibernate.Session;
-import org.hibernate.StatelessSession;
-import org.hibernate.Hibernate;
/**
* TODO : javadoc
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/subclassfilter/Employee.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/subclassfilter/Employee.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/subclassfilter/Employee.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,8 +1,8 @@
// $Id: Employee.java 5899 2005-02-24 20:08:04Z steveebersole $
package org.hibernate.test.subclassfilter;
+import java.util.HashSet;
import java.util.Set;
-import java.util.HashSet;
/**
* Implementation of Employee.
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/tm/CMTTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/tm/CMTTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/tm/CMTTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -5,6 +5,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+
import javax.transaction.Transaction;
import junit.framework.Test;
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/typeparameters/DefaultValueIntegerType.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/typeparameters/DefaultValueIntegerType.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/typeparameters/DefaultValueIntegerType.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -7,10 +7,10 @@
import java.sql.Types;
import java.util.Properties;
-import org.slf4j.LoggerFactory;
import org.hibernate.HibernateException;
import org.hibernate.usertype.ParameterizedType;
import org.hibernate.usertype.UserType;
+import org.slf4j.LoggerFactory;
/**
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/usercollection/parameterized/DefaultableListType.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/usercollection/parameterized/DefaultableListType.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/usercollection/parameterized/DefaultableListType.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,16 +1,16 @@
package org.hibernate.test.usercollection.parameterized;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import java.util.Properties;
-import java.util.List;
-import org.hibernate.usertype.UserCollectionType;
-import org.hibernate.usertype.ParameterizedType;
+import org.hibernate.EntityMode;
import org.hibernate.collection.PersistentCollection;
import org.hibernate.engine.SessionImplementor;
import org.hibernate.persister.collection.CollectionPersister;
-import org.hibernate.EntityMode;
+import org.hibernate.usertype.ParameterizedType;
+import org.hibernate.usertype.UserCollectionType;
/**
* Our Hibernate type-system extension for defining our specialized collection
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/usercollection/parameterized/Entity.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/usercollection/parameterized/Entity.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/usercollection/parameterized/Entity.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,7 +1,7 @@
package org.hibernate.test.usercollection.parameterized;
+import java.util.ArrayList;
import java.util.List;
-import java.util.ArrayList;
/**
* Our test entity
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/usercollection/parameterized/ParameterizedUserCollectionTypeTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/usercollection/parameterized/ParameterizedUserCollectionTypeTest.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/usercollection/parameterized/ParameterizedUserCollectionTypeTest.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -2,11 +2,11 @@
import junit.framework.Test;
+import org.hibernate.Hibernate;
+import org.hibernate.Session;
+import org.hibernate.Transaction;
import org.hibernate.junit.functional.FunctionalTestCase;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
-import org.hibernate.Session;
-import org.hibernate.Transaction;
-import org.hibernate.Hibernate;
/**
* Tes for parameterized user collection types.
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/util/dtd/Parent.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/util/dtd/Parent.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/util/dtd/Parent.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,8 +1,8 @@
package org.hibernate.test.util.dtd;
-import java.util.Set;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.Set;
/**
* The Parent class.
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/version/db/User.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/version/db/User.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/version/db/User.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,8 +1,8 @@
// $Id: User.java 7736 2005-08-03 20:03:34Z steveebersole $
package org.hibernate.test.version.db;
+import java.sql.Timestamp;
import java.util.Set;
-import java.sql.Timestamp;
/**
* Implementation of User.
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/version/sybase/User.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/version/sybase/User.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/version/sybase/User.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -2,7 +2,6 @@
package org.hibernate.test.version.sybase;
import java.util.Set;
-import java.sql.Timestamp;
/**
* Implementation of User.
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/where/NumericTrueFalseType.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/where/NumericTrueFalseType.java 2010-03-23 15:22:59 UTC (rev 19090)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/where/NumericTrueFalseType.java 2010-03-23 20:59:05 UTC (rev 19091)
@@ -1,12 +1,12 @@
package org.hibernate.test.where;
+import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
-import java.sql.PreparedStatement;
import java.sql.Types;
+import org.hibernate.dialect.Dialect;
import org.hibernate.type.BooleanType;
-import org.hibernate.dialect.Dialect;
/**
* Maps int db values to boolean java values. Zero is considered false; any
14 years, 1 month
- 1
- 0
Hibernate SVN: r19090 - in validator/trunk: hibernate-validator and 15 other directories.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2010-03-23 11:22:59 -0400 (Tue, 23 Mar 2010)
New Revision: 19090
Added:
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/NotBlank.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/NotBlankValidator.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/BlankValidatorTest.java
Modified:
validator/trunk/hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/testmodel/ValidationUsingAtValidAnnotation.java
validator/trunk/hibernate-validator/pom.xml
validator/trunk/hibernate-validator/src/main/docbook/en-US/modules/usingvalidator.xml
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/NotEmpty.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/URL.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/LuhnValidator.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/URLValidator.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/Constants.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/resourceloading/AggregateResourceBundleLocator.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/resourceloading/CachingResourceBundleLocator.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/resourceloading/DelegatingResourceBundleLocator.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/resourceloading/PlatformResourceBundleLocator.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/resourceloading/ResourceBundleLocator.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/IteratorEnumeration.java
validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validator/ValidationMessages.properties
validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validator/ValidationMessages_de.properties
validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validator/ValidationMessages_fr.properties
validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validator/ValidationMessages_mn_MN.properties
validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validator/ValidationMessages_tr.properties
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/HibernateValidatorConfigurationTest.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/URLValidatorTest.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/messageinterpolation/MessageInterpolationWithDefaultBundleTest.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/messageinterpolation/User.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/resourceloading/AggregateBundleTest.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/resourceloading/AggregateResourceBundleLocatorTest.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/ICompetition.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/IFixture.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/InheritanceMappingsTest.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/annotation/Competition.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/annotation/Fixture.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/annotation/Game.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/annotation/GameDetail.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/annotation/PersonCompetition.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/annotation/TeamCompetition.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/xml/Competition.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/xml/Fixture.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/xml/Game.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/xml/GameDetail.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/xml/PersonCompetition.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/xml/TeamCompetition.java
validator/trunk/pom.xml
Log:
HV-301
* Added NotBlank constraint and updated documentation
* Fixed missing svn:keywords property on java files
* Changed the description in the parent pom and the hibenate-validator pom
Modified: validator/trunk/hibernate-validator/pom.xml
===================================================================
--- validator/trunk/hibernate-validator/pom.xml 2010-03-23 13:29:20 UTC (rev 19089)
+++ validator/trunk/hibernate-validator/pom.xml 2010-03-23 15:22:59 UTC (rev 19090)
@@ -11,6 +11,9 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<name>Hibernate Validator</name>
+ <description>
+ Hibernate's Bean Validation (JSR-303) reference implementation.
+ </description>
<distributionManagement>
<site>
<id>site</id>
Modified: validator/trunk/hibernate-validator/src/main/docbook/en-US/modules/usingvalidator.xml
===================================================================
--- validator/trunk/hibernate-validator/src/main/docbook/en-US/modules/usingvalidator.xml 2010-03-23 13:29:20 UTC (rev 19089)
+++ validator/trunk/hibernate-validator/src/main/docbook/en-US/modules/usingvalidator.xml 2010-03-23 15:22:59 UTC (rev 19090)
@@ -1202,14 +1202,30 @@
</row>
<row>
+ <entry>@NotBlank</entry>
+
+ <entry>no</entry>
+
+ <entry>field/property</entry>
+
+ <entry>Check that the annotated string is not null and the trimmed
+ length is greater than 0. The difference to @NotEmpty is that this
+ constraint can only be applied on strings and that trailing
+ whitespaces are ignored.</entry>
+
+ <entry>none</entry>
+ </row>
+
+ <row>
<entry>@NotEmpty</entry>
<entry>no</entry>
- <entry>field/property. Needs to be a string.</entry>
+ <entry>field/property. Supported types are String, Collection, Map
+ and arrays.</entry>
- <entry>Check if the string is not <constant>null</constant> nor
- empty.</entry>
+ <entry>Check whether is annoated element is not
+ <constant>null</constant> nor empty.</entry>
<entry>none</entry>
</row>
Copied: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/NotBlank.java (from rev 19033, validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/NotEmpty.java)
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/NotBlank.java (rev 0)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/NotBlank.java 2010-03-23 15:22:59 UTC (rev 19090)
@@ -0,0 +1,56 @@
+/*
+ * $Id:$
+ *
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and/or its affiliates, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.hibernate.validator.constraints;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+import javax.validation.Constraint;
+import javax.validation.Payload;
+import javax.validation.ReportAsSingleViolation;
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.validator.constraints.impl.NotBlankValidator;
+
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
+import static java.lang.annotation.ElementType.CONSTRUCTOR;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+/**
+ * Validate that the annotated string is not {@code null} or empty.
+ * The difference to {@code NotEmpty} is that trailing whitespaces are getting ignored.
+ *
+ * @author Hardy Ferentschik
+ */
+@Documented
+@Constraint(validatedBy = { NotBlankValidator.class })
+@Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER })
+@Retention(RUNTIME)
+@ReportAsSingleViolation
+@NotNull
+public @interface NotBlank {
+ public abstract String message() default "{org.hibernate.validator.constraints.NotBlank.message}";
+
+ public abstract Class<?>[] groups() default { };
+
+ public abstract Class<? extends Payload>[] payload() default { };
+}
\ No newline at end of file
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/NotEmpty.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/NotEmpty.java 2010-03-23 13:29:20 UTC (rev 19089)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/NotEmpty.java 2010-03-23 15:22:59 UTC (rev 19090)
@@ -33,7 +33,10 @@
import javax.validation.constraints.Size;
/**
+ * Asserts that the annotated string, collection, map or array is not {@code null} or empty.
+ *
* @author Emmanuel Bernard
+ * @author Hardy Ferentschik
*/
@Documented
@Constraint(validatedBy = { })
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/URL.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/URL.java 2010-03-23 13:29:20 UTC (rev 19089)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/URL.java 2010-03-23 15:22:59 UTC (rev 19090)
@@ -1,4 +1,4 @@
-// $Id: Length.java 17427 2009-08-27 09:47:28Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/URL.java
___________________________________________________________________
Name: svn:keywords
+ Id
Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/LuhnValidator.java
___________________________________________________________________
Name: svn:keywords
+ Id
Copied: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/NotBlankValidator.java (from rev 19033, validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForString.java)
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/NotBlankValidator.java (rev 0)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/NotBlankValidator.java 2010-03-23 15:22:59 UTC (rev 19090)
@@ -0,0 +1,52 @@
+/*
+ * $Id:$
+ *
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and/or its affiliates, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.hibernate.validator.constraints.impl;
+
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+
+import org.hibernate.validator.constraints.NotBlank;
+
+/**
+ * Check that a string's trimmed length is not empty.
+ *
+ * @author Hardy Ferentschik
+ */
+public class NotBlankValidator implements ConstraintValidator<NotBlank, String> {
+
+ public void initialize(NotBlank annotation) {
+ }
+
+ /**
+ * Checks that the trimmed string is not empty.
+ *
+ * @param s The string to validate.
+ * @param constraintValidatorContext context in which the constraint is evaluated.
+ *
+ * @return Returns <code>true</code> if the string is <code>null</code> or the length of <code>s</code> between the specified
+ * <code>min</code> and <code>max</code> values (inclusive), <code>false</code> otherwise.
+ */
+ public boolean isValid(String s, ConstraintValidatorContext constraintValidatorContext) {
+ if ( s == null ) {
+ return true;
+ }
+
+ return s.trim().length() > 0;
+ }
+}
\ No newline at end of file
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/URLValidator.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/URLValidator.java 2010-03-23 13:29:20 UTC (rev 19089)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/URLValidator.java 2010-03-23 15:22:59 UTC (rev 19090)
@@ -1,4 +1,4 @@
-// $Id: LengthValidator.java 17521 2009-09-16 12:50:41Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/URLValidator.java
___________________________________________________________________
Name: svn:keywords
+ Id
Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/Constants.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/resourceloading/AggregateResourceBundleLocator.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/resourceloading/AggregateResourceBundleLocator.java 2010-03-23 13:29:20 UTC (rev 19089)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/resourceloading/AggregateResourceBundleLocator.java 2010-03-23 15:22:59 UTC (rev 19090)
@@ -1,4 +1,4 @@
-// $Id: AggregateResourceBundleLocator.java 17620 2009-10-04 19:19:28Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2010, Red Hat, Inc. and/or its affiliates, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/resourceloading/AggregateResourceBundleLocator.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/resourceloading/CachingResourceBundleLocator.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/resourceloading/CachingResourceBundleLocator.java 2010-03-23 13:29:20 UTC (rev 19089)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/resourceloading/CachingResourceBundleLocator.java 2010-03-23 15:22:59 UTC (rev 19090)
@@ -1,4 +1,4 @@
-// $Id: CachingResourceBundleLocator.java 17620 2009-10-04 19:19:28Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2010, Red Hat, Inc. and/or its affiliates, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/resourceloading/CachingResourceBundleLocator.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/resourceloading/DelegatingResourceBundleLocator.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/resourceloading/DelegatingResourceBundleLocator.java 2010-03-23 13:29:20 UTC (rev 19089)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/resourceloading/DelegatingResourceBundleLocator.java 2010-03-23 15:22:59 UTC (rev 19090)
@@ -1,4 +1,4 @@
-// $Id: DelegatingResourceBundleLocator.java 17620 2009-10-04 19:19:28Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/resourceloading/DelegatingResourceBundleLocator.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/resourceloading/PlatformResourceBundleLocator.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/resourceloading/PlatformResourceBundleLocator.java 2010-03-23 13:29:20 UTC (rev 19089)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/resourceloading/PlatformResourceBundleLocator.java 2010-03-23 15:22:59 UTC (rev 19090)
@@ -1,4 +1,4 @@
-// $Id: PlatformResourceBundleLocator.java 17620 2009-10-04 19:19:28Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/resourceloading/PlatformResourceBundleLocator.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/resourceloading/ResourceBundleLocator.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/resourceloading/ResourceBundleLocator.java 2010-03-23 13:29:20 UTC (rev 19089)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/resourceloading/ResourceBundleLocator.java 2010-03-23 15:22:59 UTC (rev 19090)
@@ -1,4 +1,4 @@
-// $Id: ResourceBundleLocator.java 17620 2009-10-04 19:19:28Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/resourceloading/ResourceBundleLocator.java
___________________________________________________________________
Name: svn:keywords
+ Id
Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/util/IteratorEnumeration.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validator/ValidationMessages.properties
===================================================================
--- validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validator/ValidationMessages.properties 2010-03-23 13:29:20 UTC (rev 19089)
+++ validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validator/ValidationMessages.properties 2010-03-23 15:22:59 UTC (rev 19090)
@@ -1,3 +1,4 @@
+
# $Id$
javax.validation.constraints.AssertFalse.message=must be false
javax.validation.constraints.AssertTrue.message=must be true
@@ -14,6 +15,7 @@
javax.validation.constraints.Size.message=size must be between {min} and {max}
org.hibernate.validator.constraints.Email.message=not a well-formed email address
org.hibernate.validator.constraints.Length.message=length must be between {min} and {max}
+org.hibernate.validator.constraints.NotBlank.message=may not be empty
org.hibernate.validator.constraints.NotEmpty.message=may not be empty
org.hibernate.validator.constraints.Range.message=must be between {min} and {max}
org.hibernate.validator.constraints.URL.message=must be a valid URL
Modified: validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validator/ValidationMessages_de.properties
===================================================================
--- validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validator/ValidationMessages_de.properties 2010-03-23 13:29:20 UTC (rev 19089)
+++ validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validator/ValidationMessages_de.properties 2010-03-23 15:22:59 UTC (rev 19090)
@@ -1,8 +1,6 @@
# $Id$
javax.validation.constraints.NotNull.message=kann nicht null sein
javax.validation.constraints.Size.message=muss zwischen {min} und {max} liegen
-org.hibernate.validator.constraints.Length.message=muss zwischen {min} und {max} liegen
-org.hibernate.validator.constraints.NotEmpty.message=kann nicht leer sein
javax.validation.constraints.Pattern.message=muss auf Ausdruck "{regexp}" passen
javax.validation.constraints.Min.message=muss gr\u00F6ssergleich {value} sein
javax.validation.constraints.Max.message=muss kleinergleich {value} sein
@@ -15,6 +13,9 @@
javax.validation.constraints.DecimalMin.message=muss gr\u00F6ssergleich {value} sein
javax.validation.constraints.DecimalMax.message=muss kleinergleich {value} sein
org.hibernate.validator.constraints.Email.message=keine g\u00FCltige E-Mail-Adresse
+org.hibernate.validator.constraints.Length.message=muss zwischen {min} und {max} liegen
+org.hibernate.validator.constraints.NotBlank.message=kann nicht leer sein
+org.hibernate.validator.constraints.NotEmpty.message=kann nicht leer sein
org.hibernate.validator.constraints.Range.message=muss zwischen {min} und {max} liegen
org.hibernate.validator.constraints.URL.message=muss eine g\u00FCltige URL sein
org.hibernate.validator.constraints.CreditCardNumber.message=Ung\u00FCltige Kreditkartennummer
\ No newline at end of file
Modified: validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validator/ValidationMessages_fr.properties
===================================================================
--- validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validator/ValidationMessages_fr.properties 2010-03-23 13:29:20 UTC (rev 19089)
+++ validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validator/ValidationMessages_fr.properties 2010-03-23 15:22:59 UTC (rev 19090)
@@ -1,8 +1,6 @@
# $Id$
javax.validation.constraints.NotNull.message=ne peut pas \u00EAtre nul
javax.validation.constraints.Size.message=la taille doit \u00EAtre entre {min} et {max}
-org.hibernate.validator.constraints.Length.message=la taille doit \u00EAtre entre {min} et {max}
-org.hibernate.validator.constraints.NotEmpty.message=ne peut pas \u00EAtre vide
javax.validation.constraints.Pattern.message=doit suivre "{regexp}"
javax.validation.constraints.Min.message=doit \u00EAtre plus grand que {value}
javax.validation.constraints.Max.message=doit \u00EAtre plus petit que {value}
@@ -15,4 +13,7 @@
javax.validation.constraints.DecimalMin.message=doit \u00EAtre plus grand que {value}
javax.validation.constraints.DecimalMax.message=doit \u00EAtre plus petit que {value}
org.hibernate.validator.constraints.Email.message=Addresse email mal form\u00E9e
+org.hibernate.validator.constraints.Length.message=la taille doit \u00EAtre entre {min} et {max}
+org.hibernate.validator.constraints.NotBlank.message=ne peut pas \u00EAtre vide
+org.hibernate.validator.constraints.NotEmpty.message=ne peut pas \u00EAtre vide
org.hibernate.validator.constraints.Range.message=doit \u00EAtre entre {min} et {max}
\ No newline at end of file
Modified: validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validator/ValidationMessages_mn_MN.properties
===================================================================
--- validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validator/ValidationMessages_mn_MN.properties 2010-03-23 13:29:20 UTC (rev 19089)
+++ validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validator/ValidationMessages_mn_MN.properties 2010-03-23 15:22:59 UTC (rev 19090)
@@ -13,5 +13,6 @@
javax.validation.constraints.Size.message=\u0425\u044D\u043C\u0436\u044D\u044D {min}-\u0441 {max} \u0445\u043E\u043E\u0440\u043E\u043D\u0434 \u0431\u0430\u0439\u043D\u0430
org.hibernate.validator.constraints.Email.message=\u0411\u0443\u0440\u0443\u0443 \u0438-\u043C\u044D\u0439\u043B \u0445\u0430\u044F\u0433 \u0431\u0430\u0439\u043D\u0430
org.hibernate.validator.constraints.Length.message=\u0422\u044D\u043C\u0434\u044D\u0433\u0442\u0438\u0439\u043D \u0443\u0440\u0442 {min}-\u0441 {max} \u0445\u043E\u043E\u0440\u043E\u043D\u0434 \u0431\u0430\u0439\u043D\u0430
+org.hibernate.validator.constraints.NotBlank.message=\u0425\u043E\u043E\u0441\u043E\u043D \u0431\u0430\u0439\u0436 \u0431\u043E\u043B\u043E\u0445\u0433\u04AF\u0439
org.hibernate.validator.constraints.NotEmpty.message=\u0425\u043E\u043E\u0441\u043E\u043D \u0431\u0430\u0439\u0436 \u0431\u043E\u043B\u043E\u0445\u0433\u04AF\u0439
org.hibernate.validator.constraints.Range.message=\u0423\u0442\u0433\u0430 {min}-\u0441 {max} \u0445\u043E\u043E\u0440\u043E\u043D\u0434 \u0431\u0430\u0439\u043D\u0430
\ No newline at end of file
Modified: validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validator/ValidationMessages_tr.properties
===================================================================
--- validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validator/ValidationMessages_tr.properties 2010-03-23 13:29:20 UTC (rev 19089)
+++ validator/trunk/hibernate-validator/src/main/resources/org/hibernate/validator/ValidationMessages_tr.properties 2010-03-23 15:22:59 UTC (rev 19090)
@@ -12,6 +12,7 @@
javax.validation.constraints.Pattern.message='{regexp}' ile e\u015fle\u015fmeli
javax.validation.constraints.Size.message=boyut '{min}' ile '{max}' aras\u0131nda olmal\u0131
org.hibernate.validator.constraints.Length.message=uzunluk '{min}' ile '{max}' aras\u0131nda olmal\u0131
+org.hibernate.validator.constraints.NotBlank.message=bo\u015f de\u011fer olamaz
org.hibernate.validator.constraints.NotEmpty.message=bo\u015f de\u011fer olamaz
org.hibernate.validator.constraints.Email.message=d\u00fczg\u00fcn bi\u00e7imli bir e-posta adresi de\u011fil!
org.hibernate.validator.constraints.Range.message={min} ve {max} aras\u0131nda olmal\u0131d\u0131r!
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/HibernateValidatorConfigurationTest.java
___________________________________________________________________
Name: svn:keywords
+ Id
Copied: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/BlankValidatorTest.java (from rev 19033, validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/NullValidatorTest.java)
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/BlankValidatorTest.java (rev 0)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/BlankValidatorTest.java 2010-03-23 15:22:59 UTC (rev 19090)
@@ -0,0 +1,83 @@
+/*
+ * $Id:$
+ *
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and/or its affiliates, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.hibernate.validator.constraints.impl;
+
+import java.util.Set;
+import javax.validation.ConstraintViolation;
+import javax.validation.Validator;
+
+import org.testng.annotations.Test;
+
+import org.hibernate.validator.constraints.NotBlank;
+
+import static org.hibernate.validator.util.TestUtil.assertNumberOfViolations;
+import static org.hibernate.validator.util.TestUtil.getValidator;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+
+/**
+ * @author Hardy Ferentschik
+ */
+public class BlankValidatorTest {
+ @Test
+ public void testConstraintValidator() {
+ NotBlankValidator constraintValidator = new NotBlankValidator();
+
+ assertTrue( constraintValidator.isValid( "a", null ) );
+ assertTrue( constraintValidator.isValid( null, null ) );
+ assertFalse( constraintValidator.isValid( "", null ) );
+ assertFalse( constraintValidator.isValid( " ", null ) );
+ assertFalse( constraintValidator.isValid( "\t", null ) );
+ assertFalse( constraintValidator.isValid( "\n", null ) );
+ }
+
+ @Test
+ public void testNotBlank() {
+ Validator validator = getValidator();
+ Foo foo = new Foo();
+
+ Set<ConstraintViolation<Foo>> constraintViolations = validator.validate( foo );
+ assertNumberOfViolations( constraintViolations, 1 );
+
+ foo.name = "";
+ constraintViolations = validator.validate( foo );
+ assertNumberOfViolations( constraintViolations, 1 );
+
+ foo.name = " ";
+ constraintViolations = validator.validate( foo );
+ assertNumberOfViolations( constraintViolations, 1 );
+
+ foo.name = "\t";
+ constraintViolations = validator.validate( foo );
+ assertNumberOfViolations( constraintViolations, 1 );
+
+ foo.name = "\n";
+ constraintViolations = validator.validate( foo );
+ assertNumberOfViolations( constraintViolations, 1 );
+
+ foo.name = "john doe";
+ constraintViolations = validator.validate( foo );
+ assertNumberOfViolations( constraintViolations, 0 );
+ }
+
+ class Foo {
+ @NotBlank
+ String name;
+ }
+}
\ No newline at end of file
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/URLValidatorTest.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/URLValidatorTest.java 2010-03-23 13:29:20 UTC (rev 19089)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/URLValidatorTest.java 2010-03-23 15:22:59 UTC (rev 19090)
@@ -1,4 +1,4 @@
-// $Id: LengthValidatorTest.java 17521 2009-09-16 12:50:41Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/URLValidatorTest.java
___________________________________________________________________
Name: svn:keywords
+ Id
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/messageinterpolation/MessageInterpolationWithDefaultBundleTest.java
___________________________________________________________________
Name: svn:keywords
+ Id
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/messageinterpolation/User.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/resourceloading/AggregateBundleTest.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/resourceloading/AggregateBundleTest.java 2010-03-23 13:29:20 UTC (rev 19089)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/resourceloading/AggregateBundleTest.java 2010-03-23 15:22:59 UTC (rev 19090)
@@ -1,4 +1,4 @@
-// $Id: AggregateBundleTest.java 17620 2009-10-04 19:19:28Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2010, Red Hat, Inc. and/or its affiliates, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/resourceloading/AggregateBundleTest.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/resourceloading/AggregateResourceBundleLocatorTest.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/resourceloading/AggregateResourceBundleLocatorTest.java 2010-03-23 13:29:20 UTC (rev 19089)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/resourceloading/AggregateResourceBundleLocatorTest.java 2010-03-23 15:22:59 UTC (rev 19090)
@@ -1,4 +1,4 @@
-// $Id: AggregateResourceBundleLocatorTest.java 17620 2009-10-04 19:19:28Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2010, Red Hat, Inc. and/or its affiliates, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/resourceloading/AggregateResourceBundleLocatorTest.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/ICompetition.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/ICompetition.java 2010-03-23 13:29:20 UTC (rev 19089)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/ICompetition.java 2010-03-23 15:22:59 UTC (rev 19090)
@@ -1,4 +1,4 @@
-// $Id: AnnotationFactoryTest.java 17620 2009-10-04 19:19:28Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/ICompetition.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/IFixture.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/IFixture.java 2010-03-23 13:29:20 UTC (rev 19089)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/IFixture.java 2010-03-23 15:22:59 UTC (rev 19090)
@@ -1,4 +1,4 @@
-// $Id: AnnotationFactoryTest.java 17620 2009-10-04 19:19:28Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/IFixture.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/InheritanceMappingsTest.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/InheritanceMappingsTest.java 2010-03-23 13:29:20 UTC (rev 19089)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/InheritanceMappingsTest.java 2010-03-23 15:22:59 UTC (rev 19090)
@@ -1,4 +1,4 @@
-// $Id: AnnotationFactoryTest.java 17620 2009-10-04 19:19:28Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/InheritanceMappingsTest.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/annotation/Competition.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/annotation/Competition.java 2010-03-23 13:29:20 UTC (rev 19089)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/annotation/Competition.java 2010-03-23 15:22:59 UTC (rev 19090)
@@ -1,4 +1,4 @@
-// $Id: AnnotationFactoryTest.java 17620 2009-10-04 19:19:28Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/annotation/Competition.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/annotation/Fixture.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/annotation/Fixture.java 2010-03-23 13:29:20 UTC (rev 19089)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/annotation/Fixture.java 2010-03-23 15:22:59 UTC (rev 19090)
@@ -1,4 +1,4 @@
-// $Id: AnnotationFactoryTest.java 17620 2009-10-04 19:19:28Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/annotation/Fixture.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/annotation/Game.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/annotation/Game.java 2010-03-23 13:29:20 UTC (rev 19089)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/annotation/Game.java 2010-03-23 15:22:59 UTC (rev 19090)
@@ -1,4 +1,4 @@
-// $Id: AnnotationFactoryTest.java 17620 2009-10-04 19:19:28Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/annotation/Game.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/annotation/GameDetail.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/annotation/GameDetail.java 2010-03-23 13:29:20 UTC (rev 19089)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/annotation/GameDetail.java 2010-03-23 15:22:59 UTC (rev 19090)
@@ -1,4 +1,4 @@
-// $Id: AnnotationFactoryTest.java 17620 2009-10-04 19:19:28Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/annotation/GameDetail.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/annotation/PersonCompetition.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/annotation/PersonCompetition.java 2010-03-23 13:29:20 UTC (rev 19089)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/annotation/PersonCompetition.java 2010-03-23 15:22:59 UTC (rev 19090)
@@ -1,4 +1,4 @@
-// $Id: AnnotationFactoryTest.java 17620 2009-10-04 19:19:28Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/annotation/PersonCompetition.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/annotation/TeamCompetition.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/annotation/TeamCompetition.java 2010-03-23 13:29:20 UTC (rev 19089)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/annotation/TeamCompetition.java 2010-03-23 15:22:59 UTC (rev 19090)
@@ -1,4 +1,4 @@
-// $Id: AnnotationFactoryTest.java 17620 2009-10-04 19:19:28Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/annotation/TeamCompetition.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/xml/Competition.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/xml/Competition.java 2010-03-23 13:29:20 UTC (rev 19089)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/xml/Competition.java 2010-03-23 15:22:59 UTC (rev 19090)
@@ -1,4 +1,4 @@
-// $Id: AnnotationFactoryTest.java 17620 2009-10-04 19:19:28Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/xml/Competition.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/xml/Fixture.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/xml/Fixture.java 2010-03-23 13:29:20 UTC (rev 19089)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/xml/Fixture.java 2010-03-23 15:22:59 UTC (rev 19090)
@@ -1,4 +1,4 @@
-// $Id: AnnotationFactoryTest.java 17620 2009-10-04 19:19:28Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/xml/Fixture.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/xml/Game.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/xml/Game.java 2010-03-23 13:29:20 UTC (rev 19089)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/xml/Game.java 2010-03-23 15:22:59 UTC (rev 19090)
@@ -1,4 +1,4 @@
-// $Id: AnnotationFactoryTest.java 17620 2009-10-04 19:19:28Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/xml/Game.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/xml/GameDetail.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/xml/GameDetail.java 2010-03-23 13:29:20 UTC (rev 19089)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/xml/GameDetail.java 2010-03-23 15:22:59 UTC (rev 19090)
@@ -1,4 +1,4 @@
-// $Id: AnnotationFactoryTest.java 17620 2009-10-04 19:19:28Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/xml/GameDetail.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/xml/PersonCompetition.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/xml/PersonCompetition.java 2010-03-23 13:29:20 UTC (rev 19089)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/xml/PersonCompetition.java 2010-03-23 15:22:59 UTC (rev 19090)
@@ -1,4 +1,4 @@
-// $Id: AnnotationFactoryTest.java 17620 2009-10-04 19:19:28Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/xml/PersonCompetition.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/xml/TeamCompetition.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/xml/TeamCompetition.java 2010-03-23 13:29:20 UTC (rev 19089)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/xml/TeamCompetition.java 2010-03-23 15:22:59 UTC (rev 19090)
@@ -1,4 +1,4 @@
-// $Id: AnnotationFactoryTest.java 17620 2009-10-04 19:19:28Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/xml/mixedconfiguration/xml/TeamCompetition.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/testmodel/ValidationUsingAtValidAnnotation.java
===================================================================
--- validator/trunk/hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/testmodel/ValidationUsingAtValidAnnotation.java 2010-03-23 13:29:20 UTC (rev 19089)
+++ validator/trunk/hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/testmodel/ValidationUsingAtValidAnnotation.java 2010-03-23 15:22:59 UTC (rev 19090)
@@ -1,4 +1,4 @@
-// $Id: ValidationUsingAtValidAnnotation.java 18897 2010-02-25 19:12:35Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2009, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/testmodel/ValidationUsingAtValidAnnotation.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/pom.xml
===================================================================
--- validator/trunk/pom.xml 2010-03-23 13:29:20 UTC (rev 19089)
+++ validator/trunk/pom.xml 2010-03-23 15:22:59 UTC (rev 19090)
@@ -6,11 +6,11 @@
<artifactId>hibernate-validator-parent</artifactId>
<packaging>pom</packaging>
<version>4.1.0-SNAPSHOT</version>
- <name>Hibernate Validator Parent</name>
+ <name>Hibernate Validator Aggregator</name>
<url>http://validator.hibernate.org</url>
<description>
- Hibernate's Bean Validation (JSR-303) reference implementation.
+ Aggregator of the Hibernate Validator modules.
</description>
<developers>
14 years, 1 month
- 1
- 0