HHH-4028 - Move current cache-jbosscache2 module content to cache-jbosscache

git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@17023 1b8cb986-b30d-0410-93ca-fae66ebed9b2

cache-jbosscache/src/main/java/org/hibernate/cache/jbc/CacheInstanceManager.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.cache.jbc2;
+package org.hibernate.cache.jbc;
 
 import java.util.Properties;
 

cache-jbosscache/src/main/java/org/hibernate/cache/jbc/JBossCacheRegionFactory.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.cache.jbc2;
+package org.hibernate.cache.jbc;
 
 import java.util.Properties;
 
@@ -32,12 +32,12 @@ import org.hibernate.cache.EntityRegion;
 import org.hibernate.cache.QueryResultsRegion;
 import org.hibernate.cache.RegionFactory;
 import org.hibernate.cache.TimestampsRegion;
-import org.hibernate.cache.jbc2.builder.JndiSharedCacheInstanceManager;
+import org.hibernate.cache.jbc.builder.JndiSharedCacheInstanceManager;
-import org.hibernate.cache.jbc2.builder.SharedCacheInstanceManager;
+import org.hibernate.cache.jbc.builder.SharedCacheInstanceManager;
-import org.hibernate.cache.jbc2.collection.CollectionRegionImpl;
+import org.hibernate.cache.jbc.collection.CollectionRegionImpl;
-import org.hibernate.cache.jbc2.entity.EntityRegionImpl;
+import org.hibernate.cache.jbc.entity.EntityRegionImpl;
-import org.hibernate.cache.jbc2.query.QueryResultsRegionImpl;
+import org.hibernate.cache.jbc.query.QueryResultsRegionImpl;
-import org.hibernate.cache.jbc2.timestamp.TimestampsRegionImpl;
+import org.hibernate.cache.jbc.timestamp.TimestampsRegionImpl;
 import org.hibernate.cfg.Environment;
 import org.hibernate.cfg.Settings;
 import org.hibernate.util.PropertiesHelper;

cache-jbosscache/src/main/java/org/hibernate/cache/jbc/JndiMultiplexedJBossCacheRegionFactory.java

@@ -21,11 +21,11 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.cache.jbc2;
+package org.hibernate.cache.jbc;
 
 import java.util.Properties;
 
-import org.hibernate.cache.jbc2.builder.JndiMultiplexingCacheInstanceManager;
+import org.hibernate.cache.jbc.builder.JndiMultiplexingCacheInstanceManager;
 
 /**
  * {@link JBossCacheRegionFactory} that uses

cache-jbosscache/src/main/java/org/hibernate/cache/jbc/JndiSharedJBossCacheRegionFactory.java

@@ -21,11 +21,11 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.cache.jbc2;
+package org.hibernate.cache.jbc;
 
 import java.util.Properties;
 
-import org.hibernate.cache.jbc2.builder.JndiSharedCacheInstanceManager;
+import org.hibernate.cache.jbc.builder.JndiSharedCacheInstanceManager;
 
 /**
  * {@link JBossCacheRegionFactory} that uses

cache-jbosscache/src/main/java/org/hibernate/cache/jbc/MultiplexedJBossCacheRegionFactory.java

@@ -21,11 +21,11 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.cache.jbc2;
+package org.hibernate.cache.jbc;
 
 import java.util.Properties;
 
-import org.hibernate.cache.jbc2.builder.MultiplexingCacheInstanceManager;
+import org.hibernate.cache.jbc.builder.MultiplexingCacheInstanceManager;
 
 /**
  * {@link JBossCacheRegionFactory} that uses

cache-jbosscache/src/main/java/org/hibernate/cache/jbc/SharedJBossCacheRegionFactory.java

@@ -21,12 +21,12 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.cache.jbc2;
+package org.hibernate.cache.jbc;
 
 import java.util.Properties;
 
-import org.hibernate.cache.jbc2.builder.JndiSharedCacheInstanceManager;
+import org.hibernate.cache.jbc.builder.JndiSharedCacheInstanceManager;
-import org.hibernate.cache.jbc2.builder.SharedCacheInstanceManager;
+import org.hibernate.cache.jbc.builder.SharedCacheInstanceManager;
 import org.jboss.cache.DefaultCacheFactory;
 
 /**

cache-jbosscache/src/main/java/org/hibernate/cache/jbc/TransactionalDataRegionAdapter.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.cache.jbc2;
+package org.hibernate.cache.jbc;
 
 import org.hibernate.cache.CacheDataDescription;
 import org.hibernate.cache.TransactionalDataRegion;

cache-jbosscache/src/main/java/org/hibernate/cache/jbc/access/OptimisticTransactionalAccessDelegate.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.cache.jbc2.access;
+package org.hibernate.cache.jbc.access;
 
 import javax.transaction.Transaction;
 
@@ -29,10 +29,10 @@ import org.hibernate.cache.CacheDataDescription;
 import org.hibernate.cache.CacheException;
 import org.hibernate.cache.access.CollectionRegionAccessStrategy;
 import org.hibernate.cache.access.EntityRegionAccessStrategy;
-import org.hibernate.cache.jbc2.TransactionalDataRegionAdapter;
+import org.hibernate.cache.jbc.TransactionalDataRegionAdapter;
-import org.hibernate.cache.jbc2.util.CacheHelper;
+import org.hibernate.cache.jbc.util.CacheHelper;
-import org.hibernate.cache.jbc2.util.DataVersionAdapter;
+import org.hibernate.cache.jbc.util.DataVersionAdapter;
-import org.hibernate.cache.jbc2.util.NonLockingDataVersion;
+import org.hibernate.cache.jbc.util.NonLockingDataVersion;
 import org.jboss.cache.config.Option;
 import org.jboss.cache.optimistic.DataVersion;
 

cache-jbosscache/src/main/java/org/hibernate/cache/jbc/access/TransactionalAccessDelegate.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.cache.jbc2.access;
+package org.hibernate.cache.jbc.access;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -34,8 +34,8 @@ import org.hibernate.cache.CacheException;
 import org.hibernate.cache.access.CollectionRegionAccessStrategy;
 import org.hibernate.cache.access.EntityRegionAccessStrategy;
 import org.hibernate.cache.access.SoftLock;
-import org.hibernate.cache.jbc2.BasicRegionAdapter;
+import org.hibernate.cache.jbc.BasicRegionAdapter;
-import org.hibernate.cache.jbc2.util.CacheHelper;
+import org.hibernate.cache.jbc.util.CacheHelper;
 import org.jboss.cache.Cache;
 import org.jboss.cache.Fqn;
 

cache-jbosscache/src/main/java/org/hibernate/cache/jbc/builder/JndiMultiplexingCacheInstanceManager.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.cache.jbc2.builder;
+package org.hibernate.cache.jbc.builder;
 
 import java.util.Properties;
 

cache-jbosscache/src/main/java/org/hibernate/cache/jbc/builder/JndiSharedCacheInstanceManager.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.cache.jbc2.builder;
+package org.hibernate.cache.jbc.builder;
 
 import java.util.Properties;
 

cache-jbosscache/src/main/java/org/hibernate/cache/jbc/builder/MultiplexingCacheInstanceManager.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.cache.jbc2.builder;
+package org.hibernate.cache.jbc.builder;
 
 import java.util.Properties;
 import javax.transaction.TransactionManager;
@@ -37,8 +37,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.hibernate.cache.CacheException;
-import org.hibernate.cache.jbc2.CacheInstanceManager;
+import org.hibernate.cache.jbc.CacheInstanceManager;
-import org.hibernate.cache.jbc2.util.CacheHelper;
+import org.hibernate.cache.jbc.util.CacheHelper;
 import org.hibernate.cfg.Settings;
 import org.hibernate.transaction.TransactionManagerLookup;
 import org.hibernate.util.PropertiesHelper;

cache-jbosscache/src/main/java/org/hibernate/cache/jbc/builder/SharedCacheInstanceManager.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.cache.jbc2.builder;
+package org.hibernate.cache.jbc.builder;
 
 import java.util.Properties;
 import javax.transaction.TransactionManager;
@@ -36,8 +36,8 @@ import org.jgroups.ChannelFactory;
 import org.jgroups.JChannelFactory;
 
 import org.hibernate.cache.CacheException;
-import org.hibernate.cache.jbc2.CacheInstanceManager;
+import org.hibernate.cache.jbc.CacheInstanceManager;
-import org.hibernate.cache.jbc2.util.CacheHelper;
+import org.hibernate.cache.jbc.util.CacheHelper;
 import org.hibernate.cfg.Settings;
 import org.hibernate.util.PropertiesHelper;
 

cache-jbosscache/src/main/java/org/hibernate/cache/jbc/collection/CollectionRegionImpl.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.cache.jbc2.collection;
+package org.hibernate.cache.jbc.collection;
 
 import org.jboss.cache.Cache;
 import org.jboss.cache.Fqn;
@@ -33,7 +33,7 @@ import org.hibernate.cache.CacheException;
 import org.hibernate.cache.CollectionRegion;
 import org.hibernate.cache.access.AccessType;
 import org.hibernate.cache.access.CollectionRegionAccessStrategy;
-import org.hibernate.cache.jbc2.TransactionalDataRegionAdapter;
+import org.hibernate.cache.jbc.TransactionalDataRegionAdapter;
 
 /**
  * Defines the behavior of the collection cache regions for JBossCache 2.x.

cache-jbosscache/src/main/java/org/hibernate/cache/jbc/collection/OptimisticReadOnlyAccess.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.cache.jbc2.collection;
+package org.hibernate.cache.jbc.collection;
 
 import org.hibernate.cache.CacheException;
 import org.hibernate.cache.access.SoftLock;

cache-jbosscache/src/main/java/org/hibernate/cache/jbc/collection/OptimisticTransactionalAccess.java

@@ -21,9 +21,9 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.cache.jbc2.collection;
+package org.hibernate.cache.jbc.collection;
 
-import org.hibernate.cache.jbc2.access.OptimisticTransactionalAccessDelegate;
+import org.hibernate.cache.jbc.access.OptimisticTransactionalAccessDelegate;
 
 /**
  * Defines the strategy for transactional access to entity data in an

cache-jbosscache/src/main/java/org/hibernate/cache/jbc/collection/ReadOnlyAccess.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.cache.jbc2.collection;
+package org.hibernate.cache.jbc.collection;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

cache-jbosscache/src/main/java/org/hibernate/cache/jbc/collection/TransactionalAccess.java

@@ -21,13 +21,13 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.cache.jbc2.collection;
+package org.hibernate.cache.jbc.collection;
 
 import org.hibernate.cache.CacheException;
 import org.hibernate.cache.CollectionRegion;
 import org.hibernate.cache.access.CollectionRegionAccessStrategy;
 import org.hibernate.cache.access.SoftLock;
-import org.hibernate.cache.jbc2.access.TransactionalAccessDelegate;
+import org.hibernate.cache.jbc.access.TransactionalAccessDelegate;
 
 /**
  * This defines the strategy for transactional access to collection data in a

cache-jbosscache/src/main/java/org/hibernate/cache/jbc/entity/EntityRegionImpl.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.cache.jbc2.entity;
+package org.hibernate.cache.jbc.entity;
 
 import org.jboss.cache.Cache;
 import org.jboss.cache.Fqn;
@@ -33,7 +33,7 @@ import org.hibernate.cache.CacheException;
 import org.hibernate.cache.EntityRegion;
 import org.hibernate.cache.access.AccessType;
 import org.hibernate.cache.access.EntityRegionAccessStrategy;
-import org.hibernate.cache.jbc2.TransactionalDataRegionAdapter;
+import org.hibernate.cache.jbc.TransactionalDataRegionAdapter;
 
 /**
  * Defines the behavior of the entity cache regions for JBossCache.

cache-jbosscache/src/main/java/org/hibernate/cache/jbc/entity/OptimisticReadOnlyAccess.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.cache.jbc2.entity;
+package org.hibernate.cache.jbc.entity;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

cache-jbosscache/src/main/java/org/hibernate/cache/jbc/entity/OptimisticTransactionalAccess.java

@@ -22,9 +22,9 @@
  * Boston, MA  02110-1301  USA
  */
 
-package org.hibernate.cache.jbc2.entity;
+package org.hibernate.cache.jbc.entity;
 
-import org.hibernate.cache.jbc2.access.OptimisticTransactionalAccessDelegate;
+import org.hibernate.cache.jbc.access.OptimisticTransactionalAccessDelegate;
 
 /**
  * Defines the strategy for transactional access to entity data in an

cache-jbosscache/src/main/java/org/hibernate/cache/jbc/entity/ReadOnlyAccess.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.cache.jbc2.entity;
+package org.hibernate.cache.jbc.entity;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

cache-jbosscache/src/main/java/org/hibernate/cache/jbc/entity/TransactionalAccess.java

@@ -21,11 +21,11 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.cache.jbc2.entity;
+package org.hibernate.cache.jbc.entity;
 
 import org.hibernate.cache.access.EntityRegionAccessStrategy;
 import org.hibernate.cache.access.SoftLock;
-import org.hibernate.cache.jbc2.access.TransactionalAccessDelegate;
+import org.hibernate.cache.jbc.access.TransactionalAccessDelegate;
 import org.hibernate.cache.EntityRegion;
 import org.hibernate.cache.CacheException;
 

cache-jbosscache/src/main/java/org/hibernate/cache/jbc/query/QueryResultsRegionImpl.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.cache.jbc2.query;
+package org.hibernate.cache.jbc.query;
 
 import java.util.Properties;
 
@@ -29,8 +29,8 @@ import javax.transaction.Transaction;
 
 import org.hibernate.cache.CacheException;
 import org.hibernate.cache.QueryResultsRegion;
-import org.hibernate.cache.jbc2.TransactionalDataRegionAdapter;
+import org.hibernate.cache.jbc.TransactionalDataRegionAdapter;
-import org.hibernate.cache.jbc2.util.CacheHelper;
+import org.hibernate.cache.jbc.util.CacheHelper;
 import org.hibernate.util.PropertiesHelper;
 import org.jboss.cache.Cache;
 import org.jboss.cache.Fqn;

cache-jbosscache/src/main/java/org/hibernate/cache/jbc/timestamp/ClusteredConcurrentTimestampsRegionImpl.java

@@ -14,7 +14,7 @@
  * Red Hat Author(s): Brian Stansberry
  */
 
-package org.hibernate.cache.jbc2.timestamp;
+package org.hibernate.cache.jbc.timestamp;
 
 import java.util.Properties;
 import java.util.Set;
@@ -25,8 +25,8 @@ import javax.transaction.Transaction;
 
 import org.hibernate.cache.CacheException;
 import org.hibernate.cache.TimestampsRegion;
-import org.hibernate.cache.jbc2.TransactionalDataRegionAdapter;
+import org.hibernate.cache.jbc.TransactionalDataRegionAdapter;
-import org.hibernate.cache.jbc2.util.CacheHelper;
+import org.hibernate.cache.jbc.util.CacheHelper;
 import org.jboss.cache.Cache;
 import org.jboss.cache.Fqn;
 import org.jboss.cache.config.Option;

cache-jbosscache/src/main/java/org/hibernate/cache/jbc/timestamp/TimestampsRegionImpl.java

@@ -22,7 +22,7 @@
  * Boston, MA  02110-1301  USA
  */
 
-package org.hibernate.cache.jbc2.timestamp;
+package org.hibernate.cache.jbc.timestamp;
 
 import java.util.Map;
 import java.util.Properties;
@@ -33,8 +33,8 @@ import javax.transaction.Transaction;
 
 import org.hibernate.cache.CacheException;
 import org.hibernate.cache.TimestampsRegion;
-import org.hibernate.cache.jbc2.TransactionalDataRegionAdapter;
+import org.hibernate.cache.jbc.TransactionalDataRegionAdapter;
-import org.hibernate.cache.jbc2.util.CacheHelper;
+import org.hibernate.cache.jbc.util.CacheHelper;
 import org.jboss.cache.Cache;
 import org.jboss.cache.Fqn;
 import org.jboss.cache.config.Option;

cache-jbosscache/src/main/java/org/hibernate/cache/jbc/util/CircumventChecksDataVersion.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.cache.jbc2.util;
+package org.hibernate.cache.jbc.util;
 
 import org.hibernate.cache.CacheException;
 import org.jboss.cache.config.Option;

cache-jbosscache/src/main/java/org/hibernate/cache/jbc/util/DataVersionAdapter.java

@@ -22,12 +22,12 @@
  * Boston, MA  02110-1301  USA
  */
 
-package org.hibernate.cache.jbc2.util;
+package org.hibernate.cache.jbc.util;
 
 import java.io.IOException;
 import java.util.Comparator;
 
-import org.hibernate.cache.jbc2.entity.TransactionalAccess;
+import org.hibernate.cache.jbc.entity.TransactionalAccess;
 import org.hibernate.util.CalendarComparator;
 import org.hibernate.util.ComparableComparator;
 import org.jboss.cache.optimistic.DataVersion;

cache-jbosscache/src/main/java/org/hibernate/cache/jbc/util/NonLockingDataVersion.java

@@ -21,9 +21,9 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.cache.jbc2.util;
+package org.hibernate.cache.jbc.util;
 
-import org.hibernate.cache.jbc2.entity.TransactionalAccess;
+import org.hibernate.cache.jbc.entity.TransactionalAccess;
 import org.jboss.cache.config.Option;
 import org.jboss.cache.optimistic.DataVersion;
 import org.slf4j.Logger;

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/AbstractEntityCollectionRegionTestCase.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2;
+package org.hibernate.test.cache.jbc;
 
 import java.util.Properties;
 
@@ -29,11 +29,11 @@ import org.hibernate.cache.CacheDataDescription;
 import org.hibernate.cache.RegionFactory;
 import org.hibernate.cache.TransactionalDataRegion;
 import org.hibernate.cache.access.AccessType;
-import org.hibernate.cache.jbc2.JBossCacheRegionFactory;
+import org.hibernate.cache.jbc.JBossCacheRegionFactory;
-import org.hibernate.cache.jbc2.MultiplexedJBossCacheRegionFactory;
+import org.hibernate.cache.jbc.MultiplexedJBossCacheRegionFactory;
-import org.hibernate.cache.jbc2.SharedJBossCacheRegionFactory;
+import org.hibernate.cache.jbc.SharedJBossCacheRegionFactory;
-import org.hibernate.cache.jbc2.builder.MultiplexingCacheInstanceManager;
+import org.hibernate.cache.jbc.builder.MultiplexingCacheInstanceManager;
-import org.hibernate.cache.jbc2.builder.SharedCacheInstanceManager;
+import org.hibernate.cache.jbc.builder.SharedCacheInstanceManager;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.cfg.Environment;
 import org.hibernate.test.util.CacheTestUtil;

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/AbstractGeneralDataRegionTestCase.java

@@ -21,20 +21,18 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2;
+package org.hibernate.test.cache.jbc;
 
 import java.util.Iterator;
-import java.util.Set;
 
-import org.hibernate.cache.CacheException;
 import org.hibernate.cache.GeneralDataRegion;
 import org.hibernate.cache.QueryResultsRegion;
 import org.hibernate.cache.Region;
-import org.hibernate.cache.jbc2.JBossCacheRegionFactory;
+import org.hibernate.cache.jbc.JBossCacheRegionFactory;
-import org.hibernate.cache.jbc2.MultiplexedJBossCacheRegionFactory;
+import org.hibernate.cache.jbc.MultiplexedJBossCacheRegionFactory;
-import org.hibernate.cache.jbc2.builder.MultiplexingCacheInstanceManager;
+import org.hibernate.cache.jbc.builder.MultiplexingCacheInstanceManager;
-import org.hibernate.cache.jbc2.util.CacheHelper;
+import org.hibernate.cache.jbc.util.CacheHelper;
-import org.hibernate.cache.jbc2.util.NonLockingDataVersion;
+import org.hibernate.cache.jbc.util.NonLockingDataVersion;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.test.util.CacheTestUtil;
 import org.jboss.cache.Cache;

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/AbstractJBossCacheTestCase.java

@@ -21,14 +21,14 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2;
+package org.hibernate.test.cache.jbc;
 
 
 
 import java.util.Set;
 
 import org.hibernate.cache.RegionFactory;
-import org.hibernate.cache.jbc2.util.CacheHelper;
+import org.hibernate.cache.jbc.util.CacheHelper;
 import org.hibernate.junit.UnitTestCase;
 import org.hibernate.test.util.CacheTestSupport;
 import org.jboss.cache.Cache;

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/AbstractRegionImplTestCase.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2;
+package org.hibernate.test.cache.jbc;
 
 import java.util.Map;
 import java.util.Properties;
@@ -29,9 +29,9 @@ import java.util.Properties;
 import org.hibernate.cache.CacheDataDescription;
 import org.hibernate.cache.Region;
 import org.hibernate.cache.impl.CacheDataDescriptionImpl;
-import org.hibernate.cache.jbc2.JBossCacheRegionFactory;
+import org.hibernate.cache.jbc.JBossCacheRegionFactory;
-import org.hibernate.cache.jbc2.SharedJBossCacheRegionFactory;
+import org.hibernate.cache.jbc.SharedJBossCacheRegionFactory;
-import org.hibernate.cache.jbc2.builder.SharedCacheInstanceManager;
+import org.hibernate.cache.jbc.builder.SharedCacheInstanceManager;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.test.util.CacheTestUtil;
 import org.hibernate.util.ComparableComparator;

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/JBossCacheComplianceTest.java

@@ -21,15 +21,15 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2;
+package org.hibernate.test.cache.jbc;
 
 import junit.framework.TestCase;
 
 import org.hibernate.cache.RegionFactory;
-import org.hibernate.cache.jbc2.JBossCacheRegionFactory;
+import org.hibernate.cache.jbc.JBossCacheRegionFactory;
-import org.hibernate.cache.jbc2.MultiplexedJBossCacheRegionFactory;
+import org.hibernate.cache.jbc.MultiplexedJBossCacheRegionFactory;
-import org.hibernate.cache.jbc2.builder.SharedCacheInstanceManager;
+import org.hibernate.cache.jbc.builder.SharedCacheInstanceManager;
-import org.hibernate.cache.jbc2.util.CacheHelper;
+import org.hibernate.cache.jbc.util.CacheHelper;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.cfg.Settings;
 import org.hibernate.test.util.CacheTestSupport;
@@ -67,7 +67,7 @@ public class JBossCacheComplianceTest extends TestCase {
     }
 
     protected String getConfigResourceLocation() {
-        return "org/hibernate/test/cache/jbc2/functional/optimistic-treecache.xml";
+        return "org/hibernate/test/cache/jbc/functional/optimistic-treecache.xml";
     }
 
     protected Class<? extends RegionFactory> getCacheRegionFactory() {

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/JBossCacheRegionFactoryTestCase.java

@@ -21,14 +21,14 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2;
+package org.hibernate.test.cache.jbc;
 
 import java.util.Properties;
 
-import org.hibernate.cache.jbc2.CacheInstanceManager;
+import org.hibernate.cache.jbc.CacheInstanceManager;
-import org.hibernate.cache.jbc2.JBossCacheRegionFactory;
+import org.hibernate.cache.jbc.JBossCacheRegionFactory;
-import org.hibernate.cache.jbc2.builder.MultiplexingCacheInstanceManager;
+import org.hibernate.cache.jbc.builder.MultiplexingCacheInstanceManager;
-import org.hibernate.cache.jbc2.builder.SharedCacheInstanceManager;
+import org.hibernate.cache.jbc.builder.SharedCacheInstanceManager;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.cfg.Settings;
 import org.hibernate.test.util.CacheTestUtil;

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/Jbc2ConfigsXmlValidityTestCase.java

@@ -14,7 +14,7 @@
  * Red Hat Author(s): Brian Stansberry
  */
 
-package org.hibernate.test.cache.jbc2;
+package org.hibernate.test.cache.jbc;
 
 import java.util.HashSet;
 import java.util.Set;

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/builder/CacheInstanceManagerTestBase.java

@@ -21,12 +21,12 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.builder;
+package org.hibernate.test.cache.jbc.builder;
 
-import org.hibernate.cache.jbc2.CacheInstanceManager;
+import org.hibernate.cache.jbc.CacheInstanceManager;
-import org.hibernate.cache.jbc2.JBossCacheRegionFactory;
+import org.hibernate.cache.jbc.JBossCacheRegionFactory;
 import org.hibernate.cfg.Configuration;
-import org.hibernate.test.cache.jbc2.AbstractJBossCacheTestCase;
+import org.hibernate.test.cache.jbc.AbstractJBossCacheTestCase;
 import org.hibernate.test.util.CacheTestUtil;
 
 /**

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/builder/MultiplexedCacheInstanceManagerTestCase.java

@@ -21,9 +21,9 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.builder;
+package org.hibernate.test.cache.jbc.builder;
 
-import org.hibernate.cache.jbc2.MultiplexedJBossCacheRegionFactory;
+import org.hibernate.cache.jbc.MultiplexedJBossCacheRegionFactory;
 
 
 /**

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/builder/SharedCacheInstanceManagerTestCase.java

@@ -21,9 +21,9 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.builder;
+package org.hibernate.test.cache.jbc.builder;
 
-import org.hibernate.cache.jbc2.SharedJBossCacheRegionFactory;
+import org.hibernate.cache.jbc.SharedJBossCacheRegionFactory;
 
 /**
  * A SharedCacheInstanceManagerTestCase.

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/AbstractCollectionRegionAccessStrategyTestCase.java

@@ -21,10 +21,8 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.collection;
+package org.hibernate.test.cache.jbc.collection;
 
-import java.util.Iterator;
-import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
@@ -34,21 +32,20 @@ import junit.framework.Test;
 import junit.framework.TestSuite;
 
 import org.hibernate.cache.CacheDataDescription;
-import org.hibernate.cache.CacheException;
 import org.hibernate.cache.CollectionRegion;
 import org.hibernate.cache.access.AccessType;
 import org.hibernate.cache.access.CollectionRegionAccessStrategy;
 import org.hibernate.cache.impl.CacheDataDescriptionImpl;
-import org.hibernate.cache.jbc2.BasicRegionAdapter;
+import org.hibernate.cache.jbc.BasicRegionAdapter;
-import org.hibernate.cache.jbc2.JBossCacheRegionFactory;
+import org.hibernate.cache.jbc.JBossCacheRegionFactory;
-import org.hibernate.cache.jbc2.MultiplexedJBossCacheRegionFactory;
+import org.hibernate.cache.jbc.MultiplexedJBossCacheRegionFactory;
-import org.hibernate.cache.jbc2.builder.MultiplexingCacheInstanceManager;
+import org.hibernate.cache.jbc.builder.MultiplexingCacheInstanceManager;
-import org.hibernate.cache.jbc2.collection.CollectionRegionImpl;
+import org.hibernate.cache.jbc.collection.CollectionRegionImpl;
-import org.hibernate.cache.jbc2.entity.TransactionalAccess;
+import org.hibernate.cache.jbc.entity.TransactionalAccess;
-import org.hibernate.cache.jbc2.util.CacheHelper;
+import org.hibernate.cache.jbc.util.CacheHelper;
-import org.hibernate.cache.jbc2.util.NonLockingDataVersion;
+import org.hibernate.cache.jbc.util.NonLockingDataVersion;
 import org.hibernate.cfg.Configuration;
-import org.hibernate.test.cache.jbc2.AbstractJBossCacheTestCase;
+import org.hibernate.test.cache.jbc.AbstractJBossCacheTestCase;
 import org.hibernate.test.util.CacheTestUtil;
 import org.hibernate.util.ComparableComparator;
 import org.jboss.cache.Cache;

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/AbstractReadOnlyAccessTestCase.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.collection;
+package org.hibernate.test.cache.jbc.collection;
 
 import org.hibernate.cache.access.AccessType;
 

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/AbstractTransactionalAccessTestCase.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.collection;
+package org.hibernate.test.cache.jbc.collection;
 
 import org.hibernate.cache.access.AccessType;
 

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/CollectionRegionImplTestCase.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.collection;
+package org.hibernate.test.cache.jbc.collection;
 
 import java.util.Properties;
 
@@ -32,11 +32,11 @@ import org.hibernate.cache.Region;
 import org.hibernate.cache.RegionFactory;
 import org.hibernate.cache.access.AccessType;
 import org.hibernate.cache.access.CollectionRegionAccessStrategy;
-import org.hibernate.cache.jbc2.BasicRegionAdapter;
+import org.hibernate.cache.jbc.BasicRegionAdapter;
-import org.hibernate.cache.jbc2.CacheInstanceManager;
+import org.hibernate.cache.jbc.CacheInstanceManager;
-import org.hibernate.cache.jbc2.JBossCacheRegionFactory;
+import org.hibernate.cache.jbc.JBossCacheRegionFactory;
-import org.hibernate.cache.jbc2.collection.CollectionRegionImpl;
+import org.hibernate.cache.jbc.collection.CollectionRegionImpl;
-import org.hibernate.test.cache.jbc2.AbstractEntityCollectionRegionTestCase;
+import org.hibernate.test.cache.jbc.AbstractEntityCollectionRegionTestCase;
 import org.jboss.cache.Cache;
 import org.jboss.cache.Fqn;
 

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/MvccInvalidatedTransactionalTestCase.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.collection;
+package org.hibernate.test.cache.jbc.collection;
 
 import org.hibernate.test.util.CacheTestUtil;
 

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/MvccReadOnlyExtraAPITestCase.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.collection;
+package org.hibernate.test.cache.jbc.collection;
 
 import org.hibernate.cache.access.CollectionRegionAccessStrategy;
 

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/MvccReadOnlyTestCase.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.collection;
+package org.hibernate.test.cache.jbc.collection;
 
 import org.hibernate.test.util.CacheTestUtil;
 

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/MvccReplicatedTransactionalTestCase.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.collection;
+package org.hibernate.test.cache.jbc.collection;
 
 import junit.framework.Test;
 

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/MvccTransactionalExtraAPITestCase.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.collection;
+package org.hibernate.test.cache.jbc.collection;
 
 import org.hibernate.cache.access.CollectionRegionAccessStrategy;
 

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/OptimisticInvalidatedTransactionalTestCase.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.collection;
+package org.hibernate.test.cache.jbc.collection;
 
 import org.hibernate.test.util.CacheTestUtil;
 

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/OptimisticReadOnlyExtraAPITestCase.java

@@ -21,11 +21,11 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.collection;
+package org.hibernate.test.cache.jbc.collection;
 
 import org.hibernate.cache.access.AccessType;
 import org.hibernate.cache.access.CollectionRegionAccessStrategy;
-import org.hibernate.cache.jbc2.entity.TransactionalAccess;
+import org.hibernate.cache.jbc.entity.TransactionalAccess;
 
 /**
  * Tests for the "extra API" in EntityRegionAccessStrategy; in this

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/OptimisticReadOnlyTestCase.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.collection;
+package org.hibernate.test.cache.jbc.collection;
 
 import org.hibernate.test.util.CacheTestUtil;
 

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/OptimisticReplicatedTransactionalTestCase.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.collection;
+package org.hibernate.test.cache.jbc.collection;
 
 import junit.framework.Test;
 

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/OptimisticTransactionalExtraAPITestCase.java

@@ -21,18 +21,18 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.collection;
+package org.hibernate.test.cache.jbc.collection;
 
 import org.hibernate.cache.CollectionRegion;
 import org.hibernate.cache.access.AccessType;
 import org.hibernate.cache.access.CollectionRegionAccessStrategy;
 import org.hibernate.cache.access.SoftLock;
-import org.hibernate.cache.jbc2.JBossCacheRegionFactory;
+import org.hibernate.cache.jbc.JBossCacheRegionFactory;
-import org.hibernate.cache.jbc2.MultiplexedJBossCacheRegionFactory;
+import org.hibernate.cache.jbc.MultiplexedJBossCacheRegionFactory;
-import org.hibernate.cache.jbc2.builder.MultiplexingCacheInstanceManager;
+import org.hibernate.cache.jbc.builder.MultiplexingCacheInstanceManager;
-import org.hibernate.cache.jbc2.entity.TransactionalAccess;
+import org.hibernate.cache.jbc.entity.TransactionalAccess;
 import org.hibernate.cfg.Configuration;
-import org.hibernate.test.cache.jbc2.AbstractJBossCacheTestCase;
+import org.hibernate.test.cache.jbc.AbstractJBossCacheTestCase;
 import org.hibernate.test.util.CacheTestUtil;
 import org.jboss.cache.Cache;
 

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/PessimisticInvalidatedTransactionalTestCase.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.collection;
+package org.hibernate.test.cache.jbc.collection;
 
 import org.hibernate.test.util.CacheTestUtil;
 

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/PessimisticReadOnlyExtraAPITestCase.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.collection;
+package org.hibernate.test.cache.jbc.collection;
 
 import org.hibernate.cache.access.CollectionRegionAccessStrategy;
 

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/PessimisticReadOnlyTestCase.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.collection;
+package org.hibernate.test.cache.jbc.collection;
 
 import org.hibernate.test.util.CacheTestUtil;
 

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/PessimisticReplicatedTransactionalTestCase.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.collection;
+package org.hibernate.test.cache.jbc.collection;
 
 import junit.framework.Test;
 

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/PessimisticTransactionalExtraAPITestCase.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.collection;
+package org.hibernate.test.cache.jbc.collection;
 
 import org.hibernate.cache.access.CollectionRegionAccessStrategy;
 

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/AbstractEntityRegionAccessStrategyTestCase.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.entity;
+package org.hibernate.test.cache.jbc.entity;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
@@ -36,16 +36,16 @@ import org.hibernate.cache.EntityRegion;
 import org.hibernate.cache.access.AccessType;
 import org.hibernate.cache.access.EntityRegionAccessStrategy;
 import org.hibernate.cache.impl.CacheDataDescriptionImpl;
-import org.hibernate.cache.jbc2.BasicRegionAdapter;
+import org.hibernate.cache.jbc.BasicRegionAdapter;
-import org.hibernate.cache.jbc2.JBossCacheRegionFactory;
+import org.hibernate.cache.jbc.JBossCacheRegionFactory;
-import org.hibernate.cache.jbc2.MultiplexedJBossCacheRegionFactory;
+import org.hibernate.cache.jbc.MultiplexedJBossCacheRegionFactory;
-import org.hibernate.cache.jbc2.builder.MultiplexingCacheInstanceManager;
+import org.hibernate.cache.jbc.builder.MultiplexingCacheInstanceManager;
-import org.hibernate.cache.jbc2.entity.EntityRegionImpl;
+import org.hibernate.cache.jbc.entity.EntityRegionImpl;
-import org.hibernate.cache.jbc2.entity.TransactionalAccess;
+import org.hibernate.cache.jbc.entity.TransactionalAccess;
-import org.hibernate.cache.jbc2.util.CacheHelper;
+import org.hibernate.cache.jbc.util.CacheHelper;
-import org.hibernate.cache.jbc2.util.NonLockingDataVersion;
+import org.hibernate.cache.jbc.util.NonLockingDataVersion;
 import org.hibernate.cfg.Configuration;
-import org.hibernate.test.cache.jbc2.AbstractJBossCacheTestCase;
+import org.hibernate.test.cache.jbc.AbstractJBossCacheTestCase;
 import org.hibernate.test.util.CacheTestUtil;
 import org.hibernate.util.ComparableComparator;
 import org.jboss.cache.Cache;

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/AbstractReadOnlyAccessTestCase.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.entity;
+package org.hibernate.test.cache.jbc.entity;
 
 import org.hibernate.cache.access.AccessType;
 import org.jboss.cache.transaction.BatchModeTransactionManager;

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/AbstractTransactionalAccessTestCase.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.entity;
+package org.hibernate.test.cache.jbc.entity;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/EntityRegionImplTestCase.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.entity;
+package org.hibernate.test.cache.jbc.entity;
 
 import java.util.Properties;
 
@@ -31,11 +31,11 @@ import org.hibernate.cache.EntityRegion;
 import org.hibernate.cache.Region;
 import org.hibernate.cache.RegionFactory;
 import org.hibernate.cache.access.AccessType;
-import org.hibernate.cache.jbc2.BasicRegionAdapter;
+import org.hibernate.cache.jbc.BasicRegionAdapter;
-import org.hibernate.cache.jbc2.CacheInstanceManager;
+import org.hibernate.cache.jbc.CacheInstanceManager;
-import org.hibernate.cache.jbc2.JBossCacheRegionFactory;
+import org.hibernate.cache.jbc.JBossCacheRegionFactory;
-import org.hibernate.cache.jbc2.entity.EntityRegionImpl;
+import org.hibernate.cache.jbc.entity.EntityRegionImpl;
-import org.hibernate.test.cache.jbc2.AbstractEntityCollectionRegionTestCase;
+import org.hibernate.test.cache.jbc.AbstractEntityCollectionRegionTestCase;
 import org.jboss.cache.Cache;
 import org.jboss.cache.Fqn;
 

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/MvccInvalidatedTransactionalTestCase.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.entity;
+package org.hibernate.test.cache.jbc.entity;
 
 import org.hibernate.test.util.CacheTestUtil;
 

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/MvccReadOnlyExtraAPITestCase.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.entity;
+package org.hibernate.test.cache.jbc.entity;
 
 import org.hibernate.cache.access.EntityRegionAccessStrategy;
 

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/MvccReadOnlyTestCase.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.entity;
+package org.hibernate.test.cache.jbc.entity;
 
 import org.hibernate.test.util.CacheTestUtil;
 

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/MvccReplicatedTransactionalTestCase.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.entity;
+package org.hibernate.test.cache.jbc.entity;
 
 import junit.framework.Test;
 

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/MvccTransactionalExtraAPITestCase.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.entity;
+package org.hibernate.test.cache.jbc.entity;
 
 import org.hibernate.cache.access.EntityRegionAccessStrategy;
 

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/OptimisticInvalidatedTransactionalTestCase.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.entity;
+package org.hibernate.test.cache.jbc.entity;
 
 import org.hibernate.test.util.CacheTestUtil;
 

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/OptimisticReadOnlyExtraAPITestCase.java

@@ -21,11 +21,11 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.entity;
+package org.hibernate.test.cache.jbc.entity;
 
 import org.hibernate.cache.access.AccessType;
 import org.hibernate.cache.access.EntityRegionAccessStrategy;
-import org.hibernate.cache.jbc2.entity.TransactionalAccess;
+import org.hibernate.cache.jbc.entity.TransactionalAccess;
 
 /**
  * Tests for the "extra API" in EntityRegionAccessStrategy; in this

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/OptimisticReadOnlyTestCase.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.entity;
+package org.hibernate.test.cache.jbc.entity;
 
 import org.hibernate.test.util.CacheTestUtil;
 

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/OptimisticReplicatedTransactionalTestCase.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.entity;
+package org.hibernate.test.cache.jbc.entity;
 
 import junit.framework.Test;
 

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/OptimisticTransactionalExtraAPITestCase.java

@@ -21,18 +21,18 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.entity;
+package org.hibernate.test.cache.jbc.entity;
 
 import org.hibernate.cache.EntityRegion;
 import org.hibernate.cache.access.AccessType;
 import org.hibernate.cache.access.EntityRegionAccessStrategy;
 import org.hibernate.cache.access.SoftLock;
-import org.hibernate.cache.jbc2.JBossCacheRegionFactory;
+import org.hibernate.cache.jbc.JBossCacheRegionFactory;
-import org.hibernate.cache.jbc2.MultiplexedJBossCacheRegionFactory;
+import org.hibernate.cache.jbc.MultiplexedJBossCacheRegionFactory;
-import org.hibernate.cache.jbc2.builder.MultiplexingCacheInstanceManager;
+import org.hibernate.cache.jbc.builder.MultiplexingCacheInstanceManager;
-import org.hibernate.cache.jbc2.entity.TransactionalAccess;
+import org.hibernate.cache.jbc.entity.TransactionalAccess;
 import org.hibernate.cfg.Configuration;
-import org.hibernate.test.cache.jbc2.AbstractJBossCacheTestCase;
+import org.hibernate.test.cache.jbc.AbstractJBossCacheTestCase;
 import org.hibernate.test.util.CacheTestUtil;
 import org.jboss.cache.Cache;
 

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/PessimisticInvalidatedTransactionalTestCase.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.entity;
+package org.hibernate.test.cache.jbc.entity;
 
 import org.hibernate.test.util.CacheTestUtil;
 

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/PessimisticReadOnlyExtraAPITestCase.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.entity;
+package org.hibernate.test.cache.jbc.entity;
 
 import org.hibernate.cache.access.EntityRegionAccessStrategy;
 

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/PessimisticReadOnlyTestCase.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.entity;
+package org.hibernate.test.cache.jbc.entity;
 
 import org.hibernate.test.util.CacheTestUtil;
 

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/PessimisticReplicatedTransactionalTestCase.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.entity;
+package org.hibernate.test.cache.jbc.entity;
 
 import junit.framework.Test;
 

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/PessimisticTransactionalExtraAPITestCase.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.entity;
+package org.hibernate.test.cache.jbc.entity;
 
 import org.hibernate.cache.access.EntityRegionAccessStrategy;
 

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/AbstractEntityCacheFunctionalTestCase.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.functional;
+package org.hibernate.test.cache.jbc.functional;
 
 import java.util.Map;
 

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/AbstractQueryCacheFunctionalTestCase.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.functional;
+package org.hibernate.test.cache.jbc.functional;
 
 import java.util.Map;
 

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/CacheTestCaseBase.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.functional;
+package org.hibernate.test.cache.jbc.functional;
 
 import org.hibernate.cfg.Configuration;
 import org.hibernate.cfg.Environment;

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/Contact.hbm.xml

@@ -27,7 +27,7 @@
   ~ Boston, MA  02110-1301  USA
   -->
 <hibernate-mapping
-	package="org.hibernate.test.cache.jbc2.functional">
+	package="org.hibernate.test.cache.jbc.functional">
 
 	<class name="Contact" table="Contacts">
       
@@ -41,7 +41,7 @@
 		<property name="tlf" not-null="true"/>
 		
 		<many-to-one name="customer" 
-		      class="org.hibernate.test.cache.jbc2.functional.Customer" 
+		      class="org.hibernate.test.cache.jbc.functional.Customer"
 		      column="CUSTOMER_ID"/>
 	</class>
 

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/Contact.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.functional;
+package org.hibernate.test.cache.jbc.functional;
 
 import java.io.Serializable;
 

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/Customer.hbm.xml

@@ -27,7 +27,7 @@
   ~ Boston, MA  02110-1301  USA
   -->
 <hibernate-mapping
-	package="org.hibernate.test.cache.jbc2.functional">
+	package="org.hibernate.test.cache.jbc.functional">
 
 	<class name="Customer" table="Customers">
 	   
@@ -42,7 +42,7 @@
 		<set name="contacts" cascade="all" lazy="false">
         <cache usage="transactional"/>
         <key column="CUSTOMER_ID"/>
-        <one-to-many class="org.hibernate.test.cache.jbc2.functional.Contact"/>
+        <one-to-many class="org.hibernate.test.cache.jbc.functional.Contact"/>
       </set>
       
 	</class>

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/Customer.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.functional;
+package org.hibernate.test.cache.jbc.functional;
 
 import java.io.Serializable;
 import java.util.Set;

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/DualNodeTestCaseBase.java

@@ -14,17 +14,17 @@
  * Red Hat Author(s): Brian Stansberry
  */
 
-package org.hibernate.test.cache.jbc2.functional;
+package org.hibernate.test.cache.jbc.functional;
 
 import org.hibernate.cfg.Configuration;
 import org.hibernate.cfg.Mappings;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.engine.SessionFactoryImplementor;
 import org.hibernate.junit.functional.ExecutionEnvironment;
-import org.hibernate.test.cache.jbc2.functional.util.DualNodeConnectionProviderImpl;
+import org.hibernate.test.cache.jbc.functional.util.DualNodeConnectionProviderImpl;
-import org.hibernate.test.cache.jbc2.functional.util.DualNodeJtaTransactionManagerImpl;
+import org.hibernate.test.cache.jbc.functional.util.DualNodeJtaTransactionManagerImpl;
-import org.hibernate.test.cache.jbc2.functional.util.DualNodeTestUtil;
+import org.hibernate.test.cache.jbc.functional.util.DualNodeTestUtil;
-import org.hibernate.test.cache.jbc2.functional.util.DualNodeTransactionManagerLookup;
+import org.hibernate.test.cache.jbc.functional.util.DualNodeTransactionManagerLookup;
 import org.hibernate.transaction.CMTTransactionFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/Item.hbm.xml

@@ -27,7 +27,7 @@
   ~ Boston, MA  02110-1301  USA
   -->
 <hibernate-mapping
-	package="org.hibernate.test.cache.jbc2.functional">
+	package="org.hibernate.test.cache.jbc.functional">
 
 	<class name="Item" table="Items">
 		<id name="id">

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/Item.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.functional;
+package org.hibernate.test.cache.jbc.functional;
 
 /**
  * @author Gavin King

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/MVCCConcurrentWriteTest.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.functional;
+package org.hibernate.test.cache.jbc.functional;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -33,7 +33,6 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
-import javax.transaction.SystemException;
 import javax.transaction.Transaction;
 
 import junit.framework.Test;
@@ -41,15 +40,15 @@ import junit.framework.Test;
 import org.hibernate.FlushMode;
 import org.hibernate.Session;
 import org.hibernate.cache.RegionFactory;
-import org.hibernate.cache.jbc2.JBossCacheRegionFactory;
+import org.hibernate.cache.jbc.JBossCacheRegionFactory;
-import org.hibernate.cache.jbc2.builder.SharedCacheInstanceManager;
+import org.hibernate.cache.jbc.builder.SharedCacheInstanceManager;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
 import org.hibernate.stat.SecondLevelCacheStatistics;
-import org.hibernate.test.cache.jbc2.functional.util.DualNodeConnectionProviderImpl;
+import org.hibernate.test.cache.jbc.functional.util.DualNodeConnectionProviderImpl;
-import org.hibernate.test.cache.jbc2.functional.util.DualNodeJtaTransactionManagerImpl;
+import org.hibernate.test.cache.jbc.functional.util.DualNodeJtaTransactionManagerImpl;
-import org.hibernate.test.cache.jbc2.functional.util.DualNodeTestUtil;
+import org.hibernate.test.cache.jbc.functional.util.DualNodeTestUtil;
-import org.hibernate.test.cache.jbc2.functional.util.DualNodeTransactionManagerLookup;
+import org.hibernate.test.cache.jbc.functional.util.DualNodeTransactionManagerLookup;
 import org.hibernate.transaction.CMTTransactionFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -60,7 +59,7 @@ import org.slf4j.LoggerFactory;
  */
 public class MVCCConcurrentWriteTest extends CacheTestCaseBase {
 
-    private static final String JBC_CONFIG = "org/hibernate/test/cache/jbc2/functional/mvcc-treecache.xml";
+    private static final String JBC_CONFIG = "org/hibernate/test/cache/jbc/functional/mvcc-treecache.xml";
 
     private static final Logger LOG = LoggerFactory.getLogger(MVCCConcurrentWriteTest.class);
     /**

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/MVCCEntityReplicationTest.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.functional;
+package org.hibernate.test.cache.jbc.functional;
 
 
 /**

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/MVCCJBossCacheTest.java

@@ -21,13 +21,13 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.functional;
+package org.hibernate.test.cache.jbc.functional;
 
 import junit.framework.Test;
 
 import org.hibernate.cache.RegionFactory;
-import org.hibernate.cache.jbc2.JBossCacheRegionFactory;
+import org.hibernate.cache.jbc.JBossCacheRegionFactory;
-import org.hibernate.cache.jbc2.builder.SharedCacheInstanceManager;
+import org.hibernate.cache.jbc.builder.SharedCacheInstanceManager;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
 
@@ -38,7 +38,7 @@ import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
  */
 public class MVCCJBossCacheTest extends AbstractQueryCacheFunctionalTestCase {
 
-    private static final String JBC_CONFIG = "org/hibernate/test/cache/jbc2/functional/mvcc-treecache.xml";
+    private static final String JBC_CONFIG = "org/hibernate/test/cache/jbc/functional/mvcc-treecache.xml";
     
     public MVCCJBossCacheTest(String x) {
         super(x);

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/MVCCSessionRefreshTest.java

@@ -14,12 +14,12 @@
  * Red Hat Author(s): Brian Stansberry
  */
 
-package org.hibernate.test.cache.jbc2.functional;
+package org.hibernate.test.cache.jbc.functional;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.hibernate.test.cache.jbc2.functional.util.IsolatedCacheTestSetup;
+import org.hibernate.test.cache.jbc.functional.util.IsolatedCacheTestSetup;
 
 /**
  * A SessionRefreshTest that uses an OPTIMISTIC cache config.

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/OptimisticEntityReplicationTest.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.functional;
+package org.hibernate.test.cache.jbc.functional;
 
 
 /**

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/OptimisticJBossCacheTest.java

@@ -21,13 +21,13 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.functional;
+package org.hibernate.test.cache.jbc.functional;
 
 import junit.framework.Test;
 
 import org.hibernate.cache.RegionFactory;
-import org.hibernate.cache.jbc2.JBossCacheRegionFactory;
+import org.hibernate.cache.jbc.JBossCacheRegionFactory;
-import org.hibernate.cache.jbc2.builder.SharedCacheInstanceManager;
+import org.hibernate.cache.jbc.builder.SharedCacheInstanceManager;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
 
@@ -38,7 +38,7 @@ import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
  */
 public class OptimisticJBossCacheTest extends AbstractQueryCacheFunctionalTestCase {
 
-    private static final String JBC_CONFIG = "org/hibernate/test/cache/jbc2/functional/optimistic-treecache.xml";
+    private static final String JBC_CONFIG = "org/hibernate/test/cache/jbc/functional/optimistic-treecache.xml";
    
     public OptimisticJBossCacheTest(String x) {
         super(x);

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/OptimisticSessionRefreshTest.java

@@ -14,12 +14,12 @@
  * Red Hat Author(s): Brian Stansberry
  */
 
-package org.hibernate.test.cache.jbc2.functional;
+package org.hibernate.test.cache.jbc.functional;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.hibernate.test.cache.jbc2.functional.util.IsolatedCacheTestSetup;
+import org.hibernate.test.cache.jbc.functional.util.IsolatedCacheTestSetup;
 
 /**
  * A SessionRefreshTest that uses an OPTIMISTIC cache config.

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/PessimisticEntityReplicationTest.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.functional;
+package org.hibernate.test.cache.jbc.functional;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -30,11 +30,11 @@ import javax.transaction.TransactionManager;
 
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
-import org.hibernate.cache.jbc2.builder.MultiplexingCacheInstanceManager;
+import org.hibernate.cache.jbc.builder.MultiplexingCacheInstanceManager;
 import org.hibernate.cfg.Configuration;
-import org.hibernate.test.cache.jbc2.functional.util.DualNodeTestUtil;
+import org.hibernate.test.cache.jbc.functional.util.DualNodeTestUtil;
-import org.hibernate.test.cache.jbc2.functional.util.TestCacheInstanceManager;
+import org.hibernate.test.cache.jbc.functional.util.TestCacheInstanceManager;
-import org.hibernate.test.cache.jbc2.functional.util.TestJBossCacheRegionFactory;
+import org.hibernate.test.cache.jbc.functional.util.TestJBossCacheRegionFactory;
 import org.jboss.cache.Cache;
 import org.jboss.cache.CacheManager;
 import org.jboss.cache.Fqn;

cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/PessimisticJBossCacheTest.java

@@ -21,13 +21,13 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.test.cache.jbc2.functional;
+package org.hibernate.test.cache.jbc.functional;
 
 import junit.framework.Test;
 
 import org.hibernate.cache.RegionFactory;
-import org.hibernate.cache.jbc2.JBossCacheRegionFactory;
+import org.hibernate.cache.jbc.JBossCacheRegionFactory;
-import org.hibernate.cache.jbc2.builder.SharedCacheInstanceManager;
+import org.hibernate.cache.jbc.builder.SharedCacheInstanceManager;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
 
@@ -38,7 +38,7 @@ import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
  */
 public class PessimisticJBossCacheTest extends AbstractQueryCacheFunctionalTestCase {
 
-    private static final String JBC_CONFIG = "org/hibernate/test/cache/jbc2/functional/pessimistic-treecache.xml";
+    private static final String JBC_CONFIG = "org/hibernate/test/cache/jbc/functional/pessimistic-treecache.xml";
     
     public PessimisticJBossCacheTest(String x) {
         super(x);