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

hibernate-commits at lists.jboss.org hibernate-commits at lists.jboss.org
Tue May 8 10:55:30 EDT 2007


Author: buurzgoth
Date: 2007-05-08 10:55:29 -0400 (Tue, 08 May 2007)
New Revision: 11482

Modified:
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/BaseHasShardIdList.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/HasShardIdList.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/Shard.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/ShardId.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/ShardImpl.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/AddCriterionEvent.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/AddOrderEvent.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/CreateAliasEvent.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/CriteriaEvent.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/CriteriaFactory.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/CriteriaFactoryImpl.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/CriteriaId.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetCacheModeEvent.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetCacheRegionEvent.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetCacheableEvent.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetCommentEvent.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetFetchModeEvent.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetFetchSizeEvent.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetFirstResultEvent.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetFlushModeEvent.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetLockModeEvent.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetMaxResultsEvent.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetProjectionEvent.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetResultTransformerEvent.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetTimeoutEvent.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/ShardedCriteria.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/ShardedCriteriaImpl.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/loadbalance/BaseShardLoadBalancer.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/loadbalance/RandomShardLoadBalancer.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/loadbalance/RoundRobinShardLoadBalancer.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/loadbalance/ShardLoadBalancer.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/BaseStatefulInterceptorFactory.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/DisableFilterOpenSessionEvent.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/EnableFilterOpenSessionEvent.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/OpenSessionEvent.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/RequiresSession.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/SetCacheModeOpenSessionEvent.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/SetFlushModeOpenSessionEvent.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/SetReadOnlyOpenSessionEvent.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/SetSessionOnRequiresSessionEvent.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/ShardedSessionException.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/ShardedSessionFactory.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/ShardedSessionFactoryImpl.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/ShardedSessionImpl.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/StatefulInterceptorFactory.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/stat/ShardedSessionStatistics.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/ShardStrategy.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/ShardStrategyFactory.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/ShardStrategyImpl.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/access/LoadBalancedSequentialShardAccessStrategy.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/access/ParallelShardAccessStrategy.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/access/SequentialShardAccessStrategy.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/exit/ConcatenateListsExitStrategy.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/exit/ExitStrategy.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/exit/FirstNonNullResultExitStrategy.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/resolution/AllShardsShardResolutionStrategy.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/resolution/BaseShardResolutionStrategy.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/resolution/ShardResolutionStrategy.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/selection/BaseShardSelectionStrategy.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/selection/LoadBalancedShardSelectionStrategy.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/selection/RoundRobinShardSelectionStrategy.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/selection/ShardResolutionStrategyData.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/selection/ShardResolutionStrategyDataImpl.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/selection/ShardSelectionStrategy.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/util/Iterables.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/util/Lists.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/util/Maps.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/util/Sets.java
   trunk/HibernateExt/shards/src/java/org/hibernate/shards/util/StringUtil.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/AllTests.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/BaseHasShardIdListTest.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/InstanceShardStrategyImplTest.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/ShardDefaultMock.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/ShardImplTest.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/ShardedSessionFactoryDefaultMock.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/AddCriterionEventTest.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/AddOrderEventTest.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/CreateAliasEventTest.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/CriteriaEventDefaultMock.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/CriteriaFactoryDefaultMock.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/CriteriaFactoryImplTest.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetCacheModeEventTest.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetCacheRegionEventTest.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetCacheableEventTest.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetCommentEventTest.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetFetchModeEventTest.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetFetchSizeEventTest.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetFirstResultEventTest.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetFlushModeEventTest.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetLockModeEventTest.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetMaxResultsEventTest.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetProjectionEventTest.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetResultTransformerEventTest.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetTimeoutEventTest.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/ShardedCriteriaDefaultMock.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SubcriteriaFactoryImplTest.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/defaultmock/CriteriaDefaultMock.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/defaultmock/InterceptorDefaultMock.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/defaultmock/SessionDefaultMock.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/defaultmock/SessionFactoryDefaultMock.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/BaseShardingIntegrationTestCase.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/BaseShardingIntegrationTestCasePermutedIntegrationTest.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/DbAccessPermutedIntegrationTest.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/model/ModelPermutedIntegrationTest.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/platform/DatabasePlatform.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/platform/DatabasePlatformFactory.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/platform/hsql/HSQLDatabasePlatform.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/loadbalance/RoundRobinShardLoadBalancerTest.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/loadbalance/ShardLoadBalancerDefaultMock.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Building.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Elevator.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Escalator.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Floor.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Office.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Person.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Tenant.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/DisableFilterOpenSessionEventTest.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/EnableFilterOpenSessionEventTest.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/OpenSessionEventDefaultMock.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/SetCacheModeOpenSessionEventTest.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/SetFlushModeOpenSessionEventTest.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/SetReadOnlyOpenSessionEventTest.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/SetSessionOnRequiresSessionEventTest.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/ShardedSessionFactoryImplTest.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/ShardedSessionImplTest.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/ShardStrategyDefaultMock.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/ShardStrategyFactoryDefaultMock.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/access/ShardAccessStrategyDefaultMock.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/exit/ExitStrategyDefaultMock.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/resolution/ShardResolutionStrategyDataDefaultMock.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/resolution/ShardResolutionStrategyDefaultMock.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/selection/LoadBalancedShardSelectionStrategyTest.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/selection/ShardSelectionStrategyDefaultMock.java
   trunk/HibernateExt/shards/src/test/org/hibernate/shards/util/JdbcUtil.java
Log:
Some random refactoring. Fix bug in ShardedSessionStatistics. Fix @author tag format.

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/BaseHasShardIdList.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/BaseHasShardIdList.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/BaseHasShardIdList.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -21,14 +21,14 @@
 import org.hibernate.shards.util.Preconditions;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
-import java.util.Collections;
 
 /**
  * Base implementation for HasShadIdList.
  * Takes care of null/empty checks.
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public abstract class BaseHasShardIdList implements HasShardIdList {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/HasShardIdList.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/HasShardIdList.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/HasShardIdList.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -23,7 +23,7 @@
 /**
  * Interface for objects that can provide a List of ShardIds. 
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public interface HasShardIdList {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/Shard.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/Shard.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/Shard.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -42,7 +42,7 @@
  * Anybody else have a nagging suspicion this can get folded into the Session
  * itself?
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  *         tomislav at google.com (Tomislav Nad)
  */
 public interface Shard {

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/ShardId.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/ShardId.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/ShardId.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -21,7 +21,7 @@
 /**
  * Uniquely identifies a virtual shard.
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class ShardId {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/ShardImpl.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/ShardImpl.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/ShardImpl.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -42,7 +42,7 @@
 /**
  * Concrete implementation of the {@link Shard} interface.
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class ShardImpl implements Shard {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/AddCriterionEvent.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/AddCriterionEvent.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/AddCriterionEvent.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -25,7 +25,7 @@
  * Event that allows a Criterion to be lazily added to a Criteria.
  * @see Criteria#add(Criterion) 
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 class AddCriterionEvent implements CriteriaEvent {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/AddOrderEvent.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/AddOrderEvent.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/AddOrderEvent.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,14 +18,14 @@
 
 package org.hibernate.shards.criteria;
 
+import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
-import org.hibernate.Criteria;
 
 /**
  * Event that allows an Order to be lazily added to a Criteria.
  * @see Criteria#addOrder(Order)
  * 
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 class AddOrderEvent implements CriteriaEvent {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/CreateAliasEvent.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/CreateAliasEvent.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/CreateAliasEvent.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,17 +18,16 @@
 
 package org.hibernate.shards.criteria;
 
+import org.hibernate.Criteria;
 import org.hibernate.shards.session.ShardedSessionException;
 
-import org.hibernate.Criteria;
-
 /**
  * Event that allows an alias to be lazily added to a Criteria.
  * @see Criteria#createAlias(String, String)
  * @see Criteria#createAlias(String, String, int)
  * @see Criteria#createAlias(String, String, int) 
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 class CreateAliasEvent implements CriteriaEvent {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/CriteriaEvent.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/CriteriaEvent.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/CriteriaEvent.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -29,7 +29,7 @@
  * which need to be applied to the actual {@link org.hibernate.Criteria} once
  * the actual {@link org.hibernate.Criteria} when it is allocated.
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public interface CriteriaEvent {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/CriteriaFactory.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/CriteriaFactory.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/CriteriaFactory.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -24,7 +24,7 @@
 /**
  * Factory that knows how to create a {@link Criteria} for a given {@link Session}
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public interface CriteriaFactory {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/CriteriaFactoryImpl.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/CriteriaFactoryImpl.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/CriteriaFactoryImpl.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,10 +18,9 @@
 
 package org.hibernate.shards.criteria;
 
-import org.hibernate.shards.session.ShardedSessionException;
-
 import org.hibernate.Criteria;
 import org.hibernate.Session;
+import org.hibernate.shards.session.ShardedSessionException;
 
 /**
  * Implementation of the {@link CriteriaFactory} interface.
@@ -30,7 +29,7 @@
  * @see Session#createCriteria(String)
  * @see Session#createCriteria(String, String)
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class CriteriaFactoryImpl implements CriteriaFactory {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/CriteriaId.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/CriteriaId.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/CriteriaId.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -21,7 +21,7 @@
 /**
  * Uniquely identifies a {@link ShardedCriteria} 
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class CriteriaId {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetCacheModeEvent.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetCacheModeEvent.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetCacheModeEvent.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -25,7 +25,7 @@
  * Event that allows the {@link CacheMode} of a {@link Criteria} to be set lazily.
  * @see Criteria#setCacheMode(CacheMode)
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 class SetCacheModeEvent implements CriteriaEvent {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetCacheRegionEvent.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetCacheRegionEvent.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetCacheRegionEvent.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -24,7 +24,7 @@
  * Event that allows the cache region of a {@link Criteria} to be set lazily.
  * @see Criteria#setCacheRegion(String)
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 class SetCacheRegionEvent implements CriteriaEvent {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetCacheableEvent.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetCacheableEvent.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetCacheableEvent.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -24,7 +24,7 @@
  * Event that allows the cacheability of a {@link Criteria} to be set lazily.
  * @see Criteria#setCacheable(boolean)
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 class SetCacheableEvent implements CriteriaEvent {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetCommentEvent.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetCommentEvent.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetCommentEvent.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -24,7 +24,7 @@
  * Event that allows the comment of a {@link Criteria} to be set lazily.
  * @see Criteria#setComment(String)
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 class SetCommentEvent implements CriteriaEvent {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetFetchModeEvent.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetFetchModeEvent.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetFetchModeEvent.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,14 +18,14 @@
 
 package org.hibernate.shards.criteria;
 
+import org.hibernate.Criteria;
 import org.hibernate.FetchMode;
-import org.hibernate.Criteria;
 
 /**
  * Event that allows the {@link FetchMode} of a {@link Criteria} to be set lazily.
  * @see Criteria#setFetchMode(String, FetchMode)
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 class SetFetchModeEvent implements CriteriaEvent {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetFetchSizeEvent.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetFetchSizeEvent.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetFetchSizeEvent.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -24,7 +24,7 @@
  * Event that allows the fetch size of a {@link Criteria} to be set lazily.
  * @see Criteria#setFetchSize(int)
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 class SetFetchSizeEvent implements CriteriaEvent {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetFirstResultEvent.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetFirstResultEvent.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetFirstResultEvent.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -24,7 +24,7 @@
  * Event that allows the firstResult of a {@link Criteria} to be set lazily.
  * @see Criteria#setFirstResult(int)
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 class SetFirstResultEvent implements CriteriaEvent {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetFlushModeEvent.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetFlushModeEvent.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetFlushModeEvent.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,14 +18,14 @@
 
 package org.hibernate.shards.criteria;
 
+import org.hibernate.Criteria;
 import org.hibernate.FlushMode;
-import org.hibernate.Criteria;
 
 /**
  * Event that allows the {@link FlushMode} of a {@link Criteria} to be set lazily.
  * @see Criteria#setFlushMode(FlushMode)
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 class SetFlushModeEvent implements CriteriaEvent {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetLockModeEvent.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetLockModeEvent.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetLockModeEvent.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,16 +18,15 @@
 
 package org.hibernate.shards.criteria;
 
-import org.hibernate.shards.session.ShardedSessionException;
-
 import org.hibernate.Criteria;
 import org.hibernate.LockMode;
+import org.hibernate.shards.session.ShardedSessionException;
 
 /**
  * Event that allows the {@link LockMode} of a {@link Criteria} to be set lazily.
  * @see Criteria#setLockMode(LockMode)
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 class SetLockModeEvent implements CriteriaEvent {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetMaxResultsEvent.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetMaxResultsEvent.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetMaxResultsEvent.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -24,7 +24,7 @@
  * Event that allows the maxResults of a {@link Criteria} to be set lazily.
  * @see Criteria#setMaxResults(int)
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 class SetMaxResultsEvent implements CriteriaEvent {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetProjectionEvent.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetProjectionEvent.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetProjectionEvent.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -25,7 +25,7 @@
  * Event that allows the {@link Projection} of a {@link Criteria} to be set lazily.
  * @see Criteria#setProjection(Projection)
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 class SetProjectionEvent implements CriteriaEvent {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetResultTransformerEvent.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetResultTransformerEvent.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetResultTransformerEvent.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,14 +18,14 @@
 
 package org.hibernate.shards.criteria;
 
+import org.hibernate.Criteria;
 import org.hibernate.transform.ResultTransformer;
-import org.hibernate.Criteria;
 
 /**
  * Event that allows the {@link ResultTransformer} of a {@link Criteria} to be set lazily.
  * @see Criteria#setResultTransformer(ResultTransformer)
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 class SetResultTransformerEvent implements CriteriaEvent {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetTimeoutEvent.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetTimeoutEvent.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetTimeoutEvent.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -24,7 +24,7 @@
  * Event that allows the timeout of a {@link Criteria} to be set lazily.
  * @see Criteria#setTimeout(int)   
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 class SetTimeoutEvent implements CriteriaEvent {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/ShardedCriteria.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/ShardedCriteria.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/ShardedCriteria.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -24,7 +24,7 @@
  * Interface for a shard-aware {@link Criteria} implementation.
  * @see Criteria
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public interface ShardedCriteria extends Criteria {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/ShardedCriteriaImpl.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/ShardedCriteriaImpl.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/ShardedCriteriaImpl.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,23 +18,15 @@
 
 package org.hibernate.shards.criteria;
 
+import org.hibernate.*;
+import org.hibernate.criterion.Criterion;
+import org.hibernate.criterion.Order;
+import org.hibernate.criterion.Projection;
 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.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;
 import org.hibernate.transform.ResultTransformer;
 
 import java.util.ArrayList;
@@ -44,7 +36,7 @@
 /**
  * Concrete implementation of the {@link ShardedCriteria} interface.
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class ShardedCriteriaImpl implements ShardedCriteria {
   

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/loadbalance/BaseShardLoadBalancer.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/loadbalance/BaseShardLoadBalancer.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/loadbalance/BaseShardLoadBalancer.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -26,7 +26,7 @@
 /**
  * Helpful base class for ShardLoadBalancer implementations.
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public abstract class BaseShardLoadBalancer extends BaseHasShardIdList implements ShardLoadBalancer {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/loadbalance/RandomShardLoadBalancer.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/loadbalance/RandomShardLoadBalancer.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/loadbalance/RandomShardLoadBalancer.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -26,7 +26,7 @@
 /**
  * Random selection load balancing algorithm.
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class RandomShardLoadBalancer extends BaseShardLoadBalancer {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/loadbalance/RoundRobinShardLoadBalancer.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/loadbalance/RoundRobinShardLoadBalancer.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/loadbalance/RoundRobinShardLoadBalancer.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -26,7 +26,7 @@
 /**
  * Round robin load balancing algorithm.
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class RoundRobinShardLoadBalancer extends BaseShardLoadBalancer {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/loadbalance/ShardLoadBalancer.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/loadbalance/ShardLoadBalancer.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/loadbalance/ShardLoadBalancer.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -24,7 +24,7 @@
  * Describes a load balance for shards.
  * Implementations are expected to be threadsafe.
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public interface ShardLoadBalancer {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/BaseStatefulInterceptorFactory.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/BaseStatefulInterceptorFactory.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/BaseStatefulInterceptorFactory.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -21,7 +21,7 @@
 import org.hibernate.EmptyInterceptor;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public abstract class BaseStatefulInterceptorFactory extends EmptyInterceptor implements StatefulInterceptorFactory {
 }

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/DisableFilterOpenSessionEvent.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/DisableFilterOpenSessionEvent.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/DisableFilterOpenSessionEvent.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -23,7 +23,7 @@
 /**
  * OpenSessionEvent which disables specified filter.
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 class DisableFilterOpenSessionEvent implements OpenSessionEvent {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/EnableFilterOpenSessionEvent.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/EnableFilterOpenSessionEvent.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/EnableFilterOpenSessionEvent.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -23,7 +23,7 @@
 /**
  * OpenSessionEvent which enables specified filter.
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 class EnableFilterOpenSessionEvent implements OpenSessionEvent {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/OpenSessionEvent.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/OpenSessionEvent.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/OpenSessionEvent.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -28,7 +28,7 @@
  * need to be applied to the actual {@link org.hibernate.Session}
  * once the actual {@link org.hibernate.Session} is allocated.
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public interface OpenSessionEvent {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/RequiresSession.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/RequiresSession.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/RequiresSession.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -26,7 +26,7 @@
  *
  * @see StatefulInterceptorFactory
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public interface RequiresSession {
   void setSession(Session session);

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/SetCacheModeOpenSessionEvent.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/SetCacheModeOpenSessionEvent.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/SetCacheModeOpenSessionEvent.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -24,7 +24,7 @@
 /**
  * OpenSessionEvent which sets the CacheMode.
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 class SetCacheModeOpenSessionEvent implements OpenSessionEvent {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/SetFlushModeOpenSessionEvent.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/SetFlushModeOpenSessionEvent.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/SetFlushModeOpenSessionEvent.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -24,7 +24,7 @@
 /**
  * OpenSessionEvent which sets the FlushMode.
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 class SetFlushModeOpenSessionEvent implements OpenSessionEvent {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/SetReadOnlyOpenSessionEvent.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/SetReadOnlyOpenSessionEvent.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/SetReadOnlyOpenSessionEvent.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -23,7 +23,7 @@
 /**
  * OpenSessionEvent which sets specified entity's readOnly flag.
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 class SetReadOnlyOpenSessionEvent implements OpenSessionEvent {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/SetSessionOnRequiresSessionEvent.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/SetSessionOnRequiresSessionEvent.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/SetSessionOnRequiresSessionEvent.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -23,7 +23,7 @@
 /**
  * OpenSessionEvent which sets the provided Session on a RequiresSession.
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class SetSessionOnRequiresSessionEvent implements OpenSessionEvent {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/ShardedSessionException.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/ShardedSessionException.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/ShardedSessionException.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -21,7 +21,7 @@
 /**
  * Main exception used in Hibernate Shards.
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class ShardedSessionException extends RuntimeException {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/ShardedSessionFactory.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/ShardedSessionFactory.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/ShardedSessionFactory.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,21 +18,19 @@
 
 package org.hibernate.shards.session;
 
-import org.hibernate.shards.strategy.ShardStrategyFactory;
-import org.hibernate.shards.session.ShardedSession;
+import org.hibernate.HibernateException;
+import org.hibernate.Interceptor;
+import org.hibernate.SessionFactory;
 import org.hibernate.shards.ShardId;
+import org.hibernate.shards.strategy.ShardStrategyFactory;
 
-import org.hibernate.SessionFactory;
-import org.hibernate.Interceptor;
-import org.hibernate.HibernateException;
-
 import java.util.List;
 
 /**
  * Shard-aware extension to {@link SessionFactory}.  Similar to {@link SessionFactory},
  * ShardedSessionFactory is threadsafe.
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public interface ShardedSessionFactory extends SessionFactory {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/ShardedSessionFactoryImpl.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/ShardedSessionFactoryImpl.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/ShardedSessionFactoryImpl.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,25 +18,9 @@
 
 package org.hibernate.shards.session;
 
-import org.hibernate.shards.ShardId;
-import org.hibernate.shards.util.Preconditions;
-import org.hibernate.shards.engine.ShardedSessionFactoryImplementor;
-import org.hibernate.shards.id.GeneratorRequiringControlSessionProvider;
-import org.hibernate.shards.strategy.ShardStrategy;
-import org.hibernate.shards.strategy.ShardStrategyFactory;
-import org.hibernate.shards.util.Iterables;
-import org.hibernate.shards.util.Lists;
-import org.hibernate.shards.util.Sets;
-import org.hibernate.shards.util.Maps;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-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.*;
 import org.hibernate.cache.Cache;
 import org.hibernate.cache.QueryCache;
 import org.hibernate.cache.UpdateTimestampsCache;
@@ -45,12 +29,7 @@
 import org.hibernate.connection.ConnectionProvider;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.function.SQLFunctionRegistry;
-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.*;
 import org.hibernate.engine.query.QueryPlanCache;
 import org.hibernate.exception.SQLExceptionConverter;
 import org.hibernate.id.IdentifierGenerator;
@@ -59,11 +38,20 @@
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.proxy.EntityNotFoundDelegate;
+import org.hibernate.shards.ShardId;
+import org.hibernate.shards.engine.ShardedSessionFactoryImplementor;
+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.stat.Statistics;
 import org.hibernate.stat.StatisticsImpl;
 import org.hibernate.stat.StatisticsImplementor;
 import org.hibernate.type.Type;
 
+import javax.naming.NamingException;
+import javax.naming.Reference;
+import javax.transaction.TransactionManager;
 import java.io.Serializable;
 import java.sql.Connection;
 import java.util.Collections;
@@ -71,14 +59,10 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.naming.NamingException;
-import javax.naming.Reference;
-import javax.transaction.TransactionManager;
-
 /**
  * Shard-aware implementation of {@link SessionFactory}.
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class ShardedSessionFactoryImpl implements ShardedSessionFactoryImplementor, ControlSessionProvider {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/ShardedSessionImpl.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/ShardedSessionImpl.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/ShardedSessionImpl.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -54,7 +54,7 @@
  * ShardedSession itself, to the application, and ShardedSessionImplementor, to
  * other components of Hibernate Shards. This class is not threadsafe.
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  *         tomislav at google.com (Tomislav Nad)
  */
 public class ShardedSessionImpl implements ShardedSession, ShardedSessionImplementor,
@@ -976,59 +976,49 @@
     invokeOnShardWithObject(op, object);
   }
 
-  public void refresh(Object object) throws HibernateException {
-    List<Shard> candidateShards;
-    Serializable id = null;
-    try {
-      id = getIdentifier(object);
-      List<ShardId> shardIds = selectShardIdsFromShardResolutionStrategyData(new
-                                   ShardResolutionStrategyDataImpl(object.getClass(), id));
-      candidateShards = shardIdListToShardList(shardIds);
-    } catch (TransientObjectException toe) {
-      // detached instance
-      candidateShards = shards;
-    }
-    if (candidateShards.size() == 1) {
-      candidateShards.get(0).refresh(object);
+  private interface RefreshOperation {
+    void refresh(Shard shard, Object object);
+  }
+
+  private void applyRefreshOperation(RefreshOperation op, Object object) {
+    ShardId shardId = getShardIdForObject(object);
+    if (shardId != null) {
+      op.refresh(shardIdsToShards.get(shardId), object);
     } else {
-      for (Shard shard : candidateShards) {
-        try {
-          shard.refresh(object);
-          return;
-        } catch (UnresolvableObjectException uoe) {
-          // ignore
+      List<Shard> candidateShards = determineShardsObjectViaResolutionStrategy(object);
+      if (candidateShards.size() == 1) {
+        op.refresh(candidateShards.get(0), object);
+      } else {
+        for (Shard shard : candidateShards) {
+          try {
+            op.refresh(shard, object);
+            return;
+          } catch (UnresolvableObjectException uoe) {
+            // ignore
+          }
         }
+        op.refresh(shards.get(0), object);
       }
-      throw new UnresolvableObjectException(id, object.getClass().getName());
     }
   }
 
-  public void refresh(Object object, LockMode lockMode)
+  public void refresh(final Object object) throws HibernateException {
+    RefreshOperation op = new RefreshOperation() {
+      public void refresh(Shard shard, Object object) {
+        shard.refresh(object);
+      }
+    };
+    applyRefreshOperation(op, object);
+  }
+
+  public void refresh(final Object object, final LockMode lockMode)
       throws HibernateException {
-    List<Shard> candidateShards;
-    Serializable id = null;
-    try {
-      id = getIdentifier(object);
-      List<ShardId> shardIds = selectShardIdsFromShardResolutionStrategyData(new
-                                   ShardResolutionStrategyDataImpl(object.getClass(), id));
-      candidateShards = shardIdListToShardList(shardIds);
-    } catch (TransientObjectException toe) {
-      // detached instance
-      candidateShards = shards;
-    }
-    if (candidateShards.size() == 1) {
-      candidateShards.get(0).refresh(object, lockMode);
-    } else {
-      for (Shard shard : candidateShards) {
-        try {
-          shard.refresh(object, lockMode);
-          return;
-        } catch (UnresolvableObjectException uoe) {
-          // ignore
-        }
+    RefreshOperation op = new RefreshOperation() {
+      public void refresh(Shard shard, Object object) {
+        shard.refresh(object, lockMode);
       }
-      throw new UnresolvableObjectException(id, object.getClass().getName());
-    }
+    };
+    applyRefreshOperation(op, object);
   }
 
   public LockMode getCurrentLockMode(final Object object) throws HibernateException {

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/StatefulInterceptorFactory.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/StatefulInterceptorFactory.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/StatefulInterceptorFactory.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -30,7 +30,7 @@
  * Interceptor returned by newInstance() should implement the {@link RequiresSession}
  * interface.
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public interface StatefulInterceptorFactory {
   Interceptor newInstance();

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/stat/ShardedSessionStatistics.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/stat/ShardedSessionStatistics.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/stat/ShardedSessionStatistics.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,12 +18,13 @@
 
 package org.hibernate.shards.stat;
 
+import org.hibernate.Session;
 import org.hibernate.shards.Shard;
 import org.hibernate.shards.engine.ShardedSessionImplementor;
+import org.hibernate.shards.session.OpenSessionEvent;
 import org.hibernate.shards.util.Sets;
 import org.hibernate.stat.SessionStatistics;
 
-import java.util.Collections;
 import java.util.Set;
 
 /**
@@ -39,7 +40,16 @@
   public ShardedSessionStatistics(ShardedSessionImplementor session) {
     sessionStatistics = Sets.newHashSet();
     for (Shard s : session.getShards()) {
-      sessionStatistics.add(s.getSession().getStatistics());
+      if (s.getSession() != null) {
+        sessionStatistics.add(s.getSession().getStatistics());
+      } else {
+        OpenSessionEvent ose = new OpenSessionEvent() {
+          public void onOpenSession(Session session) {
+            sessionStatistics.add(session.getStatistics());
+          }
+        };
+        s.addOpenSessionEvent(ose);
+      }
     }
   }
 
@@ -64,7 +74,7 @@
     for (SessionStatistics s : sessionStatistics) {
       entityKeys.addAll(s.getEntityKeys());
     }
-    return Collections.unmodifiableSet(entityKeys);
+    return entityKeys;
   }
 
   public Set getCollectionKeys() {
@@ -72,6 +82,6 @@
     for (SessionStatistics s : sessionStatistics) {
       collectionKeys.addAll(s.getCollectionKeys());
     }
-    return Collections.unmodifiableSet(collectionKeys);
+    return collectionKeys;
   }
 }

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/ShardStrategy.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/ShardStrategy.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/ShardStrategy.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -19,11 +19,11 @@
 package org.hibernate.shards.strategy;
 
 import org.hibernate.shards.strategy.access.ShardAccessStrategy;
+import org.hibernate.shards.strategy.resolution.ShardResolutionStrategy;
 import org.hibernate.shards.strategy.selection.ShardSelectionStrategy;
-import org.hibernate.shards.strategy.resolution.ShardResolutionStrategy;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public interface ShardStrategy {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/ShardStrategyFactory.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/ShardStrategyFactory.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/ShardStrategyFactory.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -23,7 +23,7 @@
 import java.util.List;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public interface ShardStrategyFactory {
   ShardStrategy newShardStrategy(List<ShardId> shardIds);

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/ShardStrategyImpl.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/ShardStrategyImpl.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/ShardStrategyImpl.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,13 +18,13 @@
 
 package org.hibernate.shards.strategy;
 
-import org.hibernate.shards.strategy.selection.ShardSelectionStrategy;
 import org.hibernate.shards.strategy.access.ShardAccessStrategy;
 import org.hibernate.shards.strategy.resolution.ShardResolutionStrategy;
+import org.hibernate.shards.strategy.selection.ShardSelectionStrategy;
 import org.hibernate.shards.util.Preconditions;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class ShardStrategyImpl implements ShardStrategy {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/access/LoadBalancedSequentialShardAccessStrategy.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/access/LoadBalancedSequentialShardAccessStrategy.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/access/LoadBalancedSequentialShardAccessStrategy.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -21,8 +21,8 @@
 import org.hibernate.shards.Shard;
 import org.hibernate.shards.util.Iterables;
 
+import java.util.List;
 import java.util.Random;
-import java.util.List;
 
 /**
  * A SequentialShardAccessStrategy starts with the first Shard in the list
@@ -36,7 +36,7 @@
  * the shards we're rotating in advance, but the shards passed to a
  * ShardAccessStrategy can vary between invocations.
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class LoadBalancedSequentialShardAccessStrategy extends SequentialShardAccessStrategy {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/access/ParallelShardAccessStrategy.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/access/ParallelShardAccessStrategy.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/access/ParallelShardAccessStrategy.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,16 +18,15 @@
 
 package org.hibernate.shards.strategy.access;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.hibernate.shards.Shard;
 import org.hibernate.shards.ShardOperation;
-import org.hibernate.shards.util.Lists;
 import org.hibernate.shards.strategy.exit.ExitOperationsCollector;
 import org.hibernate.shards.strategy.exit.ExitStrategy;
+import org.hibernate.shards.util.Lists;
 import org.hibernate.shards.util.Preconditions;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ThreadPoolExecutor;
@@ -36,7 +35,7 @@
  * Invokes the given operation on the given shards in parallel.
  * TODO(maxr) Add support for rejected tasks
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class ParallelShardAccessStrategy implements ShardAccessStrategy {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/access/SequentialShardAccessStrategy.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/access/SequentialShardAccessStrategy.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/access/SequentialShardAccessStrategy.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -28,7 +28,7 @@
 import java.util.List;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class SequentialShardAccessStrategy implements ShardAccessStrategy {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/exit/ConcatenateListsExitStrategy.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/exit/ConcatenateListsExitStrategy.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/exit/ConcatenateListsExitStrategy.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -26,7 +26,7 @@
 /**
  * Threadsafe ExistStrategy that concatenates all the lists that are added.
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class ConcatenateListsExitStrategy implements ExitStrategy<List<Object>> {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/exit/ExitStrategy.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/exit/ExitStrategy.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/exit/ExitStrategy.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -26,7 +26,7 @@
  * in conjunction with ParallelShardAccessStrategy that implementation must
  * be threadsafe.
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public interface ExitStrategy<T> {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/exit/FirstNonNullResultExitStrategy.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/exit/FirstNonNullResultExitStrategy.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/exit/FirstNonNullResultExitStrategy.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -25,7 +25,7 @@
  * Threadsafe ExitStrategy implementation that only accepts the first result
  * added.
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class FirstNonNullResultExitStrategy<T> implements ExitStrategy<T> {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/resolution/AllShardsShardResolutionStrategy.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/resolution/AllShardsShardResolutionStrategy.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/resolution/AllShardsShardResolutionStrategy.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -24,7 +24,7 @@
 import java.util.List;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class AllShardsShardResolutionStrategy extends BaseShardResolutionStrategy {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/resolution/BaseShardResolutionStrategy.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/resolution/BaseShardResolutionStrategy.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/resolution/BaseShardResolutionStrategy.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -24,7 +24,7 @@
 import java.util.List;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public abstract class BaseShardResolutionStrategy extends BaseHasShardIdList implements ShardResolutionStrategy {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/resolution/ShardResolutionStrategy.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/resolution/ShardResolutionStrategy.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/resolution/ShardResolutionStrategy.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -24,7 +24,7 @@
 import java.util.List;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public interface ShardResolutionStrategy {
   /**

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/selection/BaseShardSelectionStrategy.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/selection/BaseShardSelectionStrategy.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/selection/BaseShardSelectionStrategy.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -24,7 +24,7 @@
 import java.util.List;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public abstract class BaseShardSelectionStrategy extends BaseHasShardIdList implements ShardSelectionStrategy {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/selection/LoadBalancedShardSelectionStrategy.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/selection/LoadBalancedShardSelectionStrategy.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/selection/LoadBalancedShardSelectionStrategy.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -22,7 +22,7 @@
 import org.hibernate.shards.loadbalance.ShardLoadBalancer;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class LoadBalancedShardSelectionStrategy implements ShardSelectionStrategy {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/selection/RoundRobinShardSelectionStrategy.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/selection/RoundRobinShardSelectionStrategy.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/selection/RoundRobinShardSelectionStrategy.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -22,7 +22,7 @@
 import org.hibernate.shards.loadbalance.RoundRobinShardLoadBalancer;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class RoundRobinShardSelectionStrategy implements ShardSelectionStrategy {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/selection/ShardResolutionStrategyData.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/selection/ShardResolutionStrategyData.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/selection/ShardResolutionStrategyData.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -21,7 +21,7 @@
 import java.io.Serializable;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public interface ShardResolutionStrategyData {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/selection/ShardResolutionStrategyDataImpl.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/selection/ShardResolutionStrategyDataImpl.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/selection/ShardResolutionStrategyDataImpl.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -21,7 +21,7 @@
 import java.io.Serializable;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class ShardResolutionStrategyDataImpl implements ShardResolutionStrategyData {
   private final String entityName;

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/selection/ShardSelectionStrategy.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/selection/ShardSelectionStrategy.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/selection/ShardSelectionStrategy.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -21,7 +21,7 @@
 import org.hibernate.shards.ShardId;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public interface ShardSelectionStrategy {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/util/Iterables.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/util/Iterables.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/util/Iterables.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,14 +18,14 @@
 
 package org.hibernate.shards.util;
 
+import java.util.Collections;
+import java.util.Iterator;
 import java.util.List;
-import java.util.Iterator;
-import java.util.Collections;
 
 /**
  * Helper methods related to {@link Iterable}s.
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class Iterables {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/util/Lists.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/util/Lists.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/util/Lists.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -26,7 +26,7 @@
 /**
  * Helper methods related to {@link List}s.
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class Lists {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/util/Maps.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/util/Maps.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/util/Maps.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -25,7 +25,7 @@
 /**
  * Helper methods related to {@link Map}s.
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class Maps {
 

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/util/Sets.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/util/Sets.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/util/Sets.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -25,7 +25,7 @@
 /**
  * Helper methods related to {@link Set}s.
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class Sets {
   private Sets() {}

Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/util/StringUtil.java
===================================================================
--- trunk/HibernateExt/shards/src/java/org/hibernate/shards/util/StringUtil.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/util/StringUtil.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -21,7 +21,7 @@
 /**
  * String utilities.
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class StringUtil {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/AllTests.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/AllTests.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/AllTests.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -21,14 +21,13 @@
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
-
 import org.hibernate.shards.integration.PermutedIntegrationTests;
 
 /**
  * This class is really just here for IDE users who want to run their tests
  * directly instead of through Ant.
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class AllTests extends TestSuite {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/BaseHasShardIdListTest.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/BaseHasShardIdListTest.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/BaseHasShardIdListTest.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -19,13 +19,12 @@
 package org.hibernate.shards;
 
 import junit.framework.TestCase;
-
 import org.hibernate.shards.util.Lists;
 
 import java.util.List;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class BaseHasShardIdListTest extends TestCase {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/InstanceShardStrategyImplTest.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/InstanceShardStrategyImplTest.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/InstanceShardStrategyImplTest.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,18 +18,17 @@
 
 package org.hibernate.shards;
 
+import junit.framework.TestCase;
 import org.hibernate.shards.strategy.ShardStrategyImpl;
-import org.hibernate.shards.strategy.resolution.ShardResolutionStrategy;
-import org.hibernate.shards.strategy.resolution.ShardResolutionStrategyDefaultMock;
 import org.hibernate.shards.strategy.access.ShardAccessStrategy;
 import org.hibernate.shards.strategy.access.ShardAccessStrategyDefaultMock;
+import org.hibernate.shards.strategy.resolution.ShardResolutionStrategy;
+import org.hibernate.shards.strategy.resolution.ShardResolutionStrategyDefaultMock;
 import org.hibernate.shards.strategy.selection.ShardSelectionStrategy;
 import org.hibernate.shards.strategy.selection.ShardSelectionStrategyDefaultMock;
 
-import junit.framework.TestCase;
-
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class InstanceShardStrategyImplTest extends TestCase {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/ShardDefaultMock.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/ShardDefaultMock.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/ShardDefaultMock.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -36,7 +36,7 @@
 import java.util.Set;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  *         tomislav at google.com (Tomislav Nad)
  */
 public class ShardDefaultMock implements Shard {

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/ShardImplTest.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/ShardImplTest.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/ShardImplTest.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,37 +18,17 @@
 
 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.shards.session.OpenSessionEvent;
 import org.hibernate.shards.session.OpenSessionEventDefaultMock;
-import org.hibernate.shards.criteria.CriteriaId;
-import org.hibernate.shards.criteria.CriteriaEventDefaultMock;
-import org.hibernate.shards.criteria.CriteriaEvent;
-import org.hibernate.shards.criteria.CriteriaFactory;
-import org.hibernate.shards.criteria.ShardedCriteriaDefaultMock;
-import org.hibernate.shards.criteria.CriteriaFactoryDefaultMock;
-import org.hibernate.shards.query.QueryId;
-import org.hibernate.shards.query.QueryEventDefaultMock;
-import org.hibernate.shards.query.QueryEvent;
-import org.hibernate.shards.query.QueryFactory;
-import org.hibernate.shards.query.ShardedQueryDefaultMock;
-import org.hibernate.shards.query.QueryFactoryDefaultMock;
-import org.hibernate.shards.defaultmock.SessionFactoryDefaultMock;
-import org.hibernate.shards.defaultmock.InterceptorDefaultMock;
-import org.hibernate.shards.defaultmock.CriteriaDefaultMock;
-import org.hibernate.shards.defaultmock.QueryDefaultMock;
-import org.hibernate.shards.defaultmock.SessionDefaultMock;
 import org.hibernate.shards.util.Sets;
 
-import junit.framework.TestCase;
-
-import org.hibernate.Criteria;
-import org.hibernate.HibernateException;
-import org.hibernate.Interceptor;
-import org.hibernate.Query;
-import org.hibernate.Session;
-
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class ShardImplTest extends TestCase {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/ShardedSessionFactoryDefaultMock.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/ShardedSessionFactoryDefaultMock.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/ShardedSessionFactoryDefaultMock.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,55 +18,43 @@
 
 package org.hibernate.shards;
 
-import org.hibernate.shards.engine.ShardedSessionFactoryImplementor;
-import org.hibernate.shards.strategy.ShardStrategyFactory;
-import org.hibernate.shards.session.ShardedSession;
-import org.hibernate.shards.session.ShardedSessionFactory;
-
-import org.hibernate.HibernateException;
-import org.hibernate.Interceptor;
-import org.hibernate.StatelessSession;
-import org.hibernate.SessionFactory;
-import org.hibernate.MappingException;
-import org.hibernate.ConnectionReleaseMode;
-import org.hibernate.proxy.EntityNotFoundDelegate;
-import org.hibernate.cfg.Settings;
-import org.hibernate.exception.SQLExceptionConverter;
+import org.hibernate.*;
+import org.hibernate.cache.Cache;
 import org.hibernate.cache.QueryCache;
 import org.hibernate.cache.UpdateTimestampsCache;
-import org.hibernate.cache.Cache;
+import org.hibernate.cfg.Settings;
+import org.hibernate.classic.Session;
 import org.hibernate.connection.ConnectionProvider;
-import org.hibernate.type.Type;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.function.SQLFunctionRegistry;
-import org.hibernate.persister.entity.EntityPersister;
-import org.hibernate.persister.collection.CollectionPersister;
-import org.hibernate.classic.Session;
-import org.hibernate.engine.FilterDefinition;
-import org.hibernate.engine.SessionFactoryImplementor;
-import org.hibernate.engine.SessionImplementor;
-import org.hibernate.engine.NamedQueryDefinition;
-import org.hibernate.engine.NamedSQLQueryDefinition;
-import org.hibernate.engine.ResultSetMappingDefinition;
+import org.hibernate.engine.*;
 import org.hibernate.engine.query.QueryPlanCache;
+import org.hibernate.exception.SQLExceptionConverter;
 import org.hibernate.id.IdentifierGenerator;
 import org.hibernate.metadata.ClassMetadata;
 import org.hibernate.metadata.CollectionMetadata;
+import org.hibernate.persister.collection.CollectionPersister;
+import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.proxy.EntityNotFoundDelegate;
+import org.hibernate.shards.engine.ShardedSessionFactoryImplementor;
+import org.hibernate.shards.session.ShardedSession;
+import org.hibernate.shards.session.ShardedSessionFactory;
+import org.hibernate.shards.strategy.ShardStrategyFactory;
 import org.hibernate.stat.Statistics;
 import org.hibernate.stat.StatisticsImplementor;
+import org.hibernate.type.Type;
 
+import javax.naming.NamingException;
+import javax.naming.Reference;
+import javax.transaction.TransactionManager;
 import java.io.Serializable;
 import java.sql.Connection;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import javax.naming.NamingException;
-import javax.naming.Reference;
-import javax.transaction.TransactionManager;
-
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class ShardedSessionFactoryDefaultMock implements ShardedSessionFactoryImplementor {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/AddCriterionEventTest.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/AddCriterionEventTest.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/AddCriterionEventTest.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,15 +18,13 @@
 
 package org.hibernate.shards.criteria;
 
-import org.hibernate.shards.defaultmock.CriteriaDefaultMock;
-
 import junit.framework.TestCase;
-
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Criterion;
+import org.hibernate.shards.defaultmock.CriteriaDefaultMock;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class AddCriterionEventTest extends TestCase {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/AddOrderEventTest.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/AddOrderEventTest.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/AddOrderEventTest.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,15 +18,13 @@
 
 package org.hibernate.shards.criteria;
 
-import org.hibernate.shards.defaultmock.CriteriaDefaultMock;
-
 import junit.framework.TestCase;
-
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
+import org.hibernate.shards.defaultmock.CriteriaDefaultMock;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class AddOrderEventTest extends TestCase {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/CreateAliasEventTest.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/CreateAliasEventTest.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/CreateAliasEventTest.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,15 +18,13 @@
 
 package org.hibernate.shards.criteria;
 
-import org.hibernate.shards.defaultmock.CriteriaDefaultMock;
-
 import junit.framework.TestCase;
-
 import org.hibernate.Criteria;
 import org.hibernate.HibernateException;
+import org.hibernate.shards.defaultmock.CriteriaDefaultMock;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class CreateAliasEventTest extends TestCase {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/CriteriaEventDefaultMock.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/CriteriaEventDefaultMock.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/CriteriaEventDefaultMock.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -21,7 +21,7 @@
 import org.hibernate.Criteria;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class CriteriaEventDefaultMock implements CriteriaEvent {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/CriteriaFactoryDefaultMock.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/CriteriaFactoryDefaultMock.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/CriteriaFactoryDefaultMock.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -22,7 +22,7 @@
 import org.hibernate.Session;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class CriteriaFactoryDefaultMock implements CriteriaFactory {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/CriteriaFactoryImplTest.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/CriteriaFactoryImplTest.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/CriteriaFactoryImplTest.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,16 +18,14 @@
 
 package org.hibernate.shards.criteria;
 
-import org.hibernate.shards.defaultmock.SessionDefaultMock;
-
 import junit.framework.TestCase;
-
 import org.hibernate.Criteria;
 import org.hibernate.HibernateException;
 import org.hibernate.Session;
+import org.hibernate.shards.defaultmock.SessionDefaultMock;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class CriteriaFactoryImplTest extends TestCase {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetCacheModeEventTest.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetCacheModeEventTest.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetCacheModeEventTest.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,15 +18,13 @@
 
 package org.hibernate.shards.criteria;
 
-import org.hibernate.shards.defaultmock.CriteriaDefaultMock;
-
 import junit.framework.TestCase;
-
-import org.hibernate.Criteria;
 import org.hibernate.CacheMode;
+import org.hibernate.Criteria;
+import org.hibernate.shards.defaultmock.CriteriaDefaultMock;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class SetCacheModeEventTest extends TestCase {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetCacheRegionEventTest.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetCacheRegionEventTest.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetCacheRegionEventTest.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,14 +18,12 @@
 
 package org.hibernate.shards.criteria;
 
-import org.hibernate.shards.defaultmock.CriteriaDefaultMock;
-
 import junit.framework.TestCase;
-
 import org.hibernate.Criteria;
+import org.hibernate.shards.defaultmock.CriteriaDefaultMock;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class SetCacheRegionEventTest extends TestCase {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetCacheableEventTest.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetCacheableEventTest.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetCacheableEventTest.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,14 +18,12 @@
 
 package org.hibernate.shards.criteria;
 
-import org.hibernate.shards.defaultmock.CriteriaDefaultMock;
-
 import junit.framework.TestCase;
-
 import org.hibernate.Criteria;
+import org.hibernate.shards.defaultmock.CriteriaDefaultMock;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class SetCacheableEventTest extends TestCase {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetCommentEventTest.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetCommentEventTest.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetCommentEventTest.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,14 +18,12 @@
 
 package org.hibernate.shards.criteria;
 
-import org.hibernate.shards.defaultmock.CriteriaDefaultMock;
-
 import junit.framework.TestCase;
-
 import org.hibernate.Criteria;
+import org.hibernate.shards.defaultmock.CriteriaDefaultMock;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class SetCommentEventTest extends TestCase {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetFetchModeEventTest.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetFetchModeEventTest.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetFetchModeEventTest.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,16 +18,14 @@
 
 package org.hibernate.shards.criteria;
 
-import org.hibernate.shards.defaultmock.CriteriaDefaultMock;
-
 import junit.framework.TestCase;
-
 import org.hibernate.Criteria;
 import org.hibernate.FetchMode;
 import org.hibernate.HibernateException;
+import org.hibernate.shards.defaultmock.CriteriaDefaultMock;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class SetFetchModeEventTest extends TestCase {
   public void testOnOpenSession() {

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetFetchSizeEventTest.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetFetchSizeEventTest.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetFetchSizeEventTest.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,14 +18,12 @@
 
 package org.hibernate.shards.criteria;
 
-import org.hibernate.shards.defaultmock.CriteriaDefaultMock;
-
 import junit.framework.TestCase;
-
 import org.hibernate.Criteria;
+import org.hibernate.shards.defaultmock.CriteriaDefaultMock;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class SetFetchSizeEventTest extends TestCase {
   public void testOnOpenSession() {

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetFirstResultEventTest.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetFirstResultEventTest.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetFirstResultEventTest.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,14 +18,12 @@
 
 package org.hibernate.shards.criteria;
 
-import org.hibernate.shards.defaultmock.CriteriaDefaultMock;
-
 import junit.framework.TestCase;
-
 import org.hibernate.Criteria;
+import org.hibernate.shards.defaultmock.CriteriaDefaultMock;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class SetFirstResultEventTest extends TestCase {
   public void testOnOpenSession() {

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetFlushModeEventTest.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetFlushModeEventTest.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetFlushModeEventTest.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,15 +18,13 @@
 
 package org.hibernate.shards.criteria;
 
-import org.hibernate.shards.defaultmock.CriteriaDefaultMock;
-
 import junit.framework.TestCase;
-
 import org.hibernate.Criteria;
 import org.hibernate.FlushMode;
+import org.hibernate.shards.defaultmock.CriteriaDefaultMock;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class SetFlushModeEventTest extends TestCase {
   public void testOnOpenSession() {

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetLockModeEventTest.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetLockModeEventTest.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetLockModeEventTest.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,15 +18,13 @@
 
 package org.hibernate.shards.criteria;
 
-import org.hibernate.shards.defaultmock.CriteriaDefaultMock;
-
 import junit.framework.TestCase;
-
 import org.hibernate.Criteria;
 import org.hibernate.LockMode;
+import org.hibernate.shards.defaultmock.CriteriaDefaultMock;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class SetLockModeEventTest extends TestCase {
   public void testOnOpenSession() {

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetMaxResultsEventTest.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetMaxResultsEventTest.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetMaxResultsEventTest.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,14 +18,12 @@
 
 package org.hibernate.shards.criteria;
 
-import org.hibernate.shards.defaultmock.CriteriaDefaultMock;
-
 import junit.framework.TestCase;
-
 import org.hibernate.Criteria;
+import org.hibernate.shards.defaultmock.CriteriaDefaultMock;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class SetMaxResultsEventTest extends TestCase {
   public void testOnOpenSession() {

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetProjectionEventTest.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetProjectionEventTest.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetProjectionEventTest.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,15 +18,13 @@
 
 package org.hibernate.shards.criteria;
 
-import org.hibernate.shards.defaultmock.CriteriaDefaultMock;
-
 import junit.framework.TestCase;
-
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Projection;
+import org.hibernate.shards.defaultmock.CriteriaDefaultMock;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class SetProjectionEventTest extends TestCase {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetResultTransformerEventTest.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetResultTransformerEventTest.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetResultTransformerEventTest.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,15 +18,13 @@
 
 package org.hibernate.shards.criteria;
 
-import org.hibernate.shards.defaultmock.CriteriaDefaultMock;
-
 import junit.framework.TestCase;
-
 import org.hibernate.Criteria;
+import org.hibernate.shards.defaultmock.CriteriaDefaultMock;
 import org.hibernate.transform.ResultTransformer;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class SetResultTransformerEventTest extends TestCase {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetTimeoutEventTest.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetTimeoutEventTest.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetTimeoutEventTest.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,14 +18,12 @@
 
 package org.hibernate.shards.criteria;
 
-import org.hibernate.shards.defaultmock.CriteriaDefaultMock;
-
 import junit.framework.TestCase;
-
 import org.hibernate.Criteria;
+import org.hibernate.shards.defaultmock.CriteriaDefaultMock;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class SetTimeoutEventTest extends TestCase {
   public void testOnOpenSession() {

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/ShardedCriteriaDefaultMock.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/ShardedCriteriaDefaultMock.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/ShardedCriteriaDefaultMock.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,23 +18,16 @@
 
 package org.hibernate.shards.criteria;
 
-import org.hibernate.Criteria;
-import org.hibernate.FetchMode;
-import org.hibernate.HibernateException;
-import org.hibernate.LockMode;
-import org.hibernate.FlushMode;
-import org.hibernate.CacheMode;
-import org.hibernate.ScrollableResults;
-import org.hibernate.ScrollMode;
-import org.hibernate.transform.ResultTransformer;
-import org.hibernate.criterion.Projection;
+import org.hibernate.*;
 import org.hibernate.criterion.Criterion;
 import org.hibernate.criterion.Order;
+import org.hibernate.criterion.Projection;
+import org.hibernate.transform.ResultTransformer;
 
 import java.util.List;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class ShardedCriteriaDefaultMock implements ShardedCriteria {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SubcriteriaFactoryImplTest.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SubcriteriaFactoryImplTest.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SubcriteriaFactoryImplTest.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,16 +18,14 @@
 
 package org.hibernate.shards.criteria;
 
-import org.hibernate.shards.defaultmock.CriteriaDefaultMock;
-import org.hibernate.shards.util.Lists;
-
 import junit.framework.TestCase;
-
 import org.hibernate.Criteria;
 import org.hibernate.HibernateException;
+import org.hibernate.shards.defaultmock.CriteriaDefaultMock;
+import org.hibernate.shards.util.Lists;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class SubcriteriaFactoryImplTest extends TestCase {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/defaultmock/CriteriaDefaultMock.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/defaultmock/CriteriaDefaultMock.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/defaultmock/CriteriaDefaultMock.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,23 +18,16 @@
 
 package org.hibernate.shards.defaultmock;
 
-import org.hibernate.Criteria;
-import org.hibernate.FetchMode;
-import org.hibernate.HibernateException;
-import org.hibernate.LockMode;
-import org.hibernate.FlushMode;
-import org.hibernate.CacheMode;
-import org.hibernate.ScrollableResults;
-import org.hibernate.ScrollMode;
-import org.hibernate.transform.ResultTransformer;
-import org.hibernate.criterion.Projection;
+import org.hibernate.*;
 import org.hibernate.criterion.Criterion;
 import org.hibernate.criterion.Order;
+import org.hibernate.criterion.Projection;
+import org.hibernate.transform.ResultTransformer;
 
 import java.util.List;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class CriteriaDefaultMock implements Criteria {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/defaultmock/InterceptorDefaultMock.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/defaultmock/InterceptorDefaultMock.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/defaultmock/InterceptorDefaultMock.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,9 +18,9 @@
 
 package org.hibernate.shards.defaultmock;
 
-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;
 
@@ -28,7 +28,7 @@
 import java.util.Iterator;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class InterceptorDefaultMock implements Interceptor {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/defaultmock/SessionDefaultMock.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/defaultmock/SessionDefaultMock.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/defaultmock/SessionDefaultMock.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,30 +18,19 @@
 
 package org.hibernate.shards.defaultmock;
 
+import org.hibernate.*;
 import org.hibernate.classic.Session;
-import org.hibernate.HibernateException;
-import org.hibernate.Query;
-import org.hibernate.EntityMode;
-import org.hibernate.FlushMode;
-import org.hibernate.CacheMode;
-import org.hibernate.SessionFactory;
-import org.hibernate.LockMode;
-import org.hibernate.ReplicationMode;
-import org.hibernate.Transaction;
-import org.hibernate.Criteria;
-import org.hibernate.SQLQuery;
-import org.hibernate.Filter;
 import org.hibernate.stat.SessionStatistics;
 import org.hibernate.type.Type;
 
 import java.io.Serializable;
-import java.util.List;
-import java.util.Iterator;
-import java.util.Collection;
 import java.sql.Connection;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class SessionDefaultMock implements Session {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/defaultmock/SessionFactoryDefaultMock.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/defaultmock/SessionFactoryDefaultMock.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/defaultmock/SessionFactoryDefaultMock.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,12 +18,7 @@
 
 package org.hibernate.shards.defaultmock;
 
-import org.hibernate.ConnectionReleaseMode;
-import org.hibernate.HibernateException;
-import org.hibernate.Interceptor;
-import org.hibernate.MappingException;
-import org.hibernate.StatelessSession;
-import org.hibernate.proxy.EntityNotFoundDelegate;
+import org.hibernate.*;
 import org.hibernate.cache.Cache;
 import org.hibernate.cache.QueryCache;
 import org.hibernate.cache.UpdateTimestampsCache;
@@ -32,11 +27,7 @@
 import org.hibernate.connection.ConnectionProvider;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.function.SQLFunctionRegistry;
-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.*;
 import org.hibernate.engine.query.QueryPlanCache;
 import org.hibernate.exception.SQLExceptionConverter;
 import org.hibernate.id.IdentifierGenerator;
@@ -44,21 +35,21 @@
 import org.hibernate.metadata.CollectionMetadata;
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.proxy.EntityNotFoundDelegate;
 import org.hibernate.stat.Statistics;
 import org.hibernate.stat.StatisticsImplementor;
 import org.hibernate.type.Type;
 
+import javax.naming.NamingException;
+import javax.naming.Reference;
+import javax.transaction.TransactionManager;
 import java.io.Serializable;
 import java.sql.Connection;
 import java.util.Map;
 import java.util.Set;
 
-import javax.naming.NamingException;
-import javax.naming.Reference;
-import javax.transaction.TransactionManager;
-
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class SessionFactoryDefaultMock implements SessionFactoryImplementor {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/BaseShardingIntegrationTestCase.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/BaseShardingIntegrationTestCase.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/BaseShardingIntegrationTestCase.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -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;
@@ -54,18 +53,14 @@
 import java.sql.SQLException;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.Executors;
-import java.util.concurrent.SynchronousQueue;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.*;
 
 /**
  * Base class for all sharding integration tests.
  * Sets up and tears down in-memory hypersonic dbs.
  * The rest is up to you.
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public abstract class BaseShardingIntegrationTestCase extends TestCase implements HasPermutation {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/BaseShardingIntegrationTestCasePermutedIntegrationTest.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/BaseShardingIntegrationTestCasePermutedIntegrationTest.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/BaseShardingIntegrationTestCasePermutedIntegrationTest.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -25,7 +25,7 @@
  * the setup for the second test would fail because the tables would already
  * exist.
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class BaseShardingIntegrationTestCasePermutedIntegrationTest extends BaseShardingIntegrationTestCase {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/DbAccessPermutedIntegrationTest.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/DbAccessPermutedIntegrationTest.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/DbAccessPermutedIntegrationTest.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,20 +18,19 @@
 
 package org.hibernate.shards.integration;
 
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
 import org.hibernate.shards.engine.ShardedSessionFactoryImplementor;
 import org.hibernate.shards.util.JdbcStrategy;
 import org.hibernate.shards.util.JdbcUtil;
 
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Set;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class DbAccessPermutedIntegrationTest extends BaseShardingIntegrationTestCase {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/model/ModelPermutedIntegrationTest.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/model/ModelPermutedIntegrationTest.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/model/ModelPermutedIntegrationTest.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -47,7 +47,7 @@
 import java.util.Set;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class ModelPermutedIntegrationTest extends BaseShardingIntegrationTestCase {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/platform/DatabasePlatform.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/platform/DatabasePlatform.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/platform/DatabasePlatform.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -21,7 +21,7 @@
 import org.hibernate.shards.integration.IdGenType;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public interface DatabasePlatform {
   String getName();

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/platform/DatabasePlatformFactory.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/platform/DatabasePlatformFactory.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/platform/DatabasePlatformFactory.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -22,7 +22,7 @@
 import org.hibernate.shards.util.StringUtil;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public interface DatabasePlatformFactory {
   DatabasePlatform getDatabasePlatform();

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/platform/hsql/HSQLDatabasePlatform.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/platform/hsql/HSQLDatabasePlatform.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/platform/hsql/HSQLDatabasePlatform.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -27,7 +27,7 @@
 import java.util.List;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class HSQLDatabasePlatform extends BaseDatabasePlatform {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/loadbalance/RoundRobinShardLoadBalancerTest.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/loadbalance/RoundRobinShardLoadBalancerTest.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/loadbalance/RoundRobinShardLoadBalancerTest.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,15 +18,14 @@
 
 package org.hibernate.shards.loadbalance;
 
+import junit.framework.TestCase;
 import org.hibernate.shards.ShardId;
 import org.hibernate.shards.util.Lists;
 
-import junit.framework.TestCase;
-
 import java.util.List;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class RoundRobinShardLoadBalancerTest extends TestCase {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/loadbalance/ShardLoadBalancerDefaultMock.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/loadbalance/ShardLoadBalancerDefaultMock.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/loadbalance/ShardLoadBalancerDefaultMock.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -23,7 +23,7 @@
 import java.util.List;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class ShardLoadBalancerDefaultMock implements org.hibernate.shards.loadbalance.ShardLoadBalancer {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Building.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Building.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Building.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -24,7 +24,7 @@
 import java.util.List;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class Building {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Elevator.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Elevator.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Elevator.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -20,11 +20,11 @@
 
 import org.hibernate.shards.util.Lists;
 
+import java.io.Serializable;
 import java.util.List;
-import java.io.Serializable;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class Elevator {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Escalator.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Escalator.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Escalator.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -21,7 +21,7 @@
 import java.io.Serializable;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class Escalator {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Floor.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Floor.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Floor.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -20,11 +20,11 @@
 
 import org.hibernate.shards.util.Lists;
 
+import java.io.Serializable;
 import java.util.List;
-import java.io.Serializable;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class Floor {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Office.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Office.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Office.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,11 +18,11 @@
 
 package org.hibernate.shards.model;
 
+import java.io.Serializable;
 import java.util.List;
-import java.io.Serializable;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class Office {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Person.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Person.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Person.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -21,7 +21,7 @@
 import java.io.Serializable;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class Person {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Tenant.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Tenant.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Tenant.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,11 +18,11 @@
 
 package org.hibernate.shards.model;
 
+import java.io.Serializable;
 import java.util.List;
-import java.io.Serializable;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class Tenant {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/DisableFilterOpenSessionEventTest.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/DisableFilterOpenSessionEventTest.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/DisableFilterOpenSessionEventTest.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,14 +18,12 @@
 
 package org.hibernate.shards.session;
 
-import org.hibernate.shards.defaultmock.SessionDefaultMock;
-
 import junit.framework.TestCase;
-
 import org.hibernate.Session;
+import org.hibernate.shards.defaultmock.SessionDefaultMock;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class DisableFilterOpenSessionEventTest extends TestCase {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/EnableFilterOpenSessionEventTest.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/EnableFilterOpenSessionEventTest.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/EnableFilterOpenSessionEventTest.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,15 +18,13 @@
 
 package org.hibernate.shards.session;
 
-import org.hibernate.shards.defaultmock.SessionDefaultMock;
-
 import junit.framework.TestCase;
-
-import org.hibernate.Session;
 import org.hibernate.Filter;
+import org.hibernate.Session;
+import org.hibernate.shards.defaultmock.SessionDefaultMock;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class EnableFilterOpenSessionEventTest extends TestCase {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/OpenSessionEventDefaultMock.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/OpenSessionEventDefaultMock.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/OpenSessionEventDefaultMock.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -21,7 +21,7 @@
 import org.hibernate.Session;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class OpenSessionEventDefaultMock implements OpenSessionEvent {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/SetCacheModeOpenSessionEventTest.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/SetCacheModeOpenSessionEventTest.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/SetCacheModeOpenSessionEventTest.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,15 +18,13 @@
 
 package org.hibernate.shards.session;
 
-import org.hibernate.shards.defaultmock.SessionDefaultMock;
-
 import junit.framework.TestCase;
-
 import org.hibernate.CacheMode;
 import org.hibernate.Session;
+import org.hibernate.shards.defaultmock.SessionDefaultMock;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class SetCacheModeOpenSessionEventTest extends TestCase {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/SetFlushModeOpenSessionEventTest.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/SetFlushModeOpenSessionEventTest.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/SetFlushModeOpenSessionEventTest.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,15 +18,13 @@
 
 package org.hibernate.shards.session;
 
-import org.hibernate.shards.defaultmock.SessionDefaultMock;
-
 import junit.framework.TestCase;
-
 import org.hibernate.FlushMode;
 import org.hibernate.Session;
+import org.hibernate.shards.defaultmock.SessionDefaultMock;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class SetFlushModeOpenSessionEventTest extends TestCase {
   public void testOnOpenSession() {

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/SetReadOnlyOpenSessionEventTest.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/SetReadOnlyOpenSessionEventTest.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/SetReadOnlyOpenSessionEventTest.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,14 +18,12 @@
 
 package org.hibernate.shards.session;
 
-import org.hibernate.shards.defaultmock.SessionDefaultMock;
-
 import junit.framework.TestCase;
-
 import org.hibernate.Session;
+import org.hibernate.shards.defaultmock.SessionDefaultMock;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class SetReadOnlyOpenSessionEventTest extends TestCase {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/SetSessionOnRequiresSessionEventTest.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/SetSessionOnRequiresSessionEventTest.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/SetSessionOnRequiresSessionEventTest.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,14 +18,12 @@
 
 package org.hibernate.shards.session;
 
-import org.hibernate.shards.defaultmock.SessionDefaultMock;
-
 import junit.framework.TestCase;
-
 import org.hibernate.Session;
+import org.hibernate.shards.defaultmock.SessionDefaultMock;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class SetSessionOnRequiresSessionEventTest extends TestCase {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/ShardedSessionFactoryImplTest.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/ShardedSessionFactoryImplTest.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/ShardedSessionFactoryImplTest.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,37 +18,28 @@
 
 package org.hibernate.shards.session;
 
+import junit.framework.TestCase;
+import org.hibernate.HibernateException;
+import org.hibernate.Interceptor;
+import org.hibernate.cfg.Configuration;
+import org.hibernate.cfg.Environment;
+import org.hibernate.cfg.Settings;
+import org.hibernate.engine.SessionFactoryImplementor;
+import org.hibernate.shards.ShardId;
 import org.hibernate.shards.defaultmock.SessionFactoryDefaultMock;
 import org.hibernate.shards.strategy.ShardStrategy;
 import org.hibernate.shards.strategy.ShardStrategyDefaultMock;
 import org.hibernate.shards.strategy.ShardStrategyFactory;
 import org.hibernate.shards.strategy.ShardStrategyFactoryDefaultMock;
-import org.hibernate.shards.session.ShardedSessionFactoryImpl;
-import org.hibernate.shards.ShardId;
 import org.hibernate.shards.util.Maps;
 import org.hibernate.shards.util.Sets;
-import org.hibernate.shards.session.ShardedSessionFactory;
 
-import junit.framework.TestCase;
-
-import org.hibernate.HibernateException;
-import org.hibernate.Interceptor;
-import org.hibernate.cfg.Configuration;
-import org.hibernate.cfg.Environment;
-import org.hibernate.cfg.Settings;
-import org.hibernate.engine.SessionFactoryImplementor;
-
+import javax.naming.NamingException;
 import java.sql.Connection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
+import java.util.*;
 
-import javax.naming.NamingException;
-
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class ShardedSessionFactoryImplTest extends TestCase {
   private SessionFactoryImplementor sf;

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/ShardedSessionImplTest.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/ShardedSessionImplTest.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/ShardedSessionImplTest.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -19,18 +19,13 @@
 package org.hibernate.shards.session;
 
 import junit.framework.TestCase;
-
 import org.hibernate.EntityMode;
 import org.hibernate.HibernateException;
 import org.hibernate.Interceptor;
 import org.hibernate.Session;
 import org.hibernate.engine.SessionFactoryImplementor;
 import org.hibernate.metadata.ClassMetadata;
-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.*;
 import org.hibernate.shards.defaultmock.ClassMetadataDefaultMock;
 import org.hibernate.shards.defaultmock.InterceptorDefaultMock;
 import org.hibernate.shards.defaultmock.SessionFactoryDefaultMock;
@@ -54,7 +49,7 @@
 import java.util.Set;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class ShardedSessionImplTest extends TestCase {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/ShardStrategyDefaultMock.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/ShardStrategyDefaultMock.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/ShardStrategyDefaultMock.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,12 +18,12 @@
 
 package org.hibernate.shards.strategy;
 
-import org.hibernate.shards.strategy.selection.ShardSelectionStrategy;
 import org.hibernate.shards.strategy.access.ShardAccessStrategy;
 import org.hibernate.shards.strategy.resolution.ShardResolutionStrategy;
+import org.hibernate.shards.strategy.selection.ShardSelectionStrategy;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class ShardStrategyDefaultMock implements ShardStrategy {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/ShardStrategyFactoryDefaultMock.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/ShardStrategyFactoryDefaultMock.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/ShardStrategyFactoryDefaultMock.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -23,7 +23,7 @@
 import java.util.List;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class ShardStrategyFactoryDefaultMock implements ShardStrategyFactory {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/access/ShardAccessStrategyDefaultMock.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/access/ShardAccessStrategyDefaultMock.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/access/ShardAccessStrategyDefaultMock.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -26,7 +26,7 @@
 import java.util.List;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class ShardAccessStrategyDefaultMock implements ShardAccessStrategy {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/exit/ExitStrategyDefaultMock.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/exit/ExitStrategyDefaultMock.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/exit/ExitStrategyDefaultMock.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -21,7 +21,7 @@
 import org.hibernate.shards.Shard;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class ExitStrategyDefaultMock<T> implements ExitStrategy<T> {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/resolution/ShardResolutionStrategyDataDefaultMock.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/resolution/ShardResolutionStrategyDataDefaultMock.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/resolution/ShardResolutionStrategyDataDefaultMock.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -23,7 +23,7 @@
 import java.io.Serializable;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class ShardResolutionStrategyDataDefaultMock implements ShardResolutionStrategyData {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/resolution/ShardResolutionStrategyDefaultMock.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/resolution/ShardResolutionStrategyDefaultMock.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/resolution/ShardResolutionStrategyDefaultMock.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -24,7 +24,7 @@
 import java.util.List;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class ShardResolutionStrategyDefaultMock implements ShardResolutionStrategy {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/selection/LoadBalancedShardSelectionStrategyTest.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/selection/LoadBalancedShardSelectionStrategyTest.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/selection/LoadBalancedShardSelectionStrategyTest.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -18,16 +18,15 @@
 
 package org.hibernate.shards.strategy.selection;
 
+import junit.framework.TestCase;
 import org.hibernate.shards.ShardId;
 import org.hibernate.shards.loadbalance.ShardLoadBalancer;
 
-import junit.framework.TestCase;
-
 import java.util.Collections;
 import java.util.List;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class LoadBalancedShardSelectionStrategyTest extends TestCase {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/selection/ShardSelectionStrategyDefaultMock.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/selection/ShardSelectionStrategyDefaultMock.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/selection/ShardSelectionStrategyDefaultMock.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -21,7 +21,7 @@
 import org.hibernate.shards.ShardId;
 
 /**
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class ShardSelectionStrategyDefaultMock implements ShardSelectionStrategy {
 

Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/util/JdbcUtil.java
===================================================================
--- trunk/HibernateExt/shards/src/test/org/hibernate/shards/util/JdbcUtil.java	2007-05-08 10:50:39 UTC (rev 11481)
+++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/util/JdbcUtil.java	2007-05-08 14:55:29 UTC (rev 11482)
@@ -21,16 +21,12 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
+import java.sql.*;
 
 /**
  * Helper methods for Jdbc
  *
- * @author Max Ross <maxr at google.com>
+ * @author maxr at google.com (Max Ross)
  */
 public class JdbcUtil {
 




More information about the hibernate-commits mailing list