[hibernate-commits] Hibernate SVN: r12756 - in shards/trunk/src: java/org/hibernate/shards/criteria and 22 other directories.

Thu Jul 12 00:17:22 EDT 2007

Author: buurzgoth
Date: 2007-07-12 00:17:22 -0400 (Thu, 12 Jul 2007)
New Revision: 12756

Modified:
   shards/trunk/src/java/org/hibernate/shards/ShardImpl.java
   shards/trunk/src/java/org/hibernate/shards/ShardedTransaction.java
   shards/trunk/src/java/org/hibernate/shards/criteria/ExitOperationsCriteriaCollector.java
   shards/trunk/src/java/org/hibernate/shards/criteria/ShardedCriteriaImpl.java
   shards/trunk/src/java/org/hibernate/shards/criteria/ShardedSubcriteriaImpl.java
   shards/trunk/src/java/org/hibernate/shards/engine/ShardedSessionFactoryImplementor.java
   shards/trunk/src/java/org/hibernate/shards/engine/ShardedSessionImplementor.java
   shards/trunk/src/java/org/hibernate/shards/id/ShardEncodingIdentifierGenerator.java
   shards/trunk/src/java/org/hibernate/shards/id/ShardedTableHiLoGenerator.java
   shards/trunk/src/java/org/hibernate/shards/query/ExitOperationsQueryCollector.java
   shards/trunk/src/java/org/hibernate/shards/query/QueryFactory.java
   shards/trunk/src/java/org/hibernate/shards/query/SetBigDecimalEvent.java
   shards/trunk/src/java/org/hibernate/shards/query/SetBigIntegerEvent.java
   shards/trunk/src/java/org/hibernate/shards/query/SetBinaryEvent.java
   shards/trunk/src/java/org/hibernate/shards/query/SetBooleanEvent.java
   shards/trunk/src/java/org/hibernate/shards/query/SetByteEvent.java
   shards/trunk/src/java/org/hibernate/shards/query/SetCacheModeEvent.java
   shards/trunk/src/java/org/hibernate/shards/query/SetCalendarDateEvent.java
   shards/trunk/src/java/org/hibernate/shards/query/SetCalendarEvent.java
   shards/trunk/src/java/org/hibernate/shards/query/SetCharacterEvent.java
   shards/trunk/src/java/org/hibernate/shards/query/SetDateEvent.java
   shards/trunk/src/java/org/hibernate/shards/query/SetDoubleEvent.java
   shards/trunk/src/java/org/hibernate/shards/query/SetEntityEvent.java
   shards/trunk/src/java/org/hibernate/shards/query/SetFloatEvent.java
   shards/trunk/src/java/org/hibernate/shards/query/SetFlushModeEvent.java
   shards/trunk/src/java/org/hibernate/shards/query/SetIntegerEvent.java
   shards/trunk/src/java/org/hibernate/shards/query/SetLocaleEvent.java
   shards/trunk/src/java/org/hibernate/shards/query/SetLockModeEvent.java
   shards/trunk/src/java/org/hibernate/shards/query/SetLongEvent.java
   shards/trunk/src/java/org/hibernate/shards/query/SetParameterEvent.java
   shards/trunk/src/java/org/hibernate/shards/query/SetParameterListEvent.java
   shards/trunk/src/java/org/hibernate/shards/query/SetPropertiesEvent.java
   shards/trunk/src/java/org/hibernate/shards/query/SetSerializableEvent.java
   shards/trunk/src/java/org/hibernate/shards/query/SetShortEvent.java
   shards/trunk/src/java/org/hibernate/shards/query/SetStringEvent.java
   shards/trunk/src/java/org/hibernate/shards/query/SetTextEvent.java
   shards/trunk/src/java/org/hibernate/shards/query/SetTimeEvent.java
   shards/trunk/src/java/org/hibernate/shards/query/SetTimestampEvent.java
   shards/trunk/src/java/org/hibernate/shards/query/ShardedQueryImpl.java
   shards/trunk/src/java/org/hibernate/shards/session/CrossShardRelationshipDetectingInterceptorDecorator.java
   shards/trunk/src/java/org/hibernate/shards/session/SetupTransactionOpenSessionEvent.java
   shards/trunk/src/java/org/hibernate/shards/session/ShardIdResolver.java
   shards/trunk/src/java/org/hibernate/shards/session/ShardedSession.java
   shards/trunk/src/java/org/hibernate/shards/session/ShardedSessionFactoryImpl.java
   shards/trunk/src/java/org/hibernate/shards/session/ShardedSessionImpl.java
   shards/trunk/src/java/org/hibernate/shards/session/SubsetShardedSessionFactoryImpl.java
   shards/trunk/src/java/org/hibernate/shards/strategy/access/ParallelShardOperationCallable.java
   shards/trunk/src/java/org/hibernate/shards/strategy/access/StartAwareFutureTask.java
   shards/trunk/src/java/org/hibernate/shards/strategy/exit/AggregateExitOperation.java
   shards/trunk/src/java/org/hibernate/shards/strategy/exit/CountExitOperation.java
   shards/trunk/src/java/org/hibernate/shards/strategy/exit/DistinctExitOperation.java
   shards/trunk/src/java/org/hibernate/shards/strategy/exit/FirstResultExitOperation.java
   shards/trunk/src/java/org/hibernate/shards/strategy/exit/OrderExitOperation.java
   shards/trunk/src/java/org/hibernate/shards/strategy/exit/RowCountExitOperation.java
   shards/trunk/src/java/org/hibernate/shards/strategy/exit/ShardedAvgExitOperation.java
   shards/trunk/src/java/org/hibernate/shards/transaction/ShardedTransactionImpl.java
   shards/trunk/src/java/org/hibernate/shards/util/InterceptorDecorator.java
   shards/trunk/src/test/org/hibernate/shards/NonPermutedTests.java
   shards/trunk/src/test/org/hibernate/shards/ShardImplTest.java
   shards/trunk/src/test/org/hibernate/shards/ShardedConfigurationTest.java
   shards/trunk/src/test/org/hibernate/shards/ShardedSessionFactoryDefaultMock.java
   shards/trunk/src/test/org/hibernate/shards/ShardedTransactionDefaultMock.java
   shards/trunk/src/test/org/hibernate/shards/criteria/CreateSubcriteriaEventTest.java
   shards/trunk/src/test/org/hibernate/shards/criteria/ShardedCriteriaDefaultMock.java
   shards/trunk/src/test/org/hibernate/shards/criteria/ShardedSubcriteriaImplTest.java
   shards/trunk/src/test/org/hibernate/shards/defaultmock/ClassMetadataDefaultMock.java
   shards/trunk/src/test/org/hibernate/shards/defaultmock/CriteriaDefaultMock.java
   shards/trunk/src/test/org/hibernate/shards/defaultmock/EntityPersisterDefaultMock.java
   shards/trunk/src/test/org/hibernate/shards/defaultmock/QueryDefaultMock.java
   shards/trunk/src/test/org/hibernate/shards/defaultmock/SessionFactoryDefaultMock.java
   shards/trunk/src/test/org/hibernate/shards/defaultmock/SessionImplementorDefaultMock.java
   shards/trunk/src/test/org/hibernate/shards/defaultmock/TypeDefaultMock.java
   shards/trunk/src/test/org/hibernate/shards/engine/ShardedSessionImplementorDefaultMock.java
   shards/trunk/src/test/org/hibernate/shards/id/ShardedTableHiLoGeneratorTest.java
   shards/trunk/src/test/org/hibernate/shards/id/ShardedUUIDGeneratorTest.java
   shards/trunk/src/test/org/hibernate/shards/integration/BaseShardingIntegrationTestCase.java
   shards/trunk/src/test/org/hibernate/shards/integration/MemoryLeakPlugger.java
   shards/trunk/src/test/org/hibernate/shards/integration/PermutedIntegrationTests.java
   shards/trunk/src/test/org/hibernate/shards/integration/id/IdGeneratorPermutedIntegrationTest.java
   shards/trunk/src/test/org/hibernate/shards/integration/model/InterceptorBehaviorPermutedIntegrationTest.java
   shards/trunk/src/test/org/hibernate/shards/integration/model/MemoryLeakTest.java
   shards/trunk/src/test/org/hibernate/shards/integration/model/ModelCriteriaPermutedIntegrationTest.java
   shards/trunk/src/test/org/hibernate/shards/integration/model/ModelDataFactory.java
   shards/trunk/src/test/org/hibernate/shards/integration/model/ModelPermutedIntegrationTest.java
   shards/trunk/src/test/org/hibernate/shards/integration/model/ModelQueryPermutedIntegrationTest.java
   shards/trunk/src/test/org/hibernate/shards/query/SetBigDecimalEventTest.java
   shards/trunk/src/test/org/hibernate/shards/query/SetBigIntegerEventTest.java
   shards/trunk/src/test/org/hibernate/shards/query/SetBinaryEventTest.java
   shards/trunk/src/test/org/hibernate/shards/query/SetBooleanEventTest.java
   shards/trunk/src/test/org/hibernate/shards/query/SetByteEventTest.java
   shards/trunk/src/test/org/hibernate/shards/query/SetCacheModeEventTest.java
   shards/trunk/src/test/org/hibernate/shards/query/SetCacheRegionEventTest.java
   shards/trunk/src/test/org/hibernate/shards/query/SetCacheableEventTest.java
   shards/trunk/src/test/org/hibernate/shards/query/SetCalendarDateEventTest.java
   shards/trunk/src/test/org/hibernate/shards/query/SetCalendarEventTest.java
   shards/trunk/src/test/org/hibernate/shards/query/SetCharacterEventTest.java
   shards/trunk/src/test/org/hibernate/shards/query/SetCommentEventTest.java
   shards/trunk/src/test/org/hibernate/shards/query/SetDateEventTest.java
   shards/trunk/src/test/org/hibernate/shards/query/SetDoubleEventTest.java
   shards/trunk/src/test/org/hibernate/shards/query/SetEntityEventTest.java
   shards/trunk/src/test/org/hibernate/shards/query/SetFetchSizeEventTest.java
   shards/trunk/src/test/org/hibernate/shards/query/SetFirstResultEventTest.java
   shards/trunk/src/test/org/hibernate/shards/query/SetFloatEventTest.java
   shards/trunk/src/test/org/hibernate/shards/query/SetFlushModeEventTest.java
   shards/trunk/src/test/org/hibernate/shards/query/SetIntegerEventTest.java
   shards/trunk/src/test/org/hibernate/shards/query/SetLocaleEventTest.java
   shards/trunk/src/test/org/hibernate/shards/query/SetLockModeEventTest.java
   shards/trunk/src/test/org/hibernate/shards/query/SetLongEventTest.java
   shards/trunk/src/test/org/hibernate/shards/query/SetMaxResultsEventTest.java
   shards/trunk/src/test/org/hibernate/shards/query/SetParameterEventTest.java
   shards/trunk/src/test/org/hibernate/shards/query/SetParameterListEventTest.java
   shards/trunk/src/test/org/hibernate/shards/query/SetParametersEventTest.java
   shards/trunk/src/test/org/hibernate/shards/query/SetPropertiesEventTest.java
   shards/trunk/src/test/org/hibernate/shards/query/SetReadOnlyEventTest.java
   shards/trunk/src/test/org/hibernate/shards/query/SetResultTransformerEventTest.java
   shards/trunk/src/test/org/hibernate/shards/query/SetSerializableEventTest.java
   shards/trunk/src/test/org/hibernate/shards/query/SetShortEventTest.java
   shards/trunk/src/test/org/hibernate/shards/query/SetStringEventTest.java
   shards/trunk/src/test/org/hibernate/shards/query/SetTextEventTest.java
   shards/trunk/src/test/org/hibernate/shards/query/SetTimeEventTest.java
   shards/trunk/src/test/org/hibernate/shards/query/SetTimeoutEventTest.java
   shards/trunk/src/test/org/hibernate/shards/query/SetTimestampEventTest.java
   shards/trunk/src/test/org/hibernate/shards/query/ShardedQueryDefaultMock.java
   shards/trunk/src/test/org/hibernate/shards/session/CrossShardRelationshipDetectingInterceptorDecoratorTest.java
   shards/trunk/src/test/org/hibernate/shards/session/CrossShardRelationshipDetectingInterceptorTest.java
   shards/trunk/src/test/org/hibernate/shards/session/ShardIdResolverDefaultMock.java
   shards/trunk/src/test/org/hibernate/shards/session/ShardedSessionFactoryImplTest.java
   shards/trunk/src/test/org/hibernate/shards/session/ShardedSessionImplTest.java
   shards/trunk/src/test/org/hibernate/shards/strategy/access/ParallelShardOperationCallableTest.java
   shards/trunk/src/test/org/hibernate/shards/strategy/access/StartAwareFutureTaskTest.java
   shards/trunk/src/test/org/hibernate/shards/strategy/exit/AggregateExitOperationTest.java
   shards/trunk/src/test/org/hibernate/shards/strategy/exit/FirstNonNullResultExitStrategyTest.java
   shards/trunk/src/test/org/hibernate/shards/strategy/exit/FirstResultExitOperationTest.java
   shards/trunk/src/test/org/hibernate/shards/strategy/exit/MaxResultExitOperationTest.java
   shards/trunk/src/test/org/hibernate/shards/strategy/exit/OrderExitOperationTest.java
   shards/trunk/src/test/org/hibernate/shards/strategy/exit/ProjectionExitOperationFactoryTest.java
   shards/trunk/src/test/org/hibernate/shards/strategy/exit/RowCountExitOperationTest.java
   shards/trunk/src/test/org/hibernate/shards/transaction/ShardedTransactionImplTest.java
   shards/trunk/src/test/org/hibernate/shards/util/JdbcUtil.java
Log:
Fix imports.

Modified: shards/trunk/src/java/org/hibernate/shards/ShardImpl.java
===================================================================

--- shards/trunk/src/java/org/hibernate/shards/ShardImpl.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/ShardImpl.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -35,7 +35,11 @@
 import org.hibernate.shards.util.Preconditions;
 import org.hibernate.shards.util.Sets;
 
-import java.util.*;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * Concrete implementation of the {@link Shard} interface.

Modified: shards/trunk/src/java/org/hibernate/shards/ShardedTransaction.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/ShardedTransaction.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/ShardedTransaction.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,8 +18,8 @@
 
 package org.hibernate.shards;
 
+import org.hibernate.Session;
 import org.hibernate.Transaction;
-import org.hibernate.Session;
 
 /**
  * Simple interface to represent a shard-aware {@link Transaction}.

Modified: shards/trunk/src/java/org/hibernate/shards/criteria/ExitOperationsCriteriaCollector.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/criteria/ExitOperationsCriteriaCollector.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/criteria/ExitOperationsCriteriaCollector.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,14 +18,6 @@
 
 package org.hibernate.shards.criteria;
 
-import org.hibernate.shards.strategy.exit.DistinctExitOperation;
-import org.hibernate.shards.strategy.exit.ExitOperationsCollector;
-import org.hibernate.shards.strategy.exit.FirstResultExitOperation;
-import org.hibernate.shards.strategy.exit.MaxResultsExitOperation;
-import org.hibernate.shards.strategy.exit.OrderExitOperation;
-import org.hibernate.shards.strategy.exit.ProjectionExitOperationFactory;
-import org.hibernate.shards.util.Lists;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.hibernate.criterion.AggregateProjection;
@@ -34,6 +26,13 @@
 import org.hibernate.criterion.Projection;
 import org.hibernate.criterion.RowCountProjection;
 import org.hibernate.engine.SessionFactoryImplementor;
+import org.hibernate.shards.strategy.exit.DistinctExitOperation;
+import org.hibernate.shards.strategy.exit.ExitOperationsCollector;
+import org.hibernate.shards.strategy.exit.FirstResultExitOperation;
+import org.hibernate.shards.strategy.exit.MaxResultsExitOperation;
+import org.hibernate.shards.strategy.exit.OrderExitOperation;
+import org.hibernate.shards.strategy.exit.ProjectionExitOperationFactory;
+import org.hibernate.shards.util.Lists;
 
 import java.util.List;
 

Modified: shards/trunk/src/java/org/hibernate/shards/criteria/ShardedCriteriaImpl.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/criteria/ShardedCriteriaImpl.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/criteria/ShardedCriteriaImpl.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,7 +18,14 @@
 
 package org.hibernate.shards.criteria;
 
-import org.hibernate.*;
+import org.hibernate.CacheMode;
+import org.hibernate.Criteria;
+import org.hibernate.FetchMode;
+import org.hibernate.FlushMode;
+import org.hibernate.HibernateException;
+import org.hibernate.LockMode;
+import org.hibernate.ScrollMode;
+import org.hibernate.ScrollableResults;
 import org.hibernate.criterion.Criterion;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Projection;

Modified: shards/trunk/src/java/org/hibernate/shards/criteria/ShardedSubcriteriaImpl.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/criteria/ShardedSubcriteriaImpl.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/criteria/ShardedSubcriteriaImpl.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,11 +18,6 @@
 
 package org.hibernate.shards.criteria;
 
-import org.hibernate.shards.Shard;
-import org.hibernate.shards.util.Lists;
-import org.hibernate.shards.util.Maps;
-import org.hibernate.shards.util.Preconditions;
-
 import org.hibernate.CacheMode;
 import org.hibernate.Criteria;
 import org.hibernate.FetchMode;
@@ -31,10 +26,14 @@
 import org.hibernate.LockMode;
 import org.hibernate.ScrollMode;
 import org.hibernate.ScrollableResults;
-import org.hibernate.impl.CriteriaImpl;
 import org.hibernate.criterion.Criterion;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Projection;
+import org.hibernate.impl.CriteriaImpl;
+import org.hibernate.shards.Shard;
+import org.hibernate.shards.util.Lists;
+import org.hibernate.shards.util.Maps;
+import org.hibernate.shards.util.Preconditions;
 import org.hibernate.transform.ResultTransformer;
 
 import java.util.List;

Modified: shards/trunk/src/java/org/hibernate/shards/engine/ShardedSessionFactoryImplementor.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/engine/ShardedSessionFactoryImplementor.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/engine/ShardedSessionFactoryImplementor.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,11 +18,10 @@
 
 package org.hibernate.shards.engine;
 
+import org.hibernate.engine.SessionFactoryImplementor;
 import org.hibernate.shards.ShardId;
 import org.hibernate.shards.session.ShardedSessionFactory;
 
-import org.hibernate.engine.SessionFactoryImplementor;
-
 import java.util.Map;
 import java.util.Set;
 

Modified: shards/trunk/src/java/org/hibernate/shards/engine/ShardedSessionImplementor.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/engine/ShardedSessionImplementor.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/engine/ShardedSessionImplementor.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,8 +18,8 @@
 
 package org.hibernate.shards.engine;
 
+import org.hibernate.shards.Shard;
 import org.hibernate.shards.session.ShardedSession;
-import org.hibernate.shards.Shard;
 
 import java.util.List;
 

Modified: shards/trunk/src/java/org/hibernate/shards/id/ShardEncodingIdentifierGenerator.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/id/ShardEncodingIdentifierGenerator.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/id/ShardEncodingIdentifierGenerator.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,10 +18,9 @@
 
 package org.hibernate.shards.id;
 
+import org.hibernate.id.IdentifierGenerator;
 import org.hibernate.shards.ShardId;
 
-import org.hibernate.id.IdentifierGenerator;
-
 import java.io.Serializable;
 
 /**

Modified: shards/trunk/src/java/org/hibernate/shards/id/ShardedTableHiLoGenerator.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/id/ShardedTableHiLoGenerator.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/id/ShardedTableHiLoGenerator.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,12 +18,11 @@
 
 package org.hibernate.shards.id;
 
-import org.hibernate.shards.session.ControlSessionProvider;
-
 import org.hibernate.HibernateException;
 import org.hibernate.Session;
 import org.hibernate.engine.SessionImplementor;
 import org.hibernate.id.TableHiLoGenerator;
+import org.hibernate.shards.session.ControlSessionProvider;
 
 import java.io.Serializable;
 

Modified: shards/trunk/src/java/org/hibernate/shards/query/ExitOperationsQueryCollector.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/query/ExitOperationsQueryCollector.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/query/ExitOperationsQueryCollector.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,12 +18,11 @@
 
 package org.hibernate.shards.query;
 
+import org.hibernate.engine.SessionFactoryImplementor;
 import org.hibernate.shards.strategy.exit.ExitOperationsCollector;
 import org.hibernate.shards.strategy.exit.FirstResultExitOperation;
 import org.hibernate.shards.strategy.exit.MaxResultsExitOperation;
 
-import org.hibernate.engine.SessionFactoryImplementor;
-
 import java.util.List;
 
 /**

Modified: shards/trunk/src/java/org/hibernate/shards/query/QueryFactory.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/query/QueryFactory.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/query/QueryFactory.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,8 +18,8 @@
 
 package org.hibernate.shards.query;
 
+import org.hibernate.Query;
 import org.hibernate.Session;
-import org.hibernate.Query;
 
 /**
  * @author maulik at google.com (Maulik Shah)

Modified: shards/trunk/src/java/org/hibernate/shards/query/SetBigDecimalEvent.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/query/SetBigDecimalEvent.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/query/SetBigDecimalEvent.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,10 +18,9 @@
 
 package org.hibernate.shards.query;
 
+import org.hibernate.Query;
 import org.hibernate.shards.session.ShardedSessionException;
 
-import org.hibernate.Query;
-
 import java.math.BigDecimal;
 
 /**

Modified: shards/trunk/src/java/org/hibernate/shards/query/SetBigIntegerEvent.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/query/SetBigIntegerEvent.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/query/SetBigIntegerEvent.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,10 +18,9 @@
 
 package org.hibernate.shards.query;
 
+import org.hibernate.Query;
 import org.hibernate.shards.session.ShardedSessionException;
 
-import org.hibernate.Query;
-
 import java.math.BigInteger;
 
 /**

Modified: shards/trunk/src/java/org/hibernate/shards/query/SetBinaryEvent.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/query/SetBinaryEvent.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/query/SetBinaryEvent.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,10 +18,9 @@
 
 package org.hibernate.shards.query;
 
+import org.hibernate.Query;
 import org.hibernate.shards.session.ShardedSessionException;
 
-import org.hibernate.Query;
-
 /**
  * @author maulik at google.com (Maulik Shah)
  */

Modified: shards/trunk/src/java/org/hibernate/shards/query/SetBooleanEvent.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/query/SetBooleanEvent.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/query/SetBooleanEvent.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,10 +18,9 @@
 
 package org.hibernate.shards.query;
 
+import org.hibernate.Query;
 import org.hibernate.shards.session.ShardedSessionException;
 
-import org.hibernate.Query;
-
 /**
  * @author maulik at google.com (Maulik Shah)
  */

Modified: shards/trunk/src/java/org/hibernate/shards/query/SetByteEvent.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/query/SetByteEvent.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/query/SetByteEvent.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,10 +18,9 @@
 
 package org.hibernate.shards.query;
 
+import org.hibernate.Query;
 import org.hibernate.shards.session.ShardedSessionException;
 
-import org.hibernate.Query;
-
 /**
  * @author maulik at google.com (Maulik Shah)
  */

Modified: shards/trunk/src/java/org/hibernate/shards/query/SetCacheModeEvent.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/query/SetCacheModeEvent.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/query/SetCacheModeEvent.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,8 +18,8 @@
 
 package org.hibernate.shards.query;
 
+import org.hibernate.CacheMode;
 import org.hibernate.Query;
-import org.hibernate.CacheMode;
 
 /**
  * @author maulik at google.com (Maulik Shah)

Modified: shards/trunk/src/java/org/hibernate/shards/query/SetCalendarDateEvent.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/query/SetCalendarDateEvent.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/query/SetCalendarDateEvent.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,10 +18,9 @@
 
 package org.hibernate.shards.query;
 
+import org.hibernate.Query;
 import org.hibernate.shards.session.ShardedSessionException;
 
-import org.hibernate.Query;
-
 import java.util.Calendar;
 
 /**

Modified: shards/trunk/src/java/org/hibernate/shards/query/SetCalendarEvent.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/query/SetCalendarEvent.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/query/SetCalendarEvent.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,10 +18,9 @@
 
 package org.hibernate.shards.query;
 
+import org.hibernate.Query;
 import org.hibernate.shards.session.ShardedSessionException;
 
-import org.hibernate.Query;
-
 import java.util.Calendar;
 
 /**

Modified: shards/trunk/src/java/org/hibernate/shards/query/SetCharacterEvent.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/query/SetCharacterEvent.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/query/SetCharacterEvent.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,10 +18,9 @@
 
 package org.hibernate.shards.query;
 
+import org.hibernate.Query;
 import org.hibernate.shards.session.ShardedSessionException;
 
-import org.hibernate.Query;
-
 /**
  * @author maulik at google.com (Maulik Shah)
  */

Modified: shards/trunk/src/java/org/hibernate/shards/query/SetDateEvent.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/query/SetDateEvent.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/query/SetDateEvent.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,10 +18,9 @@
 
 package org.hibernate.shards.query;
 
+import org.hibernate.Query;
 import org.hibernate.shards.session.ShardedSessionException;
 
-import org.hibernate.Query;
-
 import java.util.Date;
 
 /**

Modified: shards/trunk/src/java/org/hibernate/shards/query/SetDoubleEvent.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/query/SetDoubleEvent.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/query/SetDoubleEvent.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,10 +18,9 @@
 
 package org.hibernate.shards.query;
 
+import org.hibernate.Query;
 import org.hibernate.shards.session.ShardedSessionException;
 
-import org.hibernate.Query;
-
 /**
  * @author maulik at google.com (Maulik Shah)
  */

Modified: shards/trunk/src/java/org/hibernate/shards/query/SetEntityEvent.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/query/SetEntityEvent.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/query/SetEntityEvent.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,11 +18,10 @@
 
 package org.hibernate.shards.query;
 
+import org.hibernate.Query;
 import org.hibernate.shards.session.ShardedSessionException;
 
-import org.hibernate.Query;
 
-
 /**
  * @author maulik at google.com (Maulik Shah)
  */

Modified: shards/trunk/src/java/org/hibernate/shards/query/SetFloatEvent.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/query/SetFloatEvent.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/query/SetFloatEvent.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,10 +18,9 @@
 
 package org.hibernate.shards.query;
 
+import org.hibernate.Query;
 import org.hibernate.shards.session.ShardedSessionException;
 
-import org.hibernate.Query;
-
 /**
  * @author maulik at google.com (Maulik Shah)
  */

Modified: shards/trunk/src/java/org/hibernate/shards/query/SetFlushModeEvent.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/query/SetFlushModeEvent.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/query/SetFlushModeEvent.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,8 +18,8 @@
 
 package org.hibernate.shards.query;
 
+import org.hibernate.FlushMode;
 import org.hibernate.Query;
-import org.hibernate.FlushMode;
 
 /**
  * @author maulik at google.com (Maulik Shah)

Modified: shards/trunk/src/java/org/hibernate/shards/query/SetIntegerEvent.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/query/SetIntegerEvent.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/query/SetIntegerEvent.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,10 +18,9 @@
 
 package org.hibernate.shards.query;
 
+import org.hibernate.Query;
 import org.hibernate.shards.session.ShardedSessionException;
 
-import org.hibernate.Query;
-
 /**
  * @author maulik at google.com (Maulik Shah)
  */

Modified: shards/trunk/src/java/org/hibernate/shards/query/SetLocaleEvent.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/query/SetLocaleEvent.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/query/SetLocaleEvent.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,10 +18,9 @@
 
 package org.hibernate.shards.query;
 
+import org.hibernate.Query;
 import org.hibernate.shards.session.ShardedSessionException;
 
-import org.hibernate.Query;
-
 import java.util.Locale;
 
 /**

Modified: shards/trunk/src/java/org/hibernate/shards/query/SetLockModeEvent.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/query/SetLockModeEvent.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/query/SetLockModeEvent.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,8 +18,8 @@
 
 package org.hibernate.shards.query;
 
+import org.hibernate.LockMode;
 import org.hibernate.Query;
-import org.hibernate.LockMode;
 
 /**
  * @author maulik at google.com (Maulik Shah)

Modified: shards/trunk/src/java/org/hibernate/shards/query/SetLongEvent.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/query/SetLongEvent.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/query/SetLongEvent.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,10 +18,9 @@
 
 package org.hibernate.shards.query;
 
+import org.hibernate.Query;
 import org.hibernate.shards.session.ShardedSessionException;
 
-import org.hibernate.Query;
-
 /**
  * @author maulik at google.com (Maulik Shah)
  */

Modified: shards/trunk/src/java/org/hibernate/shards/query/SetParameterEvent.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/query/SetParameterEvent.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/query/SetParameterEvent.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,9 +18,8 @@
 
 package org.hibernate.shards.query;
 
-import org.hibernate.shards.session.ShardedSessionException;
-
 import org.hibernate.Query;
+import org.hibernate.shards.session.ShardedSessionException;
 import org.hibernate.type.Type;
 
 /**

Modified: shards/trunk/src/java/org/hibernate/shards/query/SetParameterListEvent.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/query/SetParameterListEvent.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/query/SetParameterListEvent.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,9 +18,8 @@
 
 package org.hibernate.shards.query;
 
-import org.hibernate.shards.session.ShardedSessionException;
-
 import org.hibernate.Query;
+import org.hibernate.shards.session.ShardedSessionException;
 import org.hibernate.type.Type;
 
 import java.util.Collection;

Modified: shards/trunk/src/java/org/hibernate/shards/query/SetPropertiesEvent.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/query/SetPropertiesEvent.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/query/SetPropertiesEvent.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,10 +18,9 @@
 
 package org.hibernate.shards.query;
 
+import org.hibernate.Query;
 import org.hibernate.shards.session.ShardedSessionException;
 
-import org.hibernate.Query;
-
 import java.util.Map;
 
 /**

Modified: shards/trunk/src/java/org/hibernate/shards/query/SetSerializableEvent.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/query/SetSerializableEvent.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/query/SetSerializableEvent.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,10 +18,9 @@
 
 package org.hibernate.shards.query;
 
+import org.hibernate.Query;
 import org.hibernate.shards.session.ShardedSessionException;
 
-import org.hibernate.Query;
-
 import java.io.Serializable;
 
 /**

Modified: shards/trunk/src/java/org/hibernate/shards/query/SetShortEvent.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/query/SetShortEvent.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/query/SetShortEvent.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,10 +18,9 @@
 
 package org.hibernate.shards.query;
 
+import org.hibernate.Query;
 import org.hibernate.shards.session.ShardedSessionException;
 
-import org.hibernate.Query;
-
 /**
  * @author maulik at google.com (Maulik Shah)
  */

Modified: shards/trunk/src/java/org/hibernate/shards/query/SetStringEvent.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/query/SetStringEvent.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/query/SetStringEvent.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,10 +18,9 @@
 
 package org.hibernate.shards.query;
 
+import org.hibernate.Query;
 import org.hibernate.shards.session.ShardedSessionException;
 
-import org.hibernate.Query;
-
 /**
  * @author maulik at google.com (Maulik Shah)
  */

Modified: shards/trunk/src/java/org/hibernate/shards/query/SetTextEvent.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/query/SetTextEvent.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/query/SetTextEvent.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,10 +18,9 @@
 
 package org.hibernate.shards.query;
 
+import org.hibernate.Query;
 import org.hibernate.shards.session.ShardedSessionException;
 
-import org.hibernate.Query;
-
 /**
  * @author maulik at google.com (Maulik Shah)
  */

Modified: shards/trunk/src/java/org/hibernate/shards/query/SetTimeEvent.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/query/SetTimeEvent.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/query/SetTimeEvent.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,10 +18,9 @@
 
 package org.hibernate.shards.query;
 
+import org.hibernate.Query;
 import org.hibernate.shards.session.ShardedSessionException;
 
-import org.hibernate.Query;
-
 import java.util.Date;
 
 /**

Modified: shards/trunk/src/java/org/hibernate/shards/query/SetTimestampEvent.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/query/SetTimestampEvent.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/query/SetTimestampEvent.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,10 +18,9 @@
 
 package org.hibernate.shards.query;
 
+import org.hibernate.Query;
 import org.hibernate.shards.session.ShardedSessionException;
 
-import org.hibernate.Query;
-
 import java.util.Date;
 
 /**

Modified: shards/trunk/src/java/org/hibernate/shards/query/ShardedQueryImpl.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/query/ShardedQueryImpl.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/query/ShardedQueryImpl.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,13 +18,6 @@
 
 package org.hibernate.shards.query;
 
-import org.hibernate.shards.Shard;
-import org.hibernate.shards.ShardOperation;
-import org.hibernate.shards.strategy.access.ShardAccessStrategy;
-import org.hibernate.shards.strategy.exit.ConcatenateListsExitStrategy;
-import org.hibernate.shards.strategy.exit.FirstNonNullResultExitStrategy;
-import org.hibernate.shards.util.Preconditions;
-
 import org.hibernate.CacheMode;
 import org.hibernate.FlushMode;
 import org.hibernate.HibernateException;
@@ -32,6 +25,12 @@
 import org.hibernate.Query;
 import org.hibernate.ScrollMode;
 import org.hibernate.ScrollableResults;
+import org.hibernate.shards.Shard;
+import org.hibernate.shards.ShardOperation;
+import org.hibernate.shards.strategy.access.ShardAccessStrategy;
+import org.hibernate.shards.strategy.exit.ConcatenateListsExitStrategy;
+import org.hibernate.shards.strategy.exit.FirstNonNullResultExitStrategy;
+import org.hibernate.shards.util.Preconditions;
 import org.hibernate.transform.ResultTransformer;
 import org.hibernate.type.Type;
 

Modified: shards/trunk/src/java/org/hibernate/shards/session/CrossShardRelationshipDetectingInterceptorDecorator.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/session/CrossShardRelationshipDetectingInterceptorDecorator.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/session/CrossShardRelationshipDetectingInterceptorDecorator.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,10 +18,9 @@
 
 package org.hibernate.shards.session;
 
-import org.hibernate.shards.util.InterceptorDecorator;
-
 import org.hibernate.CallbackException;
 import org.hibernate.Interceptor;
+import org.hibernate.shards.util.InterceptorDecorator;
 import org.hibernate.type.Type;
 
 import java.io.Serializable;

Modified: shards/trunk/src/java/org/hibernate/shards/session/SetupTransactionOpenSessionEvent.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/session/SetupTransactionOpenSessionEvent.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/session/SetupTransactionOpenSessionEvent.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,10 +18,9 @@
 
 package org.hibernate.shards.session;
 
+import org.hibernate.Session;
 import org.hibernate.shards.ShardedTransaction;
 
-import org.hibernate.Session;
-
 /**
  * OpenSessionEvent which adds newly opened session to the specified
  * ShardedTransaction.

Modified: shards/trunk/src/java/org/hibernate/shards/session/ShardIdResolver.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/session/ShardIdResolver.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/session/ShardIdResolver.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,8 +18,8 @@
 
 package org.hibernate.shards.session;
 
+import org.hibernate.shards.Shard;
 import org.hibernate.shards.ShardId;
-import org.hibernate.shards.Shard;
 
 import java.util.List;
 

Modified: shards/trunk/src/java/org/hibernate/shards/session/ShardedSession.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/session/ShardedSession.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/session/ShardedSession.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,11 +18,10 @@
 
 package org.hibernate.shards.session;
 
+import org.hibernate.classic.Session;
 import org.hibernate.shards.ShardId;
 
-import org.hibernate.classic.Session;
 
-
 /**
  * The main runtime inteface between Java application and Hibernate Shards.<br>
  * ShardedSession represents a logical transaction that might be spanning

Modified: shards/trunk/src/java/org/hibernate/shards/session/ShardedSessionFactoryImpl.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/session/ShardedSessionFactoryImpl.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/session/ShardedSessionFactoryImpl.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -20,7 +20,12 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.hibernate.*;
+import org.hibernate.ConnectionReleaseMode;
+import org.hibernate.HibernateException;
+import org.hibernate.Interceptor;
+import org.hibernate.MappingException;
+import org.hibernate.SessionFactory;
+import org.hibernate.StatelessSession;
 import org.hibernate.cache.Cache;
 import org.hibernate.cache.QueryCache;
 import org.hibernate.cache.UpdateTimestampsCache;
@@ -29,7 +34,12 @@
 import org.hibernate.connection.ConnectionProvider;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.function.SQLFunctionRegistry;
-import org.hibernate.engine.*;
+import org.hibernate.engine.FilterDefinition;
+import org.hibernate.engine.NamedQueryDefinition;
+import org.hibernate.engine.NamedSQLQueryDefinition;
+import org.hibernate.engine.ResultSetMappingDefinition;
+import org.hibernate.engine.SessionFactoryImplementor;
+import org.hibernate.engine.SessionImplementor;
 import org.hibernate.engine.query.QueryPlanCache;
 import org.hibernate.exception.SQLExceptionConverter;
 import org.hibernate.id.IdentifierGenerator;
@@ -43,7 +53,11 @@
 import org.hibernate.shards.id.GeneratorRequiringControlSessionProvider;
 import org.hibernate.shards.strategy.ShardStrategy;
 import org.hibernate.shards.strategy.ShardStrategyFactory;
-import org.hibernate.shards.util.*;
+import org.hibernate.shards.util.Iterables;
+import org.hibernate.shards.util.Lists;
+import org.hibernate.shards.util.Maps;
+import org.hibernate.shards.util.Preconditions;
+import org.hibernate.shards.util.Sets;
 import org.hibernate.stat.Statistics;
 import org.hibernate.stat.StatisticsImpl;
 import org.hibernate.stat.StatisticsImplementor;

Modified: shards/trunk/src/java/org/hibernate/shards/session/ShardedSessionImpl.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/session/ShardedSessionImpl.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/session/ShardedSessionImpl.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -20,33 +20,66 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.hibernate.*;
+import org.hibernate.CacheMode;
+import org.hibernate.Criteria;
+import org.hibernate.EntityMode;
+import org.hibernate.Filter;
+import org.hibernate.FlushMode;
+import org.hibernate.HibernateException;
+import org.hibernate.Interceptor;
+import org.hibernate.LockMode;
+import org.hibernate.Query;
+import org.hibernate.ReplicationMode;
+import org.hibernate.SQLQuery;
+import org.hibernate.SessionException;
+import org.hibernate.Transaction;
+import org.hibernate.TransientObjectException;
+import org.hibernate.UnresolvableObjectException;
 import org.hibernate.classic.Session;
 import org.hibernate.engine.SessionFactoryImplementor;
 import org.hibernate.id.IdentifierGenerator;
 import org.hibernate.metadata.ClassMetadata;
 import org.hibernate.proxy.HibernateProxy;
-import org.hibernate.shards.*;
+import org.hibernate.shards.CrossShardAssociationException;
+import org.hibernate.shards.Shard;
+import org.hibernate.shards.ShardId;
+import org.hibernate.shards.ShardImpl;
+import org.hibernate.shards.ShardOperation;
+import org.hibernate.shards.ShardedTransaction;
 import org.hibernate.shards.criteria.CriteriaFactoryImpl;
 import org.hibernate.shards.criteria.CriteriaId;
 import org.hibernate.shards.criteria.ShardedCriteriaImpl;
 import org.hibernate.shards.engine.ShardedSessionFactoryImplementor;
 import org.hibernate.shards.engine.ShardedSessionImplementor;
 import org.hibernate.shards.id.ShardEncodingIdentifierGenerator;
-import org.hibernate.shards.query.*;
+import org.hibernate.shards.query.AdHocQueryFactoryImpl;
+import org.hibernate.shards.query.ExitOperationsQueryCollector;
+import org.hibernate.shards.query.NamedQueryFactoryImpl;
+import org.hibernate.shards.query.QueryId;
+import org.hibernate.shards.query.ShardedQueryImpl;
 import org.hibernate.shards.stat.ShardedSessionStatistics;
 import org.hibernate.shards.strategy.ShardStrategy;
 import org.hibernate.shards.strategy.exit.FirstNonNullResultExitStrategy;
 import org.hibernate.shards.strategy.selection.ShardResolutionStrategyData;
 import org.hibernate.shards.strategy.selection.ShardResolutionStrategyDataImpl;
 import org.hibernate.shards.transaction.ShardedTransactionImpl;
-import org.hibernate.shards.util.*;
+import org.hibernate.shards.util.Iterables;
+import org.hibernate.shards.util.Lists;
+import org.hibernate.shards.util.Maps;
+import org.hibernate.shards.util.Pair;
+import org.hibernate.shards.util.Preconditions;
+import org.hibernate.shards.util.Sets;
 import org.hibernate.stat.SessionStatistics;
 import org.hibernate.type.Type;
 
 import java.io.Serializable;
 import java.sql.Connection;
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * Concrete implementation of a ShardedSession, and also the central component of

Modified: shards/trunk/src/java/org/hibernate/shards/session/SubsetShardedSessionFactoryImpl.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/session/SubsetShardedSessionFactoryImpl.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/session/SubsetShardedSessionFactoryImpl.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,15 +18,14 @@
 
 package org.hibernate.shards.session;
 
+import org.hibernate.HibernateException;
+import org.hibernate.engine.SessionFactoryImplementor;
 import org.hibernate.shards.ShardId;
 import org.hibernate.shards.strategy.ShardStrategyFactory;
 
-import org.hibernate.engine.SessionFactoryImplementor;
-import org.hibernate.HibernateException;
-
 import java.util.List;
-import java.util.Set;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * This class extends ShardedSessionFactoryImpl and is constructed by supplying

Modified: shards/trunk/src/java/org/hibernate/shards/strategy/access/ParallelShardOperationCallable.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/strategy/access/ParallelShardOperationCallable.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/strategy/access/ParallelShardOperationCallable.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,14 +18,13 @@
 
 package org.hibernate.shards.strategy.access;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.hibernate.HibernateException;
 import org.hibernate.shards.Shard;
 import org.hibernate.shards.ShardOperation;
 import org.hibernate.shards.strategy.exit.ExitStrategy;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.hibernate.HibernateException;
-
 import java.util.List;
 import java.util.concurrent.Callable;
 import java.util.concurrent.CountDownLatch;

Modified: shards/trunk/src/java/org/hibernate/shards/strategy/access/StartAwareFutureTask.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/strategy/access/StartAwareFutureTask.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/strategy/access/StartAwareFutureTask.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -21,8 +21,8 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import java.util.concurrent.Callable;
 import java.util.concurrent.FutureTask;
-import java.util.concurrent.Callable;
 
 /**
  * Extension of FutureTask that provides slightly different cancel()

Modified: shards/trunk/src/java/org/hibernate/shards/strategy/exit/AggregateExitOperation.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/strategy/exit/AggregateExitOperation.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/strategy/exit/AggregateExitOperation.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,12 +18,11 @@
 
 package org.hibernate.shards.strategy.exit;
 
-import org.hibernate.shards.util.Preconditions;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.hibernate.criterion.AggregateProjection;
 import org.hibernate.engine.SessionFactoryImplementor;
+import org.hibernate.shards.util.Preconditions;
 
 import java.math.BigDecimal;
 import java.util.Collections;

Modified: shards/trunk/src/java/org/hibernate/shards/strategy/exit/CountExitOperation.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/strategy/exit/CountExitOperation.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/strategy/exit/CountExitOperation.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,12 +18,11 @@
 
 package org.hibernate.shards.strategy.exit;
 
-import org.hibernate.shards.util.Preconditions;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.hibernate.criterion.CountProjection;
 import org.hibernate.criterion.Projection;
+import org.hibernate.shards.util.Preconditions;
 
 import java.util.List;
 

Modified: shards/trunk/src/java/org/hibernate/shards/strategy/exit/DistinctExitOperation.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/strategy/exit/DistinctExitOperation.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/strategy/exit/DistinctExitOperation.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,11 +18,10 @@
 
 package org.hibernate.shards.strategy.exit;
 
+import org.hibernate.criterion.Projection;
 import org.hibernate.shards.util.Lists;
 import org.hibernate.shards.util.Sets;
 
-import org.hibernate.criterion.Projection;
-
 import java.util.List;
 import java.util.Set;
 

Modified: shards/trunk/src/java/org/hibernate/shards/strategy/exit/FirstResultExitOperation.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/strategy/exit/FirstResultExitOperation.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/strategy/exit/FirstResultExitOperation.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,8 +18,8 @@
 
 package org.hibernate.shards.strategy.exit;
 
+import java.util.Collections;
 import java.util.List;
-import java.util.Collections;
 
 /**
  * @author maulik at google.com (Maulik Shah)

Modified: shards/trunk/src/java/org/hibernate/shards/strategy/exit/OrderExitOperation.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/strategy/exit/OrderExitOperation.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/strategy/exit/OrderExitOperation.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,10 +18,9 @@
 
 package org.hibernate.shards.strategy.exit;
 
-import org.hibernate.shards.util.Preconditions;
-
 import org.hibernate.criterion.Order;
 import org.hibernate.engine.SessionFactoryImplementor;
+import org.hibernate.shards.util.Preconditions;
 
 import java.util.Collections;
 import java.util.Comparator;

Modified: shards/trunk/src/java/org/hibernate/shards/strategy/exit/RowCountExitOperation.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/strategy/exit/RowCountExitOperation.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/strategy/exit/RowCountExitOperation.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,10 +18,9 @@
 
 package org.hibernate.shards.strategy.exit;
 
-import org.hibernate.shards.util.Preconditions;
-
 import org.hibernate.criterion.Projection;
 import org.hibernate.criterion.RowCountProjection;
+import org.hibernate.shards.util.Preconditions;
 
 import java.util.Collections;
 import java.util.List;

Modified: shards/trunk/src/java/org/hibernate/shards/strategy/exit/ShardedAvgExitOperation.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/strategy/exit/ShardedAvgExitOperation.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/strategy/exit/ShardedAvgExitOperation.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,12 +18,11 @@
 
 package org.hibernate.shards.strategy.exit;
 
-import org.hibernate.shards.util.Lists;
-import org.hibernate.shards.util.Pair;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.hibernate.criterion.Projection;
+import org.hibernate.shards.util.Lists;
+import org.hibernate.shards.util.Pair;
 
 import java.math.BigDecimal;
 import java.util.List;

Modified: shards/trunk/src/java/org/hibernate/shards/transaction/ShardedTransactionImpl.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/transaction/ShardedTransactionImpl.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/transaction/ShardedTransactionImpl.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -31,13 +31,12 @@
 import org.hibernate.shards.session.SetupTransactionOpenSessionEvent;
 import org.hibernate.shards.util.Lists;
 
+import javax.transaction.Status;
+import javax.transaction.Synchronization;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import javax.transaction.Status;
-import javax.transaction.Synchronization;
-
 /**
  * @author tomislav at google.com (Tomislav Nad)
  */

Modified: shards/trunk/src/java/org/hibernate/shards/util/InterceptorDecorator.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/util/InterceptorDecorator.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/java/org/hibernate/shards/util/InterceptorDecorator.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,9 +18,9 @@
 
 package org.hibernate.shards.util;
 
-import org.hibernate.Interceptor;
 import org.hibernate.CallbackException;
 import org.hibernate.EntityMode;
+import org.hibernate.Interceptor;
 import org.hibernate.Transaction;
 import org.hibernate.type.Type;
 

Modified: shards/trunk/src/test/org/hibernate/shards/NonPermutedTests.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/NonPermutedTests.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/NonPermutedTests.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,7 +18,6 @@
 package org.hibernate.shards;
 
 import junit.framework.TestCase;
-
 import org.hibernate.shards.util.Lists;
 
 import java.util.Collections;

Modified: shards/trunk/src/test/org/hibernate/shards/ShardImplTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/ShardImplTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/ShardImplTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -19,10 +19,28 @@
 package org.hibernate.shards;
 
 import junit.framework.TestCase;
-import org.hibernate.*;
-import org.hibernate.shards.criteria.*;
-import org.hibernate.shards.defaultmock.*;
-import org.hibernate.shards.query.*;
+import org.hibernate.Criteria;
+import org.hibernate.HibernateException;
+import org.hibernate.Interceptor;
+import org.hibernate.Query;
+import org.hibernate.Session;
+import org.hibernate.shards.criteria.CriteriaEvent;
+import org.hibernate.shards.criteria.CriteriaEventDefaultMock;
+import org.hibernate.shards.criteria.CriteriaFactory;
+import org.hibernate.shards.criteria.CriteriaFactoryDefaultMock;
+import org.hibernate.shards.criteria.CriteriaId;
+import org.hibernate.shards.criteria.ShardedCriteriaDefaultMock;
+import org.hibernate.shards.defaultmock.CriteriaDefaultMock;
+import org.hibernate.shards.defaultmock.InterceptorDefaultMock;
+import org.hibernate.shards.defaultmock.QueryDefaultMock;
+import org.hibernate.shards.defaultmock.SessionDefaultMock;
+import org.hibernate.shards.defaultmock.SessionFactoryDefaultMock;
+import org.hibernate.shards.query.QueryEvent;
+import org.hibernate.shards.query.QueryEventDefaultMock;
+import org.hibernate.shards.query.QueryFactory;
+import org.hibernate.shards.query.QueryFactoryDefaultMock;
+import org.hibernate.shards.query.QueryId;
+import org.hibernate.shards.query.ShardedQueryDefaultMock;
 import org.hibernate.shards.session.OpenSessionEvent;
 import org.hibernate.shards.session.OpenSessionEventDefaultMock;
 import org.hibernate.shards.util.Sets;

Modified: shards/trunk/src/test/org/hibernate/shards/ShardedConfigurationTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/ShardedConfigurationTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/ShardedConfigurationTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -19,7 +19,6 @@
 package org.hibernate.shards;
 
 import junit.framework.TestCase;
-
 import org.hibernate.SessionFactory;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.cfg.Environment;

Modified: shards/trunk/src/test/org/hibernate/shards/ShardedSessionFactoryDefaultMock.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/ShardedSessionFactoryDefaultMock.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/ShardedSessionFactoryDefaultMock.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,7 +18,12 @@
 
 package org.hibernate.shards;
 
-import org.hibernate.*;
+import org.hibernate.ConnectionReleaseMode;
+import org.hibernate.HibernateException;
+import org.hibernate.Interceptor;
+import org.hibernate.MappingException;
+import org.hibernate.SessionFactory;
+import org.hibernate.StatelessSession;
 import org.hibernate.cache.Cache;
 import org.hibernate.cache.QueryCache;
 import org.hibernate.cache.UpdateTimestampsCache;
@@ -27,7 +32,12 @@
 import org.hibernate.connection.ConnectionProvider;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.function.SQLFunctionRegistry;
-import org.hibernate.engine.*;
+import org.hibernate.engine.FilterDefinition;
+import org.hibernate.engine.NamedQueryDefinition;
+import org.hibernate.engine.NamedSQLQueryDefinition;
+import org.hibernate.engine.ResultSetMappingDefinition;
+import org.hibernate.engine.SessionFactoryImplementor;
+import org.hibernate.engine.SessionImplementor;
 import org.hibernate.engine.query.QueryPlanCache;
 import org.hibernate.exception.SQLExceptionConverter;
 import org.hibernate.id.IdentifierGenerator;

Modified: shards/trunk/src/test/org/hibernate/shards/ShardedTransactionDefaultMock.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/ShardedTransactionDefaultMock.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/ShardedTransactionDefaultMock.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,8 +18,8 @@
 
 package org.hibernate.shards;
 
+import org.hibernate.HibernateException;
 import org.hibernate.Session;
-import org.hibernate.HibernateException;
 
 import javax.transaction.Synchronization;
 

Modified: shards/trunk/src/test/org/hibernate/shards/criteria/CreateSubcriteriaEventTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/criteria/CreateSubcriteriaEventTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/criteria/CreateSubcriteriaEventTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -19,7 +19,6 @@
 package org.hibernate.shards.criteria;
 
 import junit.framework.TestCase;
-
 import org.hibernate.Criteria;
 import org.hibernate.shards.defaultmock.CriteriaDefaultMock;
 

Modified: shards/trunk/src/test/org/hibernate/shards/criteria/ShardedCriteriaDefaultMock.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/criteria/ShardedCriteriaDefaultMock.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/criteria/ShardedCriteriaDefaultMock.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,7 +18,14 @@
 
 package org.hibernate.shards.criteria;
 
-import org.hibernate.*;
+import org.hibernate.CacheMode;
+import org.hibernate.Criteria;
+import org.hibernate.FetchMode;
+import org.hibernate.FlushMode;
+import org.hibernate.HibernateException;
+import org.hibernate.LockMode;
+import org.hibernate.ScrollMode;
+import org.hibernate.ScrollableResults;
 import org.hibernate.criterion.Criterion;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Projection;

Modified: shards/trunk/src/test/org/hibernate/shards/criteria/ShardedSubcriteriaImplTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/criteria/ShardedSubcriteriaImplTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/criteria/ShardedSubcriteriaImplTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,19 +18,17 @@
 
 package org.hibernate.shards.criteria;
 
-import org.hibernate.shards.defaultmock.CriteriaDefaultMock;
-import org.hibernate.shards.Shard;
-import org.hibernate.shards.ShardDefaultMock;
-import org.hibernate.shards.ShardId;
-import org.hibernate.shards.util.Sets;
-import org.hibernate.shards.util.Lists;
-
 import junit.framework.TestCase;
-
 import org.hibernate.Criteria;
 import org.hibernate.HibernateException;
 import org.hibernate.ScrollMode;
 import org.hibernate.ScrollableResults;
+import org.hibernate.shards.Shard;
+import org.hibernate.shards.ShardDefaultMock;
+import org.hibernate.shards.ShardId;
+import org.hibernate.shards.defaultmock.CriteriaDefaultMock;
+import org.hibernate.shards.util.Lists;
+import org.hibernate.shards.util.Sets;
 
 import java.util.List;
 import java.util.Set;

Modified: shards/trunk/src/test/org/hibernate/shards/defaultmock/ClassMetadataDefaultMock.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/defaultmock/ClassMetadataDefaultMock.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/defaultmock/ClassMetadataDefaultMock.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,14 +18,14 @@
 
 package org.hibernate.shards.defaultmock;
 
+import org.hibernate.EntityMode;
+import org.hibernate.HibernateException;
+import org.hibernate.engine.SessionImplementor;
 import org.hibernate.metadata.ClassMetadata;
 import org.hibernate.type.Type;
-import org.hibernate.HibernateException;
-import org.hibernate.EntityMode;
-import org.hibernate.engine.SessionImplementor;
 
+import java.io.Serializable;
 import java.util.Map;
-import java.io.Serializable;
 
 /**
  * @author maxr at google.com (Max Ross)

Modified: shards/trunk/src/test/org/hibernate/shards/defaultmock/CriteriaDefaultMock.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/defaultmock/CriteriaDefaultMock.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/defaultmock/CriteriaDefaultMock.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,7 +18,14 @@
 
 package org.hibernate.shards.defaultmock;
 
-import org.hibernate.*;
+import org.hibernate.CacheMode;
+import org.hibernate.Criteria;
+import org.hibernate.FetchMode;
+import org.hibernate.FlushMode;
+import org.hibernate.HibernateException;
+import org.hibernate.LockMode;
+import org.hibernate.ScrollMode;
+import org.hibernate.ScrollableResults;
 import org.hibernate.criterion.Criterion;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Projection;

Modified: shards/trunk/src/test/org/hibernate/shards/defaultmock/EntityPersisterDefaultMock.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/defaultmock/EntityPersisterDefaultMock.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/defaultmock/EntityPersisterDefaultMock.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,26 +18,26 @@
 
 package org.hibernate.shards.defaultmock;
 
-import org.hibernate.persister.entity.EntityPersister;
-import org.hibernate.MappingException;
+import org.hibernate.EntityMode;
 import org.hibernate.HibernateException;
 import org.hibernate.LockMode;
-import org.hibernate.EntityMode;
-import org.hibernate.tuple.entity.EntityMetamodel;
-import org.hibernate.metadata.ClassMetadata;
+import org.hibernate.MappingException;
 import org.hibernate.cache.CacheConcurrencyStrategy;
 import org.hibernate.cache.entry.CacheEntryStructure;
+import org.hibernate.engine.CascadeStyle;
+import org.hibernate.engine.SessionFactoryImplementor;
+import org.hibernate.engine.SessionImplementor;
+import org.hibernate.engine.ValueInclusion;
 import org.hibernate.id.IdentifierGenerator;
+import org.hibernate.metadata.ClassMetadata;
+import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.tuple.entity.EntityMetamodel;
 import org.hibernate.type.Type;
 import org.hibernate.type.VersionType;
-import org.hibernate.engine.SessionFactoryImplementor;
-import org.hibernate.engine.SessionImplementor;
-import org.hibernate.engine.CascadeStyle;
-import org.hibernate.engine.ValueInclusion;
 
 import java.io.Serializable;
+import java.util.Comparator;
 import java.util.Map;
-import java.util.Comparator;
 
 /**
  * @author maulik at google.com (Maulik Shah)

Modified: shards/trunk/src/test/org/hibernate/shards/defaultmock/QueryDefaultMock.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/defaultmock/QueryDefaultMock.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/defaultmock/QueryDefaultMock.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,14 +18,26 @@
 
 package org.hibernate.shards.defaultmock;
 
-import org.hibernate.*;
+import org.hibernate.CacheMode;
+import org.hibernate.FlushMode;
+import org.hibernate.HibernateException;
+import org.hibernate.LockMode;
+import org.hibernate.Query;
+import org.hibernate.ScrollMode;
+import org.hibernate.ScrollableResults;
 import org.hibernate.transform.ResultTransformer;
 import org.hibernate.type.Type;
 
-import java.util.*;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
 
 /**
  * @author maulik at google.com (Maulik Shah)

Modified: shards/trunk/src/test/org/hibernate/shards/defaultmock/SessionFactoryDefaultMock.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/defaultmock/SessionFactoryDefaultMock.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/defaultmock/SessionFactoryDefaultMock.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,7 +18,11 @@
 
 package org.hibernate.shards.defaultmock;
 
-import org.hibernate.*;
+import org.hibernate.ConnectionReleaseMode;
+import org.hibernate.HibernateException;
+import org.hibernate.Interceptor;
+import org.hibernate.MappingException;
+import org.hibernate.StatelessSession;
 import org.hibernate.cache.Cache;
 import org.hibernate.cache.QueryCache;
 import org.hibernate.cache.UpdateTimestampsCache;
@@ -27,7 +31,11 @@
 import org.hibernate.connection.ConnectionProvider;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.function.SQLFunctionRegistry;
-import org.hibernate.engine.*;
+import org.hibernate.engine.FilterDefinition;
+import org.hibernate.engine.NamedQueryDefinition;
+import org.hibernate.engine.NamedSQLQueryDefinition;
+import org.hibernate.engine.ResultSetMappingDefinition;
+import org.hibernate.engine.SessionFactoryImplementor;
 import org.hibernate.engine.query.QueryPlanCache;
 import org.hibernate.exception.SQLExceptionConverter;
 import org.hibernate.id.IdentifierGenerator;

Modified: shards/trunk/src/test/org/hibernate/shards/defaultmock/SessionImplementorDefaultMock.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/defaultmock/SessionImplementorDefaultMock.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/defaultmock/SessionImplementorDefaultMock.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,35 +18,35 @@
 
 package org.hibernate.shards.defaultmock;
 
-import org.hibernate.engine.SessionImplementor;
-import org.hibernate.engine.SessionFactoryImplementor;
-import org.hibernate.engine.QueryParameters;
+import org.hibernate.CacheMode;
+import org.hibernate.EntityMode;
+import org.hibernate.FlushMode;
+import org.hibernate.HibernateException;
+import org.hibernate.Interceptor;
+import org.hibernate.Query;
+import org.hibernate.ScrollMode;
+import org.hibernate.ScrollableResults;
+import org.hibernate.Transaction;
+import org.hibernate.collection.PersistentCollection;
 import org.hibernate.engine.EntityKey;
 import org.hibernate.engine.PersistenceContext;
+import org.hibernate.engine.QueryParameters;
+import org.hibernate.engine.SessionFactoryImplementor;
+import org.hibernate.engine.SessionImplementor;
 import org.hibernate.engine.query.sql.NativeSQLQuerySpecification;
-import org.hibernate.Interceptor;
-import org.hibernate.HibernateException;
-import org.hibernate.ScrollableResults;
-import org.hibernate.ScrollMode;
-import org.hibernate.Transaction;
-import org.hibernate.EntityMode;
-import org.hibernate.CacheMode;
-import org.hibernate.FlushMode;
-import org.hibernate.Query;
 import org.hibernate.event.EventListeners;
-import org.hibernate.type.Type;
-import org.hibernate.loader.custom.CustomQuery;
-import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.impl.CriteriaImpl;
 import org.hibernate.jdbc.Batcher;
 import org.hibernate.jdbc.JDBCContext;
-import org.hibernate.collection.PersistentCollection;
+import org.hibernate.loader.custom.CustomQuery;
+import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.type.Type;
 
 import java.io.Serializable;
+import java.sql.Connection;
+import java.util.Iterator;
 import java.util.List;
-import java.util.Iterator;
 import java.util.Map;
-import java.sql.Connection;
 
 /**
  * @author maxr at google.com (Max Ross)

Modified: shards/trunk/src/test/org/hibernate/shards/defaultmock/TypeDefaultMock.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/defaultmock/TypeDefaultMock.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/defaultmock/TypeDefaultMock.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,20 +18,20 @@
 
 package org.hibernate.shards.defaultmock;
 
-import org.hibernate.type.Type;
-import org.hibernate.type.ForeignKeyDirection;
+import org.dom4j.Node;
+import org.hibernate.EntityMode;
+import org.hibernate.HibernateException;
+import org.hibernate.MappingException;
 import org.hibernate.engine.Mapping;
 import org.hibernate.engine.SessionFactoryImplementor;
 import org.hibernate.engine.SessionImplementor;
-import org.hibernate.MappingException;
-import org.hibernate.EntityMode;
-import org.hibernate.HibernateException;
-import org.dom4j.Node;
+import org.hibernate.type.ForeignKeyDirection;
+import org.hibernate.type.Type;
 
+import java.io.Serializable;
+import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.PreparedStatement;
-import java.io.Serializable;
 import java.util.Map;
 
 /**

Modified: shards/trunk/src/test/org/hibernate/shards/engine/ShardedSessionImplementorDefaultMock.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/engine/ShardedSessionImplementorDefaultMock.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/engine/ShardedSessionImplementorDefaultMock.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,30 +18,29 @@
 
 package org.hibernate.shards.engine;
 
-import org.hibernate.shards.Shard;
-import org.hibernate.shards.ShardId;
-
-import org.hibernate.HibernateException;
-import org.hibernate.Query;
+import org.hibernate.CacheMode;
+import org.hibernate.Criteria;
 import org.hibernate.EntityMode;
+import org.hibernate.Filter;
 import org.hibernate.FlushMode;
-import org.hibernate.CacheMode;
-import org.hibernate.SessionFactory;
+import org.hibernate.HibernateException;
 import org.hibernate.LockMode;
+import org.hibernate.Query;
 import org.hibernate.ReplicationMode;
-import org.hibernate.Transaction;
-import org.hibernate.Criteria;
 import org.hibernate.SQLQuery;
-import org.hibernate.Filter;
+import org.hibernate.SessionFactory;
+import org.hibernate.Transaction;
 import org.hibernate.classic.Session;
+import org.hibernate.shards.Shard;
+import org.hibernate.shards.ShardId;
 import org.hibernate.stat.SessionStatistics;
 import org.hibernate.type.Type;
 
-import java.util.List;
-import java.util.Iterator;
-import java.util.Collection;
 import java.io.Serializable;
 import java.sql.Connection;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
 
 /**
  * @author tomislav at google.com (Tomislav Nad)

Modified: shards/trunk/src/test/org/hibernate/shards/id/ShardedTableHiLoGeneratorTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/id/ShardedTableHiLoGeneratorTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/id/ShardedTableHiLoGeneratorTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,12 +18,7 @@
 
 package org.hibernate.shards.id;
 
-import org.hibernate.shards.defaultmock.SessionDefaultMock;
-import org.hibernate.shards.defaultmock.SessionImplementorDefaultMock;
-import org.hibernate.shards.session.ControlSessionProvider;
-
 import junit.framework.TestCase;
-
 import org.hibernate.HibernateException;
 import org.hibernate.Interceptor;
 import org.hibernate.Query;
@@ -43,13 +38,16 @@
 import org.hibernate.jdbc.JDBCContext;
 import org.hibernate.loader.custom.CustomQuery;
 import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.shards.defaultmock.SessionDefaultMock;
+import org.hibernate.shards.defaultmock.SessionImplementorDefaultMock;
+import org.hibernate.shards.session.ControlSessionProvider;
 import org.hibernate.type.Type;
 
 import java.io.Serializable;
+import java.sql.Connection;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.sql.Connection;
 
 /**
  * @author maxr at google.com (Max Ross)

Modified: shards/trunk/src/test/org/hibernate/shards/id/ShardedUUIDGeneratorTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/id/ShardedUUIDGeneratorTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/id/ShardedUUIDGeneratorTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,11 +18,10 @@
 
 package org.hibernate.shards.id;
 
+import junit.framework.TestCase;
 import org.hibernate.shards.ShardId;
 import org.hibernate.shards.session.ShardedSessionImpl;
 
-import junit.framework.TestCase;
-
 import java.io.Serializable;
 import java.util.Properties;
 

Modified: shards/trunk/src/test/org/hibernate/shards/integration/BaseShardingIntegrationTestCase.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/integration/BaseShardingIntegrationTestCase.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/integration/BaseShardingIntegrationTestCase.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -19,7 +19,6 @@
 package org.hibernate.shards.integration;
 
 import junit.framework.TestCase;
-
 import org.hibernate.Session;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.shards.ShardId;

Modified: shards/trunk/src/test/org/hibernate/shards/integration/MemoryLeakPlugger.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/integration/MemoryLeakPlugger.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/integration/MemoryLeakPlugger.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -19,7 +19,6 @@
 package org.hibernate.shards.integration;
 
 import net.sf.cglib.proxy.Callback;
-
 import org.hibernate.engine.StatefulPersistenceContext;
 import org.hibernate.impl.SessionImpl;
 import org.hibernate.shards.Shard;

Modified: shards/trunk/src/test/org/hibernate/shards/integration/PermutedIntegrationTests.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/integration/PermutedIntegrationTests.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/integration/PermutedIntegrationTests.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,6 +18,9 @@
 
 package org.hibernate.shards.integration;
 
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
 import org.hibernate.shards.integration.id.IdGeneratorPermutedIntegrationTest;
 import org.hibernate.shards.integration.model.InterceptorBehaviorPermutedIntegrationTest;
 import org.hibernate.shards.integration.model.ModelCriteriaPermutedIntegrationTest;
@@ -25,10 +28,6 @@
 import org.hibernate.shards.integration.model.ModelQueryPermutedIntegrationTest;
 import org.hibernate.shards.util.Lists;
 
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Enumeration;

Modified: shards/trunk/src/test/org/hibernate/shards/integration/id/IdGeneratorPermutedIntegrationTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/integration/id/IdGeneratorPermutedIntegrationTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/integration/id/IdGeneratorPermutedIntegrationTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -23,7 +23,6 @@
 import org.hibernate.shards.model.Building;
 import org.hibernate.shards.util.Lists;
 
-
 import java.util.List;
 
 /**

Modified: shards/trunk/src/test/org/hibernate/shards/integration/model/InterceptorBehaviorPermutedIntegrationTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/integration/model/InterceptorBehaviorPermutedIntegrationTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/integration/model/InterceptorBehaviorPermutedIntegrationTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,19 +18,18 @@
 
 package org.hibernate.shards.integration.model;
 
-import org.hibernate.shards.integration.BaseShardingIntegrationTestCase;
-import org.hibernate.shards.model.Building;
-import org.hibernate.shards.session.BaseStatefulInterceptorFactory;
-import org.hibernate.shards.session.ShardedSession;
-import org.hibernate.shards.session.RequiresSession;
-import org.hibernate.shards.util.Lists;
-
 import org.hibernate.CallbackException;
 import org.hibernate.EmptyInterceptor;
 import org.hibernate.Interceptor;
-import org.hibernate.TransactionException;
 import org.hibernate.Session;
+import org.hibernate.TransactionException;
 import org.hibernate.impl.SessionImpl;
+import org.hibernate.shards.integration.BaseShardingIntegrationTestCase;
+import org.hibernate.shards.model.Building;
+import org.hibernate.shards.session.BaseStatefulInterceptorFactory;
+import org.hibernate.shards.session.RequiresSession;
+import org.hibernate.shards.session.ShardedSession;
+import org.hibernate.shards.util.Lists;
 import org.hibernate.type.Type;
 
 import java.io.Serializable;

Modified: shards/trunk/src/test/org/hibernate/shards/integration/model/MemoryLeakTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/integration/model/MemoryLeakTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/integration/model/MemoryLeakTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,6 +18,12 @@
 
 package org.hibernate.shards.integration.model;
 
+import junit.framework.TestCase;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.cfg.Configuration;
+import org.hibernate.engine.StatefulPersistenceContext;
+import org.hibernate.impl.SessionImpl;
 import org.hibernate.shards.integration.IdGenType;
 import org.hibernate.shards.integration.MemoryLeakPlugger;
 import static org.hibernate.shards.integration.model.ModelDataFactory.person;
@@ -29,14 +35,6 @@
 import org.hibernate.shards.util.JdbcUtil;
 import org.hibernate.shards.util.Lists;
 
-import junit.framework.TestCase;
-
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-import org.hibernate.cfg.Configuration;
-import org.hibernate.engine.StatefulPersistenceContext;
-import org.hibernate.impl.SessionImpl;
-
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.sql.Connection;

Modified: shards/trunk/src/test/org/hibernate/shards/integration/model/ModelCriteriaPermutedIntegrationTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/integration/model/ModelCriteriaPermutedIntegrationTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/integration/model/ModelCriteriaPermutedIntegrationTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -19,18 +19,16 @@
 package org.hibernate.shards.integration.model;
 
 
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Order;
+import org.hibernate.criterion.Projections;
+import org.hibernate.criterion.Restrictions;
 import org.hibernate.shards.integration.BaseShardingIntegrationTestCase;
 import org.hibernate.shards.model.Building;
 import org.hibernate.shards.model.Floor;
 import org.hibernate.shards.model.Office;
 import org.hibernate.shards.util.Lists;
 
-
-import org.hibernate.Criteria;
-import org.hibernate.criterion.Order;
-import org.hibernate.criterion.Projections;
-import org.hibernate.criterion.Restrictions;
-
 import java.math.BigDecimal;
 import java.util.List;
 

Modified: shards/trunk/src/test/org/hibernate/shards/integration/model/ModelDataFactory.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/integration/model/ModelDataFactory.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/integration/model/ModelDataFactory.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -22,9 +22,9 @@
 import org.hibernate.shards.model.Elevator;
 import org.hibernate.shards.model.Escalator;
 import org.hibernate.shards.model.Floor;
+import org.hibernate.shards.model.Office;
+import org.hibernate.shards.model.Person;
 import org.hibernate.shards.model.Tenant;
-import org.hibernate.shards.model.Person;
-import org.hibernate.shards.model.Office;
 import org.hibernate.shards.model.Window;
 
 import java.util.List;

Modified: shards/trunk/src/test/org/hibernate/shards/integration/model/ModelPermutedIntegrationTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/integration/model/ModelPermutedIntegrationTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/integration/model/ModelPermutedIntegrationTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,15 +18,32 @@
 
 package org.hibernate.shards.integration.model;
 
-import org.hibernate.*;
+import org.hibernate.HibernateException;
+import org.hibernate.LockMode;
+import org.hibernate.ReplicationMode;
+import org.hibernate.SessionFactory;
+import org.hibernate.TransactionException;
 import org.hibernate.classic.Session;
 import org.hibernate.criterion.Projections;
 import org.hibernate.proxy.HibernateProxy;
 import org.hibernate.shards.ShardId;
 import org.hibernate.shards.integration.BaseShardingIntegrationTestCase;
 import org.hibernate.shards.integration.MemoryLeakPlugger;
-import static org.hibernate.shards.integration.model.ModelDataFactory.*;
-import org.hibernate.shards.model.*;
+import static org.hibernate.shards.integration.model.ModelDataFactory.building;
+import static org.hibernate.shards.integration.model.ModelDataFactory.elevator;
+import static org.hibernate.shards.integration.model.ModelDataFactory.escalator;
+import static org.hibernate.shards.integration.model.ModelDataFactory.floor;
+import static org.hibernate.shards.integration.model.ModelDataFactory.office;
+import static org.hibernate.shards.integration.model.ModelDataFactory.person;
+import static org.hibernate.shards.integration.model.ModelDataFactory.tenant;
+import static org.hibernate.shards.integration.model.ModelDataFactory.window;
+import org.hibernate.shards.model.Building;
+import org.hibernate.shards.model.Escalator;
+import org.hibernate.shards.model.Floor;
+import org.hibernate.shards.model.Office;
+import org.hibernate.shards.model.Person;
+import org.hibernate.shards.model.Tenant;
+import org.hibernate.shards.model.Window;
 import org.hibernate.shards.session.ShardedSessionFactory;
 import org.hibernate.shards.session.ShardedSessionImpl;
 import org.hibernate.shards.session.SubsetShardedSessionFactoryImpl;

Modified: shards/trunk/src/test/org/hibernate/shards/integration/model/ModelQueryPermutedIntegrationTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/integration/model/ModelQueryPermutedIntegrationTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/integration/model/ModelQueryPermutedIntegrationTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,13 +18,12 @@
 
 package org.hibernate.shards.integration.model;
 
+import org.hibernate.Query;
 import org.hibernate.shards.integration.BaseShardingIntegrationTestCase;
 import org.hibernate.shards.model.Building;
 import org.hibernate.shards.model.Floor;
 import org.hibernate.shards.model.Office;
 
-import org.hibernate.Query;
-
 import java.util.List;
 
 /**

Modified: shards/trunk/src/test/org/hibernate/shards/query/SetBigDecimalEventTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/query/SetBigDecimalEventTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/query/SetBigDecimalEventTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,9 +18,9 @@
 
 package org.hibernate.shards.query;
 
-import org.hibernate.shards.defaultmock.QueryDefaultMock;
 import junit.framework.TestCase;
 import org.hibernate.Query;
+import org.hibernate.shards.defaultmock.QueryDefaultMock;
 
 import java.math.BigDecimal;
 

Modified: shards/trunk/src/test/org/hibernate/shards/query/SetBigIntegerEventTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/query/SetBigIntegerEventTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/query/SetBigIntegerEventTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -19,7 +19,6 @@
 package org.hibernate.shards.query;
 
 import junit.framework.TestCase;
-
 import org.hibernate.Query;
 import org.hibernate.shards.defaultmock.QueryDefaultMock;
 

Modified: shards/trunk/src/test/org/hibernate/shards/query/SetBinaryEventTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/query/SetBinaryEventTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/query/SetBinaryEventTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,9 +18,10 @@
 
 package org.hibernate.shards.query;
 
-import org.hibernate.shards.defaultmock.QueryDefaultMock;
 import junit.framework.TestCase;
 import org.hibernate.Query;
+import org.hibernate.shards.defaultmock.QueryDefaultMock;
+
 /**
  * @author maulik at google.com (Maulik Shah)
  */

Modified: shards/trunk/src/test/org/hibernate/shards/query/SetBooleanEventTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/query/SetBooleanEventTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/query/SetBooleanEventTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,10 +18,10 @@
 
 package org.hibernate.shards.query;
 
+import junit.framework.TestCase;
+import org.hibernate.Query;
 import org.hibernate.shards.defaultmock.QueryDefaultMock;
 
-import junit.framework.TestCase;
-import org.hibernate.Query;
 /**
  * @author maulik at google.com (Maulik Shah)
  */

Modified: shards/trunk/src/test/org/hibernate/shards/query/SetByteEventTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/query/SetByteEventTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/query/SetByteEventTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,10 +18,10 @@
 
 package org.hibernate.shards.query;
 
+import junit.framework.TestCase;
+import org.hibernate.Query;
 import org.hibernate.shards.defaultmock.QueryDefaultMock;
 
-import junit.framework.TestCase;
-import org.hibernate.Query;
 /**
  * @author maulik at google.com (Maulik Shah)
  */

Modified: shards/trunk/src/test/org/hibernate/shards/query/SetCacheModeEventTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/query/SetCacheModeEventTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/query/SetCacheModeEventTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,11 +18,10 @@
 
 package org.hibernate.shards.query;
 
-import org.hibernate.shards.defaultmock.QueryDefaultMock;
-
 import junit.framework.TestCase;
-import org.hibernate.Query;
 import org.hibernate.CacheMode;
+import org.hibernate.Query;
+import org.hibernate.shards.defaultmock.QueryDefaultMock;
 
 /**
  * @author maulik at google.com (Maulik Shah)

Modified: shards/trunk/src/test/org/hibernate/shards/query/SetCacheRegionEventTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/query/SetCacheRegionEventTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/query/SetCacheRegionEventTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,10 +18,10 @@
 
 package org.hibernate.shards.query;
 
+import junit.framework.TestCase;
+import org.hibernate.Query;
 import org.hibernate.shards.defaultmock.QueryDefaultMock;
 
-import junit.framework.TestCase;
-import org.hibernate.Query;
 /**
  * @author maulik at google.com (Maulik Shah)
  */

Modified: shards/trunk/src/test/org/hibernate/shards/query/SetCacheableEventTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/query/SetCacheableEventTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/query/SetCacheableEventTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,10 +18,10 @@
 
 package org.hibernate.shards.query;
 
+import junit.framework.TestCase;
+import org.hibernate.Query;
 import org.hibernate.shards.defaultmock.QueryDefaultMock;
 
-import junit.framework.TestCase;
-import org.hibernate.Query;
 /**
  * @author maulik at google.com (Maulik Shah)
  */

Modified: shards/trunk/src/test/org/hibernate/shards/query/SetCalendarDateEventTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/query/SetCalendarDateEventTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/query/SetCalendarDateEventTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,10 +18,9 @@
 
 package org.hibernate.shards.query;
 
-import org.hibernate.shards.defaultmock.QueryDefaultMock;
-
 import junit.framework.TestCase;
 import org.hibernate.Query;
+import org.hibernate.shards.defaultmock.QueryDefaultMock;
 
 import java.util.Calendar;
 

Modified: shards/trunk/src/test/org/hibernate/shards/query/SetCalendarEventTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/query/SetCalendarEventTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/query/SetCalendarEventTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,9 +18,9 @@
 
 package org.hibernate.shards.query;
 
-import org.hibernate.shards.defaultmock.QueryDefaultMock;
 import junit.framework.TestCase;
 import org.hibernate.Query;
+import org.hibernate.shards.defaultmock.QueryDefaultMock;
 
 import java.util.Calendar;
 

Modified: shards/trunk/src/test/org/hibernate/shards/query/SetCharacterEventTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/query/SetCharacterEventTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/query/SetCharacterEventTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,10 +18,10 @@
 
 package org.hibernate.shards.query;
 
+import junit.framework.TestCase;
+import org.hibernate.Query;
 import org.hibernate.shards.defaultmock.QueryDefaultMock;
 
-import junit.framework.TestCase;
-import org.hibernate.Query;
 /**
  * @author maulik at google.com (Maulik Shah)
  */

Modified: shards/trunk/src/test/org/hibernate/shards/query/SetCommentEventTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/query/SetCommentEventTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/query/SetCommentEventTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,9 +18,10 @@
 
 package org.hibernate.shards.query;
 
-import org.hibernate.shards.defaultmock.QueryDefaultMock;
 import junit.framework.TestCase;
 import org.hibernate.Query;
+import org.hibernate.shards.defaultmock.QueryDefaultMock;
+
 /**
  * @author maulik at google.com (Maulik Shah)
  */

Modified: shards/trunk/src/test/org/hibernate/shards/query/SetDateEventTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/query/SetDateEventTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/query/SetDateEventTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,9 +18,9 @@
 
 package org.hibernate.shards.query;
 
-import org.hibernate.shards.defaultmock.QueryDefaultMock;
 import junit.framework.TestCase;
 import org.hibernate.Query;
+import org.hibernate.shards.defaultmock.QueryDefaultMock;
 
 import java.util.Date;
 

Modified: shards/trunk/src/test/org/hibernate/shards/query/SetDoubleEventTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/query/SetDoubleEventTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/query/SetDoubleEventTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,10 +18,10 @@
 
 package org.hibernate.shards.query;
 
+import junit.framework.TestCase;
+import org.hibernate.Query;
 import org.hibernate.shards.defaultmock.QueryDefaultMock;
 
-import junit.framework.TestCase;
-import org.hibernate.Query;
 /**
  * @author maulik at google.com (Maulik Shah)
  */

Modified: shards/trunk/src/test/org/hibernate/shards/query/SetEntityEventTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/query/SetEntityEventTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/query/SetEntityEventTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,10 +18,10 @@
 
 package org.hibernate.shards.query;
 
+import junit.framework.TestCase;
+import org.hibernate.Query;
 import org.hibernate.shards.defaultmock.QueryDefaultMock;
 
-import junit.framework.TestCase;
-import org.hibernate.Query;
 /**
  * @author maulik at google.com (Maulik Shah)
  */

Modified: shards/trunk/src/test/org/hibernate/shards/query/SetFetchSizeEventTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/query/SetFetchSizeEventTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/query/SetFetchSizeEventTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,10 +18,10 @@
 
 package org.hibernate.shards.query;
 
+import junit.framework.TestCase;
+import org.hibernate.Query;
 import org.hibernate.shards.defaultmock.QueryDefaultMock;
 
-import junit.framework.TestCase;
-import org.hibernate.Query;
 /**
  * @author maulik at google.com (Maulik Shah)
  */

Modified: shards/trunk/src/test/org/hibernate/shards/query/SetFirstResultEventTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/query/SetFirstResultEventTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/query/SetFirstResultEventTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -19,9 +19,9 @@
 package org.hibernate.shards.query;
 
 import junit.framework.TestCase;
-
 import org.hibernate.Query;
 import org.hibernate.shards.defaultmock.QueryDefaultMock;
+
 /**
  * @author maulik at google.com (Maulik Shah)
  */

Modified: shards/trunk/src/test/org/hibernate/shards/query/SetFloatEventTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/query/SetFloatEventTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/query/SetFloatEventTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -19,9 +19,9 @@
 package org.hibernate.shards.query;
 
 import junit.framework.TestCase;
-
 import org.hibernate.Query;
 import org.hibernate.shards.defaultmock.QueryDefaultMock;
+
 /**
  * @author maulik at google.com (Maulik Shah)
  */

Modified: shards/trunk/src/test/org/hibernate/shards/query/SetFlushModeEventTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/query/SetFlushModeEventTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/query/SetFlushModeEventTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,10 +18,10 @@
 
 package org.hibernate.shards.query;
 
-import org.hibernate.shards.defaultmock.QueryDefaultMock;
 import junit.framework.TestCase;
+import org.hibernate.FlushMode;
 import org.hibernate.Query;
-import org.hibernate.FlushMode;
+import org.hibernate.shards.defaultmock.QueryDefaultMock;
 
 /**
  * @author maulik at google.com (Maulik Shah)

Modified: shards/trunk/src/test/org/hibernate/shards/query/SetIntegerEventTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/query/SetIntegerEventTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/query/SetIntegerEventTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,10 +18,10 @@
 
 package org.hibernate.shards.query;
 
+import junit.framework.TestCase;
+import org.hibernate.Query;
 import org.hibernate.shards.defaultmock.QueryDefaultMock;
 
-import junit.framework.TestCase;
-import org.hibernate.Query;
 /**
  * @author maulik at google.com (Maulik Shah)
  */

Modified: shards/trunk/src/test/org/hibernate/shards/query/SetLocaleEventTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/query/SetLocaleEventTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/query/SetLocaleEventTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,9 +18,9 @@
 
 package org.hibernate.shards.query;
 
-import org.hibernate.shards.defaultmock.QueryDefaultMock;
 import junit.framework.TestCase;
 import org.hibernate.Query;
+import org.hibernate.shards.defaultmock.QueryDefaultMock;
 
 import java.util.Locale;
 

Modified: shards/trunk/src/test/org/hibernate/shards/query/SetLockModeEventTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/query/SetLockModeEventTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/query/SetLockModeEventTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,10 +18,10 @@
 
 package org.hibernate.shards.query;
 
-import org.hibernate.shards.defaultmock.QueryDefaultMock;
 import junit.framework.TestCase;
+import org.hibernate.LockMode;
 import org.hibernate.Query;
-import org.hibernate.LockMode;
+import org.hibernate.shards.defaultmock.QueryDefaultMock;
 
 /**
  * @author maulik at google.com (Maulik Shah)

Modified: shards/trunk/src/test/org/hibernate/shards/query/SetLongEventTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/query/SetLongEventTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/query/SetLongEventTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,10 +18,10 @@
 
 package org.hibernate.shards.query;
 
+import junit.framework.TestCase;
+import org.hibernate.Query;
 import org.hibernate.shards.defaultmock.QueryDefaultMock;
 
-import junit.framework.TestCase;
-import org.hibernate.Query;
 /**
  * @author maulik at google.com (Maulik Shah)
  */

Modified: shards/trunk/src/test/org/hibernate/shards/query/SetMaxResultsEventTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/query/SetMaxResultsEventTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/query/SetMaxResultsEventTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,9 +18,10 @@
 
 package org.hibernate.shards.query;
 
-import org.hibernate.shards.defaultmock.QueryDefaultMock;
 import junit.framework.TestCase;
 import org.hibernate.Query;
+import org.hibernate.shards.defaultmock.QueryDefaultMock;
+
 /**
  * @author maulik at google.com (Maulik Shah)
  */

Modified: shards/trunk/src/test/org/hibernate/shards/query/SetParameterEventTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/query/SetParameterEventTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/query/SetParameterEventTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,9 +18,9 @@
 
 package org.hibernate.shards.query;
 
-import org.hibernate.shards.defaultmock.QueryDefaultMock;
 import junit.framework.TestCase;
 import org.hibernate.Query;
+import org.hibernate.shards.defaultmock.QueryDefaultMock;
 import org.hibernate.type.Type;
 
 /**

Modified: shards/trunk/src/test/org/hibernate/shards/query/SetParameterListEventTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/query/SetParameterListEventTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/query/SetParameterListEventTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,11 +18,10 @@
 
 package org.hibernate.shards.query;
 
-import org.hibernate.shards.defaultmock.QueryDefaultMock;
-import org.hibernate.shards.util.Lists;
-
 import junit.framework.TestCase;
 import org.hibernate.Query;
+import org.hibernate.shards.defaultmock.QueryDefaultMock;
+import org.hibernate.shards.util.Lists;
 import org.hibernate.type.Type;
 
 import java.util.Collection;

Modified: shards/trunk/src/test/org/hibernate/shards/query/SetParametersEventTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/query/SetParametersEventTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/query/SetParametersEventTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,9 +18,9 @@
 
 package org.hibernate.shards.query;
 
-import org.hibernate.shards.defaultmock.QueryDefaultMock;
 import junit.framework.TestCase;
 import org.hibernate.Query;
+import org.hibernate.shards.defaultmock.QueryDefaultMock;
 import org.hibernate.type.Type;
 
 /**

Modified: shards/trunk/src/test/org/hibernate/shards/query/SetPropertiesEventTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/query/SetPropertiesEventTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/query/SetPropertiesEventTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,12 +18,12 @@
 
 package org.hibernate.shards.query;
 
-import org.hibernate.shards.defaultmock.QueryDefaultMock;
 import junit.framework.TestCase;
 import org.hibernate.Query;
+import org.hibernate.shards.defaultmock.QueryDefaultMock;
 
+import java.util.Collections;
 import java.util.Map;
-import java.util.Collections;
 
 /**
  * @author maulik at google.com (Maulik Shah)

Modified: shards/trunk/src/test/org/hibernate/shards/query/SetReadOnlyEventTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/query/SetReadOnlyEventTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/query/SetReadOnlyEventTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,9 +18,10 @@
 
 package org.hibernate.shards.query;
 
-import org.hibernate.shards.defaultmock.QueryDefaultMock;
 import junit.framework.TestCase;
 import org.hibernate.Query;
+import org.hibernate.shards.defaultmock.QueryDefaultMock;
+
 /**
  * @author maulik at google.com (Maulik Shah)
  */

Modified: shards/trunk/src/test/org/hibernate/shards/query/SetResultTransformerEventTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/query/SetResultTransformerEventTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/query/SetResultTransformerEventTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,10 +18,9 @@
 
 package org.hibernate.shards.query;
 
-import org.hibernate.shards.defaultmock.QueryDefaultMock;
-
 import junit.framework.TestCase;
 import org.hibernate.Query;
+import org.hibernate.shards.defaultmock.QueryDefaultMock;
 import org.hibernate.transform.ResultTransformer;
 
 /**

Modified: shards/trunk/src/test/org/hibernate/shards/query/SetSerializableEventTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/query/SetSerializableEventTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/query/SetSerializableEventTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,9 +18,9 @@
 
 package org.hibernate.shards.query;
 
-import org.hibernate.shards.defaultmock.QueryDefaultMock;
 import junit.framework.TestCase;
 import org.hibernate.Query;
+import org.hibernate.shards.defaultmock.QueryDefaultMock;
 
 import java.io.Serializable;
 

Modified: shards/trunk/src/test/org/hibernate/shards/query/SetShortEventTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/query/SetShortEventTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/query/SetShortEventTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,10 +18,10 @@
 
 package org.hibernate.shards.query;
 
+import junit.framework.TestCase;
+import org.hibernate.Query;
 import org.hibernate.shards.defaultmock.QueryDefaultMock;
 
-import junit.framework.TestCase;
-import org.hibernate.Query;
 /**
  * @author maulik at google.com (Maulik Shah)
  */

Modified: shards/trunk/src/test/org/hibernate/shards/query/SetStringEventTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/query/SetStringEventTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/query/SetStringEventTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,9 +18,10 @@
 
 package org.hibernate.shards.query;
 
-import org.hibernate.shards.defaultmock.QueryDefaultMock;
 import junit.framework.TestCase;
 import org.hibernate.Query;
+import org.hibernate.shards.defaultmock.QueryDefaultMock;
+
 /**
  * @author maulik at google.com (Maulik Shah)
  */

Modified: shards/trunk/src/test/org/hibernate/shards/query/SetTextEventTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/query/SetTextEventTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/query/SetTextEventTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,10 +18,10 @@
 
 package org.hibernate.shards.query;
 
+import junit.framework.TestCase;
+import org.hibernate.Query;
 import org.hibernate.shards.defaultmock.QueryDefaultMock;
 
-import junit.framework.TestCase;
-import org.hibernate.Query;
 /**
  * @author maulik at google.com (Maulik Shah)
  */

Modified: shards/trunk/src/test/org/hibernate/shards/query/SetTimeEventTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/query/SetTimeEventTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/query/SetTimeEventTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,10 +18,9 @@
 
 package org.hibernate.shards.query;
 
-import org.hibernate.shards.defaultmock.QueryDefaultMock;
-
 import junit.framework.TestCase;
 import org.hibernate.Query;
+import org.hibernate.shards.defaultmock.QueryDefaultMock;
 
 import java.util.Date;
 

Modified: shards/trunk/src/test/org/hibernate/shards/query/SetTimeoutEventTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/query/SetTimeoutEventTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/query/SetTimeoutEventTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,9 +18,10 @@
 
 package org.hibernate.shards.query;
 
-import org.hibernate.shards.defaultmock.QueryDefaultMock;
 import junit.framework.TestCase;
 import org.hibernate.Query;
+import org.hibernate.shards.defaultmock.QueryDefaultMock;
+
 /**
  * @author maulik at google.com (Maulik Shah)
  */

Modified: shards/trunk/src/test/org/hibernate/shards/query/SetTimestampEventTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/query/SetTimestampEventTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/query/SetTimestampEventTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,10 +18,9 @@
 
 package org.hibernate.shards.query;
 
-import org.hibernate.shards.defaultmock.QueryDefaultMock;
-
 import junit.framework.TestCase;
 import org.hibernate.Query;
+import org.hibernate.shards.defaultmock.QueryDefaultMock;
 
 import java.util.Date;
 

Modified: shards/trunk/src/test/org/hibernate/shards/query/ShardedQueryDefaultMock.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/query/ShardedQueryDefaultMock.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/query/ShardedQueryDefaultMock.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,14 +18,26 @@
 
 package org.hibernate.shards.query;
 
+import org.hibernate.CacheMode;
+import org.hibernate.FlushMode;
+import org.hibernate.HibernateException;
+import org.hibernate.LockMode;
+import org.hibernate.Query;
+import org.hibernate.ScrollMode;
+import org.hibernate.ScrollableResults;
+import org.hibernate.transform.ResultTransformer;
 import org.hibernate.type.Type;
-import org.hibernate.*;
-import org.hibernate.transform.ResultTransformer;
 
-import java.util.*;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
 
 /**
  * @author maulik at google.com (Maulik Shah)

Modified: shards/trunk/src/test/org/hibernate/shards/session/CrossShardRelationshipDetectingInterceptorDecoratorTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/session/CrossShardRelationshipDetectingInterceptorDecoratorTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/session/CrossShardRelationshipDetectingInterceptorDecoratorTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,13 +18,11 @@
 
 package org.hibernate.shards.session;
 
-import org.hibernate.shards.defaultmock.InterceptorDefaultMock;
-import org.hibernate.shards.ShardId;
-
 import junit.framework.TestCase;
-
-import org.hibernate.Interceptor;
 import org.hibernate.CallbackException;
+import org.hibernate.Interceptor;
+import org.hibernate.shards.ShardId;
+import org.hibernate.shards.defaultmock.InterceptorDefaultMock;
 import org.hibernate.type.Type;
 
 import java.io.Serializable;

Modified: shards/trunk/src/test/org/hibernate/shards/session/CrossShardRelationshipDetectingInterceptorTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/session/CrossShardRelationshipDetectingInterceptorTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/session/CrossShardRelationshipDetectingInterceptorTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,13 +18,11 @@
 
 package org.hibernate.shards.session;
 
-import org.hibernate.shards.defaultmock.TypeDefaultMock;
+import junit.framework.TestCase;
 import org.hibernate.shards.CrossShardAssociationException;
 import org.hibernate.shards.ShardId;
+import org.hibernate.shards.defaultmock.TypeDefaultMock;
 import org.hibernate.shards.util.Pair;
-
-import junit.framework.TestCase;
-
 import org.hibernate.type.Type;
 
 import java.util.List;

Modified: shards/trunk/src/test/org/hibernate/shards/session/ShardIdResolverDefaultMock.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/session/ShardIdResolverDefaultMock.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/session/ShardIdResolverDefaultMock.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,8 +18,8 @@
 
 package org.hibernate.shards.session;
 
+import org.hibernate.shards.Shard;
 import org.hibernate.shards.ShardId;
-import org.hibernate.shards.Shard;
 
 import java.util.List;
 

Modified: shards/trunk/src/test/org/hibernate/shards/session/ShardedSessionFactoryImplTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/session/ShardedSessionFactoryImplTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/session/ShardedSessionFactoryImplTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -36,7 +36,11 @@
 
 import javax.naming.NamingException;
 import java.sql.Connection;
-import java.util.*;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
 
 /**
  * @author maxr at google.com (Max Ross)

Modified: shards/trunk/src/test/org/hibernate/shards/session/ShardedSessionImplTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/session/ShardedSessionImplTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/session/ShardedSessionImplTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -25,7 +25,11 @@
 import org.hibernate.Session;
 import org.hibernate.engine.SessionFactoryImplementor;
 import org.hibernate.metadata.ClassMetadata;
-import org.hibernate.shards.*;
+import org.hibernate.shards.Shard;
+import org.hibernate.shards.ShardDefaultMock;
+import org.hibernate.shards.ShardId;
+import org.hibernate.shards.ShardImpl;
+import org.hibernate.shards.ShardedSessionFactoryDefaultMock;
 import org.hibernate.shards.defaultmock.ClassMetadataDefaultMock;
 import org.hibernate.shards.defaultmock.InterceptorDefaultMock;
 import org.hibernate.shards.defaultmock.SessionFactoryDefaultMock;

Modified: shards/trunk/src/test/org/hibernate/shards/strategy/access/ParallelShardOperationCallableTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/strategy/access/ParallelShardOperationCallableTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/strategy/access/ParallelShardOperationCallableTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,6 +18,7 @@
 
 package org.hibernate.shards.strategy.access;
 
+import junit.framework.TestCase;
 import org.hibernate.shards.Shard;
 import org.hibernate.shards.ShardDefaultMock;
 import org.hibernate.shards.ShardId;
@@ -28,12 +29,10 @@
 import org.hibernate.shards.util.Lists;
 import org.hibernate.shards.util.Sets;
 
-import junit.framework.TestCase;
-
 import java.util.List;
 import java.util.Set;
-import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Callable;
+import java.util.concurrent.CountDownLatch;
 
 /**
  * @author maxr at google.com (Max Ross)

Modified: shards/trunk/src/test/org/hibernate/shards/strategy/access/StartAwareFutureTaskTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/strategy/access/StartAwareFutureTaskTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/strategy/access/StartAwareFutureTaskTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -20,8 +20,8 @@
 
 import junit.framework.TestCase;
 
+import java.util.concurrent.Callable;
 import java.util.concurrent.FutureTask;
-import java.util.concurrent.Callable;
 
 /**
  * @author maxr at google.com (Max Ross)

Modified: shards/trunk/src/test/org/hibernate/shards/strategy/exit/AggregateExitOperationTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/strategy/exit/AggregateExitOperationTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/strategy/exit/AggregateExitOperationTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,14 +18,7 @@
 
 package org.hibernate.shards.strategy.exit;
 
-import org.hibernate.shards.defaultmock.EntityPersisterDefaultMock;
-import org.hibernate.shards.defaultmock.SessionFactoryDefaultMock;
-import org.hibernate.shards.defaultmock.ClassMetadataDefaultMock;
-import org.hibernate.shards.util.Lists;
-import org.hibernate.shards.util.StringUtil;
-
 import junit.framework.TestCase;
-
 import org.hibernate.EntityMode;
 import org.hibernate.HibernateException;
 import org.hibernate.MappingException;
@@ -33,6 +26,11 @@
 import org.hibernate.criterion.Projections;
 import org.hibernate.metadata.ClassMetadata;
 import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.shards.defaultmock.ClassMetadataDefaultMock;
+import org.hibernate.shards.defaultmock.EntityPersisterDefaultMock;
+import org.hibernate.shards.defaultmock.SessionFactoryDefaultMock;
+import org.hibernate.shards.util.Lists;
+import org.hibernate.shards.util.StringUtil;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;

Modified: shards/trunk/src/test/org/hibernate/shards/strategy/exit/FirstNonNullResultExitStrategyTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/strategy/exit/FirstNonNullResultExitStrategyTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/strategy/exit/FirstNonNullResultExitStrategyTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,7 +18,6 @@
 package org.hibernate.shards.strategy.exit;
 
 import junit.framework.TestCase;
-
 import org.hibernate.shards.Shard;
 import org.hibernate.shards.ShardDefaultMock;
 

Modified: shards/trunk/src/test/org/hibernate/shards/strategy/exit/FirstResultExitOperationTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/strategy/exit/FirstResultExitOperationTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/strategy/exit/FirstResultExitOperationTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -19,10 +19,9 @@
 package org.hibernate.shards.strategy.exit;
 
 
+import junit.framework.TestCase;
 import org.hibernate.shards.util.Lists;
 
-import junit.framework.TestCase;
-
 import java.util.List;
 
 /**

Modified: shards/trunk/src/test/org/hibernate/shards/strategy/exit/MaxResultExitOperationTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/strategy/exit/MaxResultExitOperationTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/strategy/exit/MaxResultExitOperationTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -19,10 +19,9 @@
 package org.hibernate.shards.strategy.exit;
 
 
+import junit.framework.TestCase;
 import org.hibernate.shards.util.Lists;
 
-import junit.framework.TestCase;
-
 import java.util.List;
 
 /**

Modified: shards/trunk/src/test/org/hibernate/shards/strategy/exit/OrderExitOperationTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/strategy/exit/OrderExitOperationTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/strategy/exit/OrderExitOperationTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,20 +18,18 @@
 
 package org.hibernate.shards.strategy.exit;
 
-import org.hibernate.shards.defaultmock.ClassMetadataDefaultMock;
-import org.hibernate.shards.defaultmock.EntityPersisterDefaultMock;
-import org.hibernate.shards.defaultmock.SessionFactoryDefaultMock;
-import org.hibernate.shards.util.Lists;
-import org.hibernate.shards.util.StringUtil;
-
 import junit.framework.TestCase;
-
 import org.hibernate.EntityMode;
 import org.hibernate.HibernateException;
 import org.hibernate.MappingException;
 import org.hibernate.criterion.Order;
 import org.hibernate.metadata.ClassMetadata;
 import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.shards.defaultmock.ClassMetadataDefaultMock;
+import org.hibernate.shards.defaultmock.EntityPersisterDefaultMock;
+import org.hibernate.shards.defaultmock.SessionFactoryDefaultMock;
+import org.hibernate.shards.util.Lists;
+import org.hibernate.shards.util.StringUtil;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;

Modified: shards/trunk/src/test/org/hibernate/shards/strategy/exit/ProjectionExitOperationFactoryTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/strategy/exit/ProjectionExitOperationFactoryTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/strategy/exit/ProjectionExitOperationFactoryTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,18 +18,16 @@
 
 package org.hibernate.shards.strategy.exit;
 
-import org.hibernate.shards.defaultmock.EntityPersisterDefaultMock;
-import org.hibernate.shards.defaultmock.SessionFactoryDefaultMock;
-import org.hibernate.shards.util.StringUtil;
-
 import junit.framework.TestCase;
-
 import org.hibernate.EntityMode;
 import org.hibernate.HibernateException;
 import org.hibernate.MappingException;
 import org.hibernate.criterion.Projections;
 import org.hibernate.metadata.ClassMetadata;
 import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.shards.defaultmock.EntityPersisterDefaultMock;
+import org.hibernate.shards.defaultmock.SessionFactoryDefaultMock;
+import org.hibernate.shards.util.StringUtil;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;

Modified: shards/trunk/src/test/org/hibernate/shards/strategy/exit/RowCountExitOperationTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/strategy/exit/RowCountExitOperationTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/strategy/exit/RowCountExitOperationTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -18,11 +18,9 @@
 
 package org.hibernate.shards.strategy.exit;
 
-import org.hibernate.shards.util.Lists;
-
 import junit.framework.TestCase;
-
 import org.hibernate.criterion.Projections;
+import org.hibernate.shards.util.Lists;
 
 import java.util.List;
 

Modified: shards/trunk/src/test/org/hibernate/shards/transaction/ShardedTransactionImplTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/transaction/ShardedTransactionImplTest.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/transaction/ShardedTransactionImplTest.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -19,7 +19,6 @@
 package org.hibernate.shards.transaction;
 
 import junit.framework.TestCase;
-
 import org.hibernate.HibernateException;
 import org.hibernate.Transaction;
 import org.hibernate.TransactionException;
@@ -31,10 +30,9 @@
 import org.hibernate.shards.engine.ShardedSessionImplementorDefaultMock;
 import org.hibernate.shards.util.Lists;
 
+import javax.transaction.Synchronization;
 import java.util.List;
 
-import javax.transaction.Synchronization;
-
 /**
  * @author tomislav at google.com (Tomislav Nad)
  */

Modified: shards/trunk/src/test/org/hibernate/shards/util/JdbcUtil.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/util/JdbcUtil.java	2007-07-11 23:03:33 UTC (rev 12755)
+++ shards/trunk/src/test/org/hibernate/shards/util/JdbcUtil.java	2007-07-12 04:17:22 UTC (rev 12756)
@@ -21,7 +21,11 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
 
 /**
  * Helper methods for Jdbc


