[hibernate-commits] Hibernate SVN: r17023 - in core/trunk/cache-jbosscache/src: main/java/org/hibernate/cache/jbc and 21 other directories.
hibernate-commits at lists.jboss.org
hibernate-commits at lists.jboss.org
Tue Jul 7 13:36:06 EDT 2009
Author: steve.ebersole at jboss.com
Date: 2009-07-07 13:36:04 -0400 (Tue, 07 Jul 2009)
New Revision: 17023
Added:
core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/
core/trunk/cache-jbosscache/src/main/resources/org/hibernate/cache/jbc/
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/tm/jbc/
Removed:
core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/
core/trunk/cache-jbosscache/src/main/resources/org/hibernate/cache/jbc2/
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/tm/jbc2/
Modified:
core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/CacheInstanceManager.java
core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/JBossCacheRegionFactory.java
core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/JndiMultiplexedJBossCacheRegionFactory.java
core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/JndiSharedJBossCacheRegionFactory.java
core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/MultiplexedJBossCacheRegionFactory.java
core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/SharedJBossCacheRegionFactory.java
core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/TransactionalDataRegionAdapter.java
core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/access/OptimisticTransactionalAccessDelegate.java
core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/access/TransactionalAccessDelegate.java
core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/builder/JndiMultiplexingCacheInstanceManager.java
core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/builder/JndiSharedCacheInstanceManager.java
core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/builder/MultiplexingCacheInstanceManager.java
core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/builder/SharedCacheInstanceManager.java
core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/collection/CollectionRegionImpl.java
core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/collection/OptimisticReadOnlyAccess.java
core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/collection/OptimisticTransactionalAccess.java
core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/collection/ReadOnlyAccess.java
core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/collection/TransactionalAccess.java
core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/entity/EntityRegionImpl.java
core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/entity/OptimisticReadOnlyAccess.java
core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/entity/OptimisticTransactionalAccess.java
core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/entity/ReadOnlyAccess.java
core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/entity/TransactionalAccess.java
core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/query/QueryResultsRegionImpl.java
core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/timestamp/ClusteredConcurrentTimestampsRegionImpl.java
core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/timestamp/TimestampsRegionImpl.java
core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/util/CircumventChecksDataVersion.java
core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/util/DataVersionAdapter.java
core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/util/NonLockingDataVersion.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/AbstractEntityCollectionRegionTestCase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/AbstractGeneralDataRegionTestCase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/AbstractJBossCacheTestCase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/AbstractRegionImplTestCase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/JBossCacheComplianceTest.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/JBossCacheRegionFactoryTestCase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/Jbc2ConfigsXmlValidityTestCase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/builder/CacheInstanceManagerTestBase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/builder/MultiplexedCacheInstanceManagerTestCase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/builder/SharedCacheInstanceManagerTestCase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/AbstractCollectionRegionAccessStrategyTestCase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/AbstractReadOnlyAccessTestCase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/AbstractTransactionalAccessTestCase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/CollectionRegionImplTestCase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/MvccInvalidatedTransactionalTestCase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/MvccReadOnlyExtraAPITestCase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/MvccReadOnlyTestCase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/MvccReplicatedTransactionalTestCase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/MvccTransactionalExtraAPITestCase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/OptimisticInvalidatedTransactionalTestCase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/OptimisticReadOnlyExtraAPITestCase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/OptimisticReadOnlyTestCase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/OptimisticReplicatedTransactionalTestCase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/OptimisticTransactionalExtraAPITestCase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/PessimisticInvalidatedTransactionalTestCase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/PessimisticReadOnlyExtraAPITestCase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/PessimisticReadOnlyTestCase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/PessimisticReplicatedTransactionalTestCase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/PessimisticTransactionalExtraAPITestCase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/AbstractEntityRegionAccessStrategyTestCase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/AbstractReadOnlyAccessTestCase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/AbstractTransactionalAccessTestCase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/EntityRegionImplTestCase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/MvccInvalidatedTransactionalTestCase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/MvccReadOnlyExtraAPITestCase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/MvccReadOnlyTestCase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/MvccReplicatedTransactionalTestCase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/MvccTransactionalExtraAPITestCase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/OptimisticInvalidatedTransactionalTestCase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/OptimisticReadOnlyExtraAPITestCase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/OptimisticReadOnlyTestCase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/OptimisticReplicatedTransactionalTestCase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/OptimisticTransactionalExtraAPITestCase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/PessimisticInvalidatedTransactionalTestCase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/PessimisticReadOnlyExtraAPITestCase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/PessimisticReadOnlyTestCase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/PessimisticReplicatedTransactionalTestCase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/PessimisticTransactionalExtraAPITestCase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/AbstractEntityCacheFunctionalTestCase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/AbstractQueryCacheFunctionalTestCase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/CacheTestCaseBase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/Contact.hbm.xml
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/Contact.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/Customer.hbm.xml
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/Customer.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/DualNodeTestCaseBase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/Item.hbm.xml
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/Item.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/MVCCConcurrentWriteTest.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/MVCCEntityReplicationTest.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/MVCCJBossCacheTest.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/MVCCSessionRefreshTest.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/OptimisticEntityReplicationTest.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/OptimisticJBossCacheTest.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/OptimisticSessionRefreshTest.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/PessimisticEntityReplicationTest.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/PessimisticJBossCacheTest.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/PessimisticRepeatableSessionRefreshTest.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/PessimisticSessionRefreshTest.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/VersionedItem.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/bulk/MVCCBulkOperationsTest.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/bulk/OptimisticBulkOperationsTest.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/bulk/PessimisticBulkOperationsTest.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/classloader/Account.hbm.xml
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/classloader/Account.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/classloader/AccountHolder.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/classloader/CacheAccessListener.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/classloader/ClassLoaderTestDAO.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/classloader/MVCCIsolatedClassLoaderTest.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/classloader/OptimisticIsolatedClassLoaderTest.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/classloader/PessimisticIsolatedClassLoaderTest.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/CustomClassLoaderCacheManager.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/DualNodeConnectionProviderImpl.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/DualNodeJtaTransactionImpl.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/DualNodeJtaTransactionManagerImpl.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/DualNodeTestUtil.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/DualNodeTransactionManagerLookup.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/IsolatedCacheTestSetup.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/TestCacheInstanceManager.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/TestJBossCacheRegionFactory.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/query/QueryRegionImplTestCase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/timestamp/ClusteredConcurrentTimestampRegionTestCase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/timestamp/TimestampsRegionImplTestCase.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/tm/jbc/BatchModeTransactionManagerLookup.java
Log:
HHH-4028 - Move current cache-jbosscache2 module content to cache-jbosscache
Copied: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc (from rev 17020, core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2)
Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/CacheInstanceManager.java
===================================================================
--- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/CacheInstanceManager.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/CacheInstanceManager.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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;
Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/JBossCacheRegionFactory.java
===================================================================
--- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/JBossCacheRegionFactory.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/JBossCacheRegionFactory.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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.QueryResultsRegion;
import org.hibernate.cache.RegionFactory;
import org.hibernate.cache.TimestampsRegion;
-import org.hibernate.cache.jbc2.builder.JndiSharedCacheInstanceManager;
-import org.hibernate.cache.jbc2.builder.SharedCacheInstanceManager;
-import org.hibernate.cache.jbc2.collection.CollectionRegionImpl;
-import org.hibernate.cache.jbc2.entity.EntityRegionImpl;
-import org.hibernate.cache.jbc2.query.QueryResultsRegionImpl;
-import org.hibernate.cache.jbc2.timestamp.TimestampsRegionImpl;
+import org.hibernate.cache.jbc.builder.JndiSharedCacheInstanceManager;
+import org.hibernate.cache.jbc.builder.SharedCacheInstanceManager;
+import org.hibernate.cache.jbc.collection.CollectionRegionImpl;
+import org.hibernate.cache.jbc.entity.EntityRegionImpl;
+import org.hibernate.cache.jbc.query.QueryResultsRegionImpl;
+import org.hibernate.cache.jbc.timestamp.TimestampsRegionImpl;
import org.hibernate.cfg.Environment;
import org.hibernate.cfg.Settings;
import org.hibernate.util.PropertiesHelper;
Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/JndiMultiplexedJBossCacheRegionFactory.java
===================================================================
--- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/JndiMultiplexedJBossCacheRegionFactory.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/JndiMultiplexedJBossCacheRegionFactory.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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
Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/JndiSharedJBossCacheRegionFactory.java
===================================================================
--- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/JndiSharedJBossCacheRegionFactory.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/JndiSharedJBossCacheRegionFactory.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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
Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/MultiplexedJBossCacheRegionFactory.java
===================================================================
--- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/MultiplexedJBossCacheRegionFactory.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/MultiplexedJBossCacheRegionFactory.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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
Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/SharedJBossCacheRegionFactory.java
===================================================================
--- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/SharedJBossCacheRegionFactory.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/SharedJBossCacheRegionFactory.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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.jbc2.builder.SharedCacheInstanceManager;
+import org.hibernate.cache.jbc.builder.JndiSharedCacheInstanceManager;
+import org.hibernate.cache.jbc.builder.SharedCacheInstanceManager;
import org.jboss.cache.DefaultCacheFactory;
/**
Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/TransactionalDataRegionAdapter.java
===================================================================
--- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/TransactionalDataRegionAdapter.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/TransactionalDataRegionAdapter.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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;
Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/access/OptimisticTransactionalAccessDelegate.java
===================================================================
--- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/access/OptimisticTransactionalAccessDelegate.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/access/OptimisticTransactionalAccessDelegate.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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.CacheException;
import org.hibernate.cache.access.CollectionRegionAccessStrategy;
import org.hibernate.cache.access.EntityRegionAccessStrategy;
-import org.hibernate.cache.jbc2.TransactionalDataRegionAdapter;
-import org.hibernate.cache.jbc2.util.CacheHelper;
-import org.hibernate.cache.jbc2.util.DataVersionAdapter;
-import org.hibernate.cache.jbc2.util.NonLockingDataVersion;
+import org.hibernate.cache.jbc.TransactionalDataRegionAdapter;
+import org.hibernate.cache.jbc.util.CacheHelper;
+import org.hibernate.cache.jbc.util.DataVersionAdapter;
+import org.hibernate.cache.jbc.util.NonLockingDataVersion;
import org.jboss.cache.config.Option;
import org.jboss.cache.optimistic.DataVersion;
Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/access/TransactionalAccessDelegate.java
===================================================================
--- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/access/TransactionalAccessDelegate.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/access/TransactionalAccessDelegate.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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.access.CollectionRegionAccessStrategy;
import org.hibernate.cache.access.EntityRegionAccessStrategy;
import org.hibernate.cache.access.SoftLock;
-import org.hibernate.cache.jbc2.BasicRegionAdapter;
-import org.hibernate.cache.jbc2.util.CacheHelper;
+import org.hibernate.cache.jbc.BasicRegionAdapter;
+import org.hibernate.cache.jbc.util.CacheHelper;
import org.jboss.cache.Cache;
import org.jboss.cache.Fqn;
Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/builder/JndiMultiplexingCacheInstanceManager.java
===================================================================
--- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/builder/JndiMultiplexingCacheInstanceManager.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/builder/JndiMultiplexingCacheInstanceManager.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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;
Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/builder/JndiSharedCacheInstanceManager.java
===================================================================
--- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/builder/JndiSharedCacheInstanceManager.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/builder/JndiSharedCacheInstanceManager.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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;
Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/builder/MultiplexingCacheInstanceManager.java
===================================================================
--- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/builder/MultiplexingCacheInstanceManager.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/builder/MultiplexingCacheInstanceManager.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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.LoggerFactory;
import org.hibernate.cache.CacheException;
-import org.hibernate.cache.jbc2.CacheInstanceManager;
-import org.hibernate.cache.jbc2.util.CacheHelper;
+import org.hibernate.cache.jbc.CacheInstanceManager;
+import org.hibernate.cache.jbc.util.CacheHelper;
import org.hibernate.cfg.Settings;
import org.hibernate.transaction.TransactionManagerLookup;
import org.hibernate.util.PropertiesHelper;
Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/builder/SharedCacheInstanceManager.java
===================================================================
--- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/builder/SharedCacheInstanceManager.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/builder/SharedCacheInstanceManager.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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.JChannelFactory;
import org.hibernate.cache.CacheException;
-import org.hibernate.cache.jbc2.CacheInstanceManager;
-import org.hibernate.cache.jbc2.util.CacheHelper;
+import org.hibernate.cache.jbc.CacheInstanceManager;
+import org.hibernate.cache.jbc.util.CacheHelper;
import org.hibernate.cfg.Settings;
import org.hibernate.util.PropertiesHelper;
Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/collection/CollectionRegionImpl.java
===================================================================
--- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/collection/CollectionRegionImpl.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/collection/CollectionRegionImpl.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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.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.
Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/collection/OptimisticReadOnlyAccess.java
===================================================================
--- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/collection/OptimisticReadOnlyAccess.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/collection/OptimisticReadOnlyAccess.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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;
Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/collection/OptimisticTransactionalAccess.java
===================================================================
--- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/collection/OptimisticTransactionalAccess.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/collection/OptimisticTransactionalAccess.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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
Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/collection/ReadOnlyAccess.java
===================================================================
--- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/collection/ReadOnlyAccess.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/collection/ReadOnlyAccess.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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;
Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/collection/TransactionalAccess.java
===================================================================
--- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/collection/TransactionalAccess.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/collection/TransactionalAccess.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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
Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/entity/EntityRegionImpl.java
===================================================================
--- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/entity/EntityRegionImpl.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/entity/EntityRegionImpl.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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.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.
Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/entity/OptimisticReadOnlyAccess.java
===================================================================
--- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/entity/OptimisticReadOnlyAccess.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/entity/OptimisticReadOnlyAccess.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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;
Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/entity/OptimisticTransactionalAccess.java
===================================================================
--- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/entity/OptimisticTransactionalAccess.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/entity/OptimisticTransactionalAccess.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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
Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/entity/ReadOnlyAccess.java
===================================================================
--- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/entity/ReadOnlyAccess.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/entity/ReadOnlyAccess.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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;
Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/entity/TransactionalAccess.java
===================================================================
--- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/entity/TransactionalAccess.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/entity/TransactionalAccess.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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;
Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/query/QueryResultsRegionImpl.java
===================================================================
--- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/query/QueryResultsRegionImpl.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/query/QueryResultsRegionImpl.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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 org.hibernate.cache.CacheException;
import org.hibernate.cache.QueryResultsRegion;
-import org.hibernate.cache.jbc2.TransactionalDataRegionAdapter;
-import org.hibernate.cache.jbc2.util.CacheHelper;
+import org.hibernate.cache.jbc.TransactionalDataRegionAdapter;
+import org.hibernate.cache.jbc.util.CacheHelper;
import org.hibernate.util.PropertiesHelper;
import org.jboss.cache.Cache;
import org.jboss.cache.Fqn;
Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/timestamp/ClusteredConcurrentTimestampsRegionImpl.java
===================================================================
--- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/timestamp/ClusteredConcurrentTimestampsRegionImpl.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/timestamp/ClusteredConcurrentTimestampsRegionImpl.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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 org.hibernate.cache.CacheException;
import org.hibernate.cache.TimestampsRegion;
-import org.hibernate.cache.jbc2.TransactionalDataRegionAdapter;
-import org.hibernate.cache.jbc2.util.CacheHelper;
+import org.hibernate.cache.jbc.TransactionalDataRegionAdapter;
+import org.hibernate.cache.jbc.util.CacheHelper;
import org.jboss.cache.Cache;
import org.jboss.cache.Fqn;
import org.jboss.cache.config.Option;
Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/timestamp/TimestampsRegionImpl.java
===================================================================
--- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/timestamp/TimestampsRegionImpl.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/timestamp/TimestampsRegionImpl.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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 org.hibernate.cache.CacheException;
import org.hibernate.cache.TimestampsRegion;
-import org.hibernate.cache.jbc2.TransactionalDataRegionAdapter;
-import org.hibernate.cache.jbc2.util.CacheHelper;
+import org.hibernate.cache.jbc.TransactionalDataRegionAdapter;
+import org.hibernate.cache.jbc.util.CacheHelper;
import org.jboss.cache.Cache;
import org.jboss.cache.Fqn;
import org.jboss.cache.config.Option;
Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/util/CircumventChecksDataVersion.java
===================================================================
--- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/util/CircumventChecksDataVersion.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/util/CircumventChecksDataVersion.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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;
Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/util/DataVersionAdapter.java
===================================================================
--- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/util/DataVersionAdapter.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/util/DataVersionAdapter.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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;
Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/util/NonLockingDataVersion.java
===================================================================
--- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/util/NonLockingDataVersion.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/util/NonLockingDataVersion.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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;
Copied: core/trunk/cache-jbosscache/src/main/resources/org/hibernate/cache/jbc (from rev 17020, core/trunk/cache-jbosscache/src/main/resources/org/hibernate/cache/jbc2)
Copied: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc (from rev 17020, core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2)
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/AbstractEntityCollectionRegionTestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/AbstractEntityCollectionRegionTestCase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/AbstractEntityCollectionRegionTestCase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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.RegionFactory;
import org.hibernate.cache.TransactionalDataRegion;
import org.hibernate.cache.access.AccessType;
-import org.hibernate.cache.jbc2.JBossCacheRegionFactory;
-import org.hibernate.cache.jbc2.MultiplexedJBossCacheRegionFactory;
-import org.hibernate.cache.jbc2.SharedJBossCacheRegionFactory;
-import org.hibernate.cache.jbc2.builder.MultiplexingCacheInstanceManager;
-import org.hibernate.cache.jbc2.builder.SharedCacheInstanceManager;
+import org.hibernate.cache.jbc.JBossCacheRegionFactory;
+import org.hibernate.cache.jbc.MultiplexedJBossCacheRegionFactory;
+import org.hibernate.cache.jbc.SharedJBossCacheRegionFactory;
+import org.hibernate.cache.jbc.builder.MultiplexingCacheInstanceManager;
+import org.hibernate.cache.jbc.builder.SharedCacheInstanceManager;
import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment;
import org.hibernate.test.util.CacheTestUtil;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/AbstractGeneralDataRegionTestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/AbstractGeneralDataRegionTestCase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/AbstractGeneralDataRegionTestCase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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.jbc2.MultiplexedJBossCacheRegionFactory;
-import org.hibernate.cache.jbc2.builder.MultiplexingCacheInstanceManager;
-import org.hibernate.cache.jbc2.util.CacheHelper;
-import org.hibernate.cache.jbc2.util.NonLockingDataVersion;
+import org.hibernate.cache.jbc.JBossCacheRegionFactory;
+import org.hibernate.cache.jbc.MultiplexedJBossCacheRegionFactory;
+import org.hibernate.cache.jbc.builder.MultiplexingCacheInstanceManager;
+import org.hibernate.cache.jbc.util.CacheHelper;
+import org.hibernate.cache.jbc.util.NonLockingDataVersion;
import org.hibernate.cfg.Configuration;
import org.hibernate.test.util.CacheTestUtil;
import org.jboss.cache.Cache;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/AbstractJBossCacheTestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/AbstractJBossCacheTestCase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/AbstractJBossCacheTestCase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/AbstractRegionImplTestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/AbstractRegionImplTestCase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/AbstractRegionImplTestCase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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 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.jbc2.SharedJBossCacheRegionFactory;
-import org.hibernate.cache.jbc2.builder.SharedCacheInstanceManager;
+import org.hibernate.cache.jbc.JBossCacheRegionFactory;
+import org.hibernate.cache.jbc.SharedJBossCacheRegionFactory;
+import org.hibernate.cache.jbc.builder.SharedCacheInstanceManager;
import org.hibernate.cfg.Configuration;
import org.hibernate.test.util.CacheTestUtil;
import org.hibernate.util.ComparableComparator;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/JBossCacheComplianceTest.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/JBossCacheComplianceTest.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/JBossCacheComplianceTest.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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.jbc2.MultiplexedJBossCacheRegionFactory;
-import org.hibernate.cache.jbc2.builder.SharedCacheInstanceManager;
-import org.hibernate.cache.jbc2.util.CacheHelper;
+import org.hibernate.cache.jbc.JBossCacheRegionFactory;
+import org.hibernate.cache.jbc.MultiplexedJBossCacheRegionFactory;
+import org.hibernate.cache.jbc.builder.SharedCacheInstanceManager;
+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 @@
}
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() {
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/JBossCacheRegionFactoryTestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/JBossCacheRegionFactoryTestCase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/JBossCacheRegionFactoryTestCase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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.jbc2.JBossCacheRegionFactory;
-import org.hibernate.cache.jbc2.builder.MultiplexingCacheInstanceManager;
-import org.hibernate.cache.jbc2.builder.SharedCacheInstanceManager;
+import org.hibernate.cache.jbc.CacheInstanceManager;
+import org.hibernate.cache.jbc.JBossCacheRegionFactory;
+import org.hibernate.cache.jbc.builder.MultiplexingCacheInstanceManager;
+import org.hibernate.cache.jbc.builder.SharedCacheInstanceManager;
import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Settings;
import org.hibernate.test.util.CacheTestUtil;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/Jbc2ConfigsXmlValidityTestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/Jbc2ConfigsXmlValidityTestCase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/Jbc2ConfigsXmlValidityTestCase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/builder/CacheInstanceManagerTestBase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/builder/CacheInstanceManagerTestBase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/builder/CacheInstanceManagerTestBase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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.jbc2.JBossCacheRegionFactory;
+import org.hibernate.cache.jbc.CacheInstanceManager;
+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;
/**
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/builder/MultiplexedCacheInstanceManagerTestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/builder/MultiplexedCacheInstanceManagerTestCase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/builder/MultiplexedCacheInstanceManagerTestCase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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;
/**
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/builder/SharedCacheInstanceManagerTestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/builder/SharedCacheInstanceManagerTestCase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/builder/SharedCacheInstanceManagerTestCase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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.
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/AbstractCollectionRegionAccessStrategyTestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/collection/AbstractCollectionRegionAccessStrategyTestCase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/AbstractCollectionRegionAccessStrategyTestCase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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.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.jbc2.JBossCacheRegionFactory;
-import org.hibernate.cache.jbc2.MultiplexedJBossCacheRegionFactory;
-import org.hibernate.cache.jbc2.builder.MultiplexingCacheInstanceManager;
-import org.hibernate.cache.jbc2.collection.CollectionRegionImpl;
-import org.hibernate.cache.jbc2.entity.TransactionalAccess;
-import org.hibernate.cache.jbc2.util.CacheHelper;
-import org.hibernate.cache.jbc2.util.NonLockingDataVersion;
+import org.hibernate.cache.jbc.BasicRegionAdapter;
+import org.hibernate.cache.jbc.JBossCacheRegionFactory;
+import org.hibernate.cache.jbc.MultiplexedJBossCacheRegionFactory;
+import org.hibernate.cache.jbc.builder.MultiplexingCacheInstanceManager;
+import org.hibernate.cache.jbc.collection.CollectionRegionImpl;
+import org.hibernate.cache.jbc.entity.TransactionalAccess;
+import org.hibernate.cache.jbc.util.CacheHelper;
+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;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/AbstractReadOnlyAccessTestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/collection/AbstractReadOnlyAccessTestCase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/AbstractReadOnlyAccessTestCase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/AbstractTransactionalAccessTestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/collection/AbstractTransactionalAccessTestCase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/AbstractTransactionalAccessTestCase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/CollectionRegionImplTestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/collection/CollectionRegionImplTestCase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/CollectionRegionImplTestCase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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.RegionFactory;
import org.hibernate.cache.access.AccessType;
import org.hibernate.cache.access.CollectionRegionAccessStrategy;
-import org.hibernate.cache.jbc2.BasicRegionAdapter;
-import org.hibernate.cache.jbc2.CacheInstanceManager;
-import org.hibernate.cache.jbc2.JBossCacheRegionFactory;
-import org.hibernate.cache.jbc2.collection.CollectionRegionImpl;
-import org.hibernate.test.cache.jbc2.AbstractEntityCollectionRegionTestCase;
+import org.hibernate.cache.jbc.BasicRegionAdapter;
+import org.hibernate.cache.jbc.CacheInstanceManager;
+import org.hibernate.cache.jbc.JBossCacheRegionFactory;
+import org.hibernate.cache.jbc.collection.CollectionRegionImpl;
+import org.hibernate.test.cache.jbc.AbstractEntityCollectionRegionTestCase;
import org.jboss.cache.Cache;
import org.jboss.cache.Fqn;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/MvccInvalidatedTransactionalTestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/collection/MvccInvalidatedTransactionalTestCase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/MvccInvalidatedTransactionalTestCase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/MvccReadOnlyExtraAPITestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/collection/MvccReadOnlyExtraAPITestCase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/MvccReadOnlyExtraAPITestCase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/MvccReadOnlyTestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/collection/MvccReadOnlyTestCase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/MvccReadOnlyTestCase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/MvccReplicatedTransactionalTestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/collection/MvccReplicatedTransactionalTestCase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/MvccReplicatedTransactionalTestCase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/MvccTransactionalExtraAPITestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/collection/MvccTransactionalExtraAPITestCase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/MvccTransactionalExtraAPITestCase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/OptimisticInvalidatedTransactionalTestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/collection/OptimisticInvalidatedTransactionalTestCase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/OptimisticInvalidatedTransactionalTestCase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/OptimisticReadOnlyExtraAPITestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/collection/OptimisticReadOnlyExtraAPITestCase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/OptimisticReadOnlyExtraAPITestCase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/OptimisticReadOnlyTestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/collection/OptimisticReadOnlyTestCase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/OptimisticReadOnlyTestCase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/OptimisticReplicatedTransactionalTestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/collection/OptimisticReplicatedTransactionalTestCase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/OptimisticReplicatedTransactionalTestCase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/OptimisticTransactionalExtraAPITestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/collection/OptimisticTransactionalExtraAPITestCase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/OptimisticTransactionalExtraAPITestCase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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.jbc2.MultiplexedJBossCacheRegionFactory;
-import org.hibernate.cache.jbc2.builder.MultiplexingCacheInstanceManager;
-import org.hibernate.cache.jbc2.entity.TransactionalAccess;
+import org.hibernate.cache.jbc.JBossCacheRegionFactory;
+import org.hibernate.cache.jbc.MultiplexedJBossCacheRegionFactory;
+import org.hibernate.cache.jbc.builder.MultiplexingCacheInstanceManager;
+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;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/PessimisticInvalidatedTransactionalTestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/collection/PessimisticInvalidatedTransactionalTestCase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/PessimisticInvalidatedTransactionalTestCase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/PessimisticReadOnlyExtraAPITestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/collection/PessimisticReadOnlyExtraAPITestCase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/PessimisticReadOnlyExtraAPITestCase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/PessimisticReadOnlyTestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/collection/PessimisticReadOnlyTestCase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/PessimisticReadOnlyTestCase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/PessimisticReplicatedTransactionalTestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/collection/PessimisticReplicatedTransactionalTestCase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/PessimisticReplicatedTransactionalTestCase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/PessimisticTransactionalExtraAPITestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/collection/PessimisticTransactionalExtraAPITestCase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/PessimisticTransactionalExtraAPITestCase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/AbstractEntityRegionAccessStrategyTestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/entity/AbstractEntityRegionAccessStrategyTestCase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/AbstractEntityRegionAccessStrategyTestCase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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.access.AccessType;
import org.hibernate.cache.access.EntityRegionAccessStrategy;
import org.hibernate.cache.impl.CacheDataDescriptionImpl;
-import org.hibernate.cache.jbc2.BasicRegionAdapter;
-import org.hibernate.cache.jbc2.JBossCacheRegionFactory;
-import org.hibernate.cache.jbc2.MultiplexedJBossCacheRegionFactory;
-import org.hibernate.cache.jbc2.builder.MultiplexingCacheInstanceManager;
-import org.hibernate.cache.jbc2.entity.EntityRegionImpl;
-import org.hibernate.cache.jbc2.entity.TransactionalAccess;
-import org.hibernate.cache.jbc2.util.CacheHelper;
-import org.hibernate.cache.jbc2.util.NonLockingDataVersion;
+import org.hibernate.cache.jbc.BasicRegionAdapter;
+import org.hibernate.cache.jbc.JBossCacheRegionFactory;
+import org.hibernate.cache.jbc.MultiplexedJBossCacheRegionFactory;
+import org.hibernate.cache.jbc.builder.MultiplexingCacheInstanceManager;
+import org.hibernate.cache.jbc.entity.EntityRegionImpl;
+import org.hibernate.cache.jbc.entity.TransactionalAccess;
+import org.hibernate.cache.jbc.util.CacheHelper;
+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;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/AbstractReadOnlyAccessTestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/entity/AbstractReadOnlyAccessTestCase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/AbstractReadOnlyAccessTestCase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/AbstractTransactionalAccessTestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/entity/AbstractTransactionalAccessTestCase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/AbstractTransactionalAccessTestCase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/EntityRegionImplTestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/entity/EntityRegionImplTestCase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/EntityRegionImplTestCase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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.Region;
import org.hibernate.cache.RegionFactory;
import org.hibernate.cache.access.AccessType;
-import org.hibernate.cache.jbc2.BasicRegionAdapter;
-import org.hibernate.cache.jbc2.CacheInstanceManager;
-import org.hibernate.cache.jbc2.JBossCacheRegionFactory;
-import org.hibernate.cache.jbc2.entity.EntityRegionImpl;
-import org.hibernate.test.cache.jbc2.AbstractEntityCollectionRegionTestCase;
+import org.hibernate.cache.jbc.BasicRegionAdapter;
+import org.hibernate.cache.jbc.CacheInstanceManager;
+import org.hibernate.cache.jbc.JBossCacheRegionFactory;
+import org.hibernate.cache.jbc.entity.EntityRegionImpl;
+import org.hibernate.test.cache.jbc.AbstractEntityCollectionRegionTestCase;
import org.jboss.cache.Cache;
import org.jboss.cache.Fqn;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/MvccInvalidatedTransactionalTestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/entity/MvccInvalidatedTransactionalTestCase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/MvccInvalidatedTransactionalTestCase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/MvccReadOnlyExtraAPITestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/entity/MvccReadOnlyExtraAPITestCase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/MvccReadOnlyExtraAPITestCase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/MvccReadOnlyTestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/entity/MvccReadOnlyTestCase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/MvccReadOnlyTestCase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/MvccReplicatedTransactionalTestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/entity/MvccReplicatedTransactionalTestCase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/MvccReplicatedTransactionalTestCase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/MvccTransactionalExtraAPITestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/entity/MvccTransactionalExtraAPITestCase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/MvccTransactionalExtraAPITestCase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/OptimisticInvalidatedTransactionalTestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/entity/OptimisticInvalidatedTransactionalTestCase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/OptimisticInvalidatedTransactionalTestCase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/OptimisticReadOnlyExtraAPITestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/entity/OptimisticReadOnlyExtraAPITestCase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/OptimisticReadOnlyExtraAPITestCase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/OptimisticReadOnlyTestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/entity/OptimisticReadOnlyTestCase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/OptimisticReadOnlyTestCase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/OptimisticReplicatedTransactionalTestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/entity/OptimisticReplicatedTransactionalTestCase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/OptimisticReplicatedTransactionalTestCase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/OptimisticTransactionalExtraAPITestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/entity/OptimisticTransactionalExtraAPITestCase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/OptimisticTransactionalExtraAPITestCase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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.jbc2.MultiplexedJBossCacheRegionFactory;
-import org.hibernate.cache.jbc2.builder.MultiplexingCacheInstanceManager;
-import org.hibernate.cache.jbc2.entity.TransactionalAccess;
+import org.hibernate.cache.jbc.JBossCacheRegionFactory;
+import org.hibernate.cache.jbc.MultiplexedJBossCacheRegionFactory;
+import org.hibernate.cache.jbc.builder.MultiplexingCacheInstanceManager;
+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;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/PessimisticInvalidatedTransactionalTestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/entity/PessimisticInvalidatedTransactionalTestCase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/PessimisticInvalidatedTransactionalTestCase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/PessimisticReadOnlyExtraAPITestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/entity/PessimisticReadOnlyExtraAPITestCase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/PessimisticReadOnlyExtraAPITestCase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/PessimisticReadOnlyTestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/entity/PessimisticReadOnlyTestCase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/PessimisticReadOnlyTestCase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/PessimisticReplicatedTransactionalTestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/entity/PessimisticReplicatedTransactionalTestCase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/PessimisticReplicatedTransactionalTestCase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/PessimisticTransactionalExtraAPITestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/entity/PessimisticTransactionalExtraAPITestCase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/PessimisticTransactionalExtraAPITestCase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/AbstractEntityCacheFunctionalTestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/AbstractEntityCacheFunctionalTestCase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/AbstractEntityCacheFunctionalTestCase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/AbstractQueryCacheFunctionalTestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/AbstractQueryCacheFunctionalTestCase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/AbstractQueryCacheFunctionalTestCase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/CacheTestCaseBase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/CacheTestCaseBase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/CacheTestCaseBase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/Contact.hbm.xml
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/Contact.hbm.xml 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/Contact.hbm.xml 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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>
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/Contact.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/Contact.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/Contact.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/Customer.hbm.xml
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/Customer.hbm.xml 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/Customer.hbm.xml 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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>
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/Customer.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/Customer.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/Customer.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/DualNodeTestCaseBase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/DualNodeTestCaseBase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/DualNodeTestCaseBase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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.jbc2.functional.util.DualNodeJtaTransactionManagerImpl;
-import org.hibernate.test.cache.jbc2.functional.util.DualNodeTestUtil;
-import org.hibernate.test.cache.jbc2.functional.util.DualNodeTransactionManagerLookup;
+import org.hibernate.test.cache.jbc.functional.util.DualNodeConnectionProviderImpl;
+import org.hibernate.test.cache.jbc.functional.util.DualNodeJtaTransactionManagerImpl;
+import org.hibernate.test.cache.jbc.functional.util.DualNodeTestUtil;
+import org.hibernate.test.cache.jbc.functional.util.DualNodeTransactionManagerLookup;
import org.hibernate.transaction.CMTTransactionFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/Item.hbm.xml
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/Item.hbm.xml 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/Item.hbm.xml 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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">
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/Item.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/Item.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/Item.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/MVCCConcurrentWriteTest.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/MVCCConcurrentWriteTest.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/MVCCConcurrentWriteTest.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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.Executors;
import java.util.concurrent.TimeUnit;
-import javax.transaction.SystemException;
import javax.transaction.Transaction;
import junit.framework.Test;
@@ -41,15 +40,15 @@
import org.hibernate.FlushMode;
import org.hibernate.Session;
import org.hibernate.cache.RegionFactory;
-import org.hibernate.cache.jbc2.JBossCacheRegionFactory;
-import org.hibernate.cache.jbc2.builder.SharedCacheInstanceManager;
+import org.hibernate.cache.jbc.JBossCacheRegionFactory;
+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.jbc2.functional.util.DualNodeJtaTransactionManagerImpl;
-import org.hibernate.test.cache.jbc2.functional.util.DualNodeTestUtil;
-import org.hibernate.test.cache.jbc2.functional.util.DualNodeTransactionManagerLookup;
+import org.hibernate.test.cache.jbc.functional.util.DualNodeConnectionProviderImpl;
+import org.hibernate.test.cache.jbc.functional.util.DualNodeJtaTransactionManagerImpl;
+import org.hibernate.test.cache.jbc.functional.util.DualNodeTestUtil;
+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 @@
*/
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);
/**
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/MVCCEntityReplicationTest.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/MVCCEntityReplicationTest.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/MVCCEntityReplicationTest.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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;
/**
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/MVCCJBossCacheTest.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/MVCCJBossCacheTest.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/MVCCJBossCacheTest.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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.jbc2.builder.SharedCacheInstanceManager;
+import org.hibernate.cache.jbc.JBossCacheRegionFactory;
+import org.hibernate.cache.jbc.builder.SharedCacheInstanceManager;
import org.hibernate.cfg.Configuration;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
@@ -38,7 +38,7 @@
*/
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);
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/MVCCSessionRefreshTest.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/MVCCSessionRefreshTest.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/MVCCSessionRefreshTest.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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.
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/OptimisticEntityReplicationTest.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/OptimisticEntityReplicationTest.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/OptimisticEntityReplicationTest.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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;
/**
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/OptimisticJBossCacheTest.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/OptimisticJBossCacheTest.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/OptimisticJBossCacheTest.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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.jbc2.builder.SharedCacheInstanceManager;
+import org.hibernate.cache.jbc.JBossCacheRegionFactory;
+import org.hibernate.cache.jbc.builder.SharedCacheInstanceManager;
import org.hibernate.cfg.Configuration;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
@@ -38,7 +38,7 @@
*/
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);
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/OptimisticSessionRefreshTest.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/OptimisticSessionRefreshTest.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/OptimisticSessionRefreshTest.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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.
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/PessimisticEntityReplicationTest.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/PessimisticEntityReplicationTest.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/PessimisticEntityReplicationTest.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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 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.jbc2.functional.util.TestCacheInstanceManager;
-import org.hibernate.test.cache.jbc2.functional.util.TestJBossCacheRegionFactory;
+import org.hibernate.test.cache.jbc.functional.util.DualNodeTestUtil;
+import org.hibernate.test.cache.jbc.functional.util.TestCacheInstanceManager;
+import org.hibernate.test.cache.jbc.functional.util.TestJBossCacheRegionFactory;
import org.jboss.cache.Cache;
import org.jboss.cache.CacheManager;
import org.jboss.cache.Fqn;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/PessimisticJBossCacheTest.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/PessimisticJBossCacheTest.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/PessimisticJBossCacheTest.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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.jbc2.builder.SharedCacheInstanceManager;
+import org.hibernate.cache.jbc.JBossCacheRegionFactory;
+import org.hibernate.cache.jbc.builder.SharedCacheInstanceManager;
import org.hibernate.cfg.Configuration;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
@@ -38,7 +38,7 @@
*/
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);
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/PessimisticRepeatableSessionRefreshTest.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/PessimisticRepeatableSessionRefreshTest.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/PessimisticRepeatableSessionRefreshTest.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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 PessimisticSessionRefreshTest that uses a REPEATABLE_READ cache config.
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/PessimisticSessionRefreshTest.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/PessimisticSessionRefreshTest.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/PessimisticSessionRefreshTest.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -14,7 +14,7 @@
* Red Hat Author(s): Brian Stansberry
*/
-package org.hibernate.test.cache.jbc2.functional;
+package org.hibernate.test.cache.jbc.functional;
import javax.transaction.TransactionManager;
@@ -22,16 +22,16 @@
import junit.framework.TestSuite;
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.cfg.Environment;
-import org.hibernate.test.cache.jbc2.functional.classloader.Account;
-import org.hibernate.test.cache.jbc2.functional.classloader.ClassLoaderTestDAO;
-import org.hibernate.test.cache.jbc2.functional.util.DualNodeJtaTransactionManagerImpl;
-import org.hibernate.test.cache.jbc2.functional.util.DualNodeTestUtil;
-import org.hibernate.test.cache.jbc2.functional.util.IsolatedCacheTestSetup;
-import org.hibernate.test.cache.jbc2.functional.util.TestCacheInstanceManager;
-import org.hibernate.test.cache.jbc2.functional.util.TestJBossCacheRegionFactory;
+import org.hibernate.test.cache.jbc.functional.classloader.Account;
+import org.hibernate.test.cache.jbc.functional.classloader.ClassLoaderTestDAO;
+import org.hibernate.test.cache.jbc.functional.util.DualNodeJtaTransactionManagerImpl;
+import org.hibernate.test.cache.jbc.functional.util.DualNodeTestUtil;
+import org.hibernate.test.cache.jbc.functional.util.IsolatedCacheTestSetup;
+import org.hibernate.test.cache.jbc.functional.util.TestCacheInstanceManager;
+import org.hibernate.test.cache.jbc.functional.util.TestJBossCacheRegionFactory;
import org.jboss.cache.Cache;
import org.jboss.cache.CacheManager;
import org.slf4j.Logger;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/VersionedItem.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/VersionedItem.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/VersionedItem.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -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 Steve Ebersole
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/bulk/MVCCBulkOperationsTest.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/bulk/MVCCBulkOperationsTest.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/bulk/MVCCBulkOperationsTest.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -20,11 +20,10 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.hibernate.test.cache.jbc2.functional.bulk;
+package org.hibernate.test.cache.jbc.functional.bulk;
import junit.framework.Test;
-import org.hibernate.test.cache.jbc2.collection.OptimisticInvalidatedTransactionalTestCase;
import org.hibernate.test.util.CacheTestUtil;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/bulk/OptimisticBulkOperationsTest.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/bulk/OptimisticBulkOperationsTest.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/bulk/OptimisticBulkOperationsTest.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -20,11 +20,10 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.hibernate.test.cache.jbc2.functional.bulk;
+package org.hibernate.test.cache.jbc.functional.bulk;
import junit.framework.Test;
-import org.hibernate.test.cache.jbc2.collection.OptimisticInvalidatedTransactionalTestCase;
import org.hibernate.test.util.CacheTestUtil;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/bulk/PessimisticBulkOperationsTest.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/bulk/PessimisticBulkOperationsTest.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/bulk/PessimisticBulkOperationsTest.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -19,22 +19,21 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.hibernate.test.cache.jbc2.functional.bulk;
+package org.hibernate.test.cache.jbc.functional.bulk;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import org.hibernate.FlushMode;
-import org.hibernate.cache.RegionFactory;
-import org.hibernate.cache.jbc2.MultiplexedJBossCacheRegionFactory;
-import org.hibernate.cache.jbc2.builder.MultiplexingCacheInstanceManager;
+import org.hibernate.cache.jbc.MultiplexedJBossCacheRegionFactory;
+import org.hibernate.cache.jbc.builder.MultiplexingCacheInstanceManager;
import org.hibernate.cfg.Configuration;
import org.hibernate.classic.Session;
import org.hibernate.stat.SecondLevelCacheStatistics;
-import org.hibernate.test.cache.jbc2.functional.CacheTestCaseBase;
-import org.hibernate.test.cache.jbc2.functional.Contact;
-import org.hibernate.test.cache.jbc2.functional.Customer;
+import org.hibernate.test.cache.jbc.functional.CacheTestCaseBase;
+import org.hibernate.test.cache.jbc.functional.Contact;
+import org.hibernate.test.cache.jbc.functional.Customer;
import org.hibernate.test.tm.SimpleJtaTransactionManagerImpl;
import org.hibernate.transaction.CMTTransactionFactory;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/classloader/Account.hbm.xml
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/classloader/Account.hbm.xml 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/classloader/Account.hbm.xml 2009-07-07 17:36:04 UTC (rev 17023)
@@ -27,7 +27,7 @@
~ Boston, MA 02110-1301 USA
-->
<hibernate-mapping
- package="org.hibernate.test.cache.jbc2.functional.classloader">
+ package="org.hibernate.test.cache.jbc.functional.classloader">
<class name="Account" table="Accounts">
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/classloader/Account.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/classloader/Account.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/classloader/Account.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
-package org.hibernate.test.cache.jbc2.functional.classloader;
+package org.hibernate.test.cache.jbc.functional.classloader;
import java.io.Serializable;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/classloader/AccountHolder.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/classloader/AccountHolder.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/classloader/AccountHolder.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
-package org.hibernate.test.cache.jbc2.functional.classloader;
+package org.hibernate.test.cache.jbc.functional.classloader;
import java.io.IOException;
import java.io.ObjectInputStream;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/classloader/CacheAccessListener.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/classloader/CacheAccessListener.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/classloader/CacheAccessListener.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
-package org.hibernate.test.cache.jbc2.functional.classloader;
+package org.hibernate.test.cache.jbc.functional.classloader;
import java.util.HashSet;
import java.util.Iterator;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/classloader/ClassLoaderTestDAO.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/classloader/ClassLoaderTestDAO.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/classloader/ClassLoaderTestDAO.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.hibernate.test.cache.jbc2.functional.classloader;
+package org.hibernate.test.cache.jbc.functional.classloader;
import java.lang.reflect.Method;
import java.util.Iterator;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/classloader/MVCCIsolatedClassLoaderTest.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/classloader/MVCCIsolatedClassLoaderTest.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/classloader/MVCCIsolatedClassLoaderTest.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -14,12 +14,12 @@
* Red Hat Author(s): Brian Stansberry
*/
-package org.hibernate.test.cache.jbc2.functional.classloader;
+package org.hibernate.test.cache.jbc.functional.classloader;
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;
/**
* Optimistic locking version of IsolatedClassLoaderTest.
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/classloader/OptimisticIsolatedClassLoaderTest.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/classloader/OptimisticIsolatedClassLoaderTest.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/classloader/OptimisticIsolatedClassLoaderTest.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -14,12 +14,12 @@
* Red Hat Author(s): Brian Stansberry
*/
-package org.hibernate.test.cache.jbc2.functional.classloader;
+package org.hibernate.test.cache.jbc.functional.classloader;
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;
/**
* Optimistic locking version of IsolatedClassLoaderTest.
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/classloader/PessimisticIsolatedClassLoaderTest.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/classloader/PessimisticIsolatedClassLoaderTest.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/classloader/PessimisticIsolatedClassLoaderTest.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
-package org.hibernate.test.cache.jbc2.functional.classloader;
+package org.hibernate.test.cache.jbc.functional.classloader;
import javax.transaction.TransactionManager;
@@ -31,16 +31,16 @@
import org.hibernate.SessionFactory;
import org.hibernate.cache.StandardQueryCache;
-import org.hibernate.cache.jbc2.BasicRegionAdapter;
-import org.hibernate.cache.jbc2.builder.MultiplexingCacheInstanceManager;
-import org.hibernate.cache.jbc2.query.QueryResultsRegionImpl;
+import org.hibernate.cache.jbc.BasicRegionAdapter;
+import org.hibernate.cache.jbc.builder.MultiplexingCacheInstanceManager;
+import org.hibernate.cache.jbc.query.QueryResultsRegionImpl;
import org.hibernate.cfg.Configuration;
-import org.hibernate.test.cache.jbc2.functional.DualNodeTestCaseBase;
-import org.hibernate.test.cache.jbc2.functional.util.DualNodeJtaTransactionManagerImpl;
-import org.hibernate.test.cache.jbc2.functional.util.DualNodeTestUtil;
-import org.hibernate.test.cache.jbc2.functional.util.IsolatedCacheTestSetup;
-import org.hibernate.test.cache.jbc2.functional.util.TestCacheInstanceManager;
-import org.hibernate.test.cache.jbc2.functional.util.TestJBossCacheRegionFactory;
+import org.hibernate.test.cache.jbc.functional.DualNodeTestCaseBase;
+import org.hibernate.test.cache.jbc.functional.util.DualNodeJtaTransactionManagerImpl;
+import org.hibernate.test.cache.jbc.functional.util.DualNodeTestUtil;
+import org.hibernate.test.cache.jbc.functional.util.IsolatedCacheTestSetup;
+import org.hibernate.test.cache.jbc.functional.util.TestCacheInstanceManager;
+import org.hibernate.test.cache.jbc.functional.util.TestJBossCacheRegionFactory;
import org.jboss.cache.Cache;
import org.jboss.cache.CacheManager;
import org.jboss.cache.Fqn;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/CustomClassLoaderCacheManager.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/util/CustomClassLoaderCacheManager.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/CustomClassLoaderCacheManager.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -14,7 +14,7 @@
* Red Hat Author(s): Brian Stansberry
*/
-package org.hibernate.test.cache.jbc2.functional.util;
+package org.hibernate.test.cache.jbc.functional.util;
import org.jboss.cache.Cache;
import org.jboss.cache.CacheManagerImpl;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/DualNodeConnectionProviderImpl.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/util/DualNodeConnectionProviderImpl.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/DualNodeConnectionProviderImpl.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
-package org.hibernate.test.cache.jbc2.functional.util;
+package org.hibernate.test.cache.jbc.functional.util;
import java.sql.Connection;
import java.sql.SQLException;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/DualNodeJtaTransactionImpl.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/util/DualNodeJtaTransactionImpl.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/DualNodeJtaTransactionImpl.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
-package org.hibernate.test.cache.jbc2.functional.util;
+package org.hibernate.test.cache.jbc.functional.util;
import java.sql.Connection;
import java.sql.SQLException;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/DualNodeJtaTransactionManagerImpl.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/util/DualNodeJtaTransactionManagerImpl.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/DualNodeJtaTransactionManagerImpl.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
-package org.hibernate.test.cache.jbc2.functional.util;
+package org.hibernate.test.cache.jbc.functional.util;
import java.util.Hashtable;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/DualNodeTestUtil.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/util/DualNodeTestUtil.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/DualNodeTestUtil.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -14,7 +14,7 @@
* Red Hat Author(s): Brian Stansberry
*/
-package org.hibernate.test.cache.jbc2.functional.util;
+package org.hibernate.test.cache.jbc.functional.util;
/**
* A DualNodeTestUtil.
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/DualNodeTransactionManagerLookup.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/util/DualNodeTransactionManagerLookup.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/DualNodeTransactionManagerLookup.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
-package org.hibernate.test.cache.jbc2.functional.util;
+package org.hibernate.test.cache.jbc.functional.util;
import java.util.Properties;
import javax.transaction.TransactionManager;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/IsolatedCacheTestSetup.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/util/IsolatedCacheTestSetup.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/IsolatedCacheTestSetup.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -14,7 +14,7 @@
* Red Hat Author(s): Brian Stansberry
*/
-package org.hibernate.test.cache.jbc2.functional.util;
+package org.hibernate.test.cache.jbc.functional.util;
import junit.framework.Test;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/TestCacheInstanceManager.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/util/TestCacheInstanceManager.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/TestCacheInstanceManager.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -21,13 +21,13 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
-package org.hibernate.test.cache.jbc2.functional.util;
+package org.hibernate.test.cache.jbc.functional.util;
import java.util.Hashtable;
import java.util.Properties;
import org.hibernate.cache.CacheException;
-import org.hibernate.cache.jbc2.builder.MultiplexingCacheInstanceManager;
+import org.hibernate.cache.jbc.builder.MultiplexingCacheInstanceManager;
import org.hibernate.cfg.Settings;
import org.jboss.cache.CacheManager;
import org.jboss.cache.CacheManagerImpl;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/TestJBossCacheRegionFactory.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/util/TestJBossCacheRegionFactory.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/TestJBossCacheRegionFactory.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -21,11 +21,11 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
-package org.hibernate.test.cache.jbc2.functional.util;
+package org.hibernate.test.cache.jbc.functional.util;
import java.util.Properties;
-import org.hibernate.cache.jbc2.JBossCacheRegionFactory;
+import org.hibernate.cache.jbc.JBossCacheRegionFactory;
import org.jboss.cache.CacheManager;
/**
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/query/QueryRegionImplTestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/query/QueryRegionImplTestCase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/query/QueryRegionImplTestCase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
-package org.hibernate.test.cache.jbc2.query;
+package org.hibernate.test.cache.jbc.query;
import java.util.Properties;
import java.util.concurrent.CountDownLatch;
@@ -33,12 +33,12 @@
import org.hibernate.cache.QueryResultsRegion;
import org.hibernate.cache.Region;
import org.hibernate.cache.StandardQueryCache;
-import org.hibernate.cache.jbc2.BasicRegionAdapter;
-import org.hibernate.cache.jbc2.CacheInstanceManager;
-import org.hibernate.cache.jbc2.JBossCacheRegionFactory;
-import org.hibernate.cache.jbc2.query.QueryResultsRegionImpl;
+import org.hibernate.cache.jbc.BasicRegionAdapter;
+import org.hibernate.cache.jbc.CacheInstanceManager;
+import org.hibernate.cache.jbc.JBossCacheRegionFactory;
+import org.hibernate.cache.jbc.query.QueryResultsRegionImpl;
import org.hibernate.cfg.Configuration;
-import org.hibernate.test.cache.jbc2.AbstractGeneralDataRegionTestCase;
+import org.hibernate.test.cache.jbc.AbstractGeneralDataRegionTestCase;
import org.hibernate.test.util.CacheTestUtil;
import org.jboss.cache.Cache;
import org.jboss.cache.Fqn;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/timestamp/ClusteredConcurrentTimestampRegionTestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/timestamp/ClusteredConcurrentTimestampRegionTestCase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/timestamp/ClusteredConcurrentTimestampRegionTestCase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -14,7 +14,7 @@
* Red Hat Author(s): Brian Stansberry
*/
-package org.hibernate.test.cache.jbc2.timestamp;
+package org.hibernate.test.cache.jbc.timestamp;
import java.util.Properties;
import java.util.Random;
@@ -22,12 +22,12 @@
import junit.framework.AssertionFailedError;
import org.hibernate.cache.UpdateTimestampsCache;
-import org.hibernate.cache.jbc2.CacheInstanceManager;
-import org.hibernate.cache.jbc2.JBossCacheRegionFactory;
-import org.hibernate.cache.jbc2.MultiplexedJBossCacheRegionFactory;
-import org.hibernate.cache.jbc2.timestamp.ClusteredConcurrentTimestampsRegionImpl;
+import org.hibernate.cache.jbc.CacheInstanceManager;
+import org.hibernate.cache.jbc.JBossCacheRegionFactory;
+import org.hibernate.cache.jbc.MultiplexedJBossCacheRegionFactory;
+import org.hibernate.cache.jbc.timestamp.ClusteredConcurrentTimestampsRegionImpl;
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;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/timestamp/TimestampsRegionImplTestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/timestamp/TimestampsRegionImplTestCase.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/timestamp/TimestampsRegionImplTestCase.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -21,18 +21,18 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
-package org.hibernate.test.cache.jbc2.timestamp;
+package org.hibernate.test.cache.jbc.timestamp;
import java.util.Properties;
import org.hibernate.cache.CacheDataDescription;
import org.hibernate.cache.Region;
import org.hibernate.cache.UpdateTimestampsCache;
-import org.hibernate.cache.jbc2.BasicRegionAdapter;
-import org.hibernate.cache.jbc2.CacheInstanceManager;
-import org.hibernate.cache.jbc2.JBossCacheRegionFactory;
-import org.hibernate.cache.jbc2.timestamp.TimestampsRegionImpl;
-import org.hibernate.test.cache.jbc2.AbstractGeneralDataRegionTestCase;
+import org.hibernate.cache.jbc.BasicRegionAdapter;
+import org.hibernate.cache.jbc.CacheInstanceManager;
+import org.hibernate.cache.jbc.JBossCacheRegionFactory;
+import org.hibernate.cache.jbc.timestamp.TimestampsRegionImpl;
+import org.hibernate.test.cache.jbc.AbstractGeneralDataRegionTestCase;
import org.jboss.cache.Cache;
import org.jboss.cache.Fqn;
Copied: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/tm/jbc (from rev 17020, core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/tm/jbc2)
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/tm/jbc/BatchModeTransactionManagerLookup.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/tm/jbc2/BatchModeTransactionManagerLookup.java 2009-07-07 16:38:30 UTC (rev 17020)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/tm/jbc/BatchModeTransactionManagerLookup.java 2009-07-07 17:36:04 UTC (rev 17023)
@@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
-package org.hibernate.test.tm.jbc2;
+package org.hibernate.test.tm.jbc;
import java.util.Properties;
More information about the hibernate-commits
mailing list