[jboss-cvs] JBossAS SVN: r76720 - in projects/cluster/hibernate-jbc-cacheprovider/trunk/src: test/java/org/jboss/hibernate/jbc/cacheprovider and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Aug 6 11:55:46 EDT 2008
Author: galder.zamarreno at jboss.com
Date: 2008-08-06 11:55:46 -0400 (Wed, 06 Aug 2008)
New Revision: 76720
Added:
projects/cluster/hibernate-jbc-cacheprovider/trunk/src/main/java/org/jboss/hibernate/jbc/cacheprovider/OptimisticTreeCacheProvider.java
projects/cluster/hibernate-jbc-cacheprovider/trunk/src/main/java/org/jboss/hibernate/jbc/cacheprovider/TreeCacheProvider.java
projects/cluster/hibernate-jbc-cacheprovider/trunk/src/test/java/org/jboss/hibernate/jbc/cacheprovider/NonJndiTmTreeCacheProvider.java
Removed:
projects/cluster/hibernate-jbc-cacheprovider/trunk/src/main/java/org/jboss/hibernate/jbc/cacheprovider/OptimisticTreeCacheProviderHook.java
projects/cluster/hibernate-jbc-cacheprovider/trunk/src/main/java/org/jboss/hibernate/jbc/cacheprovider/TreeCacheProviderHook.java
projects/cluster/hibernate-jbc-cacheprovider/trunk/src/test/java/org/jboss/hibernate/jbc/cacheprovider/NonJndiTmTreeCacheProviderHook.java
Modified:
projects/cluster/hibernate-jbc-cacheprovider/trunk/src/test/java/org/jboss/hibernate/jbc/cacheprovider/functional/CacheTestCaseBase.java
projects/cluster/hibernate-jbc-cacheprovider/trunk/src/test/java/org/jboss/hibernate/jbc/cacheprovider/functional/DualNodeTestCaseBase.java
projects/cluster/hibernate-jbc-cacheprovider/trunk/src/test/java/org/jboss/hibernate/jbc/cacheprovider/functional/OptimisticJBossCacheTest.java
projects/cluster/hibernate-jbc-cacheprovider/trunk/src/test/java/org/jboss/hibernate/jbc/cacheprovider/functional/PessimisticEntityReplicationTest.java
projects/cluster/hibernate-jbc-cacheprovider/trunk/src/test/java/org/jboss/hibernate/jbc/cacheprovider/functional/PessimisticJBossCacheTest.java
projects/cluster/hibernate-jbc-cacheprovider/trunk/src/test/java/org/jboss/hibernate/jbc/cacheprovider/functional/util/TestCacheInstanceManager.java
Log:
[JBCLUSTER-206] Removed *Hook from the new cache providers.
Copied: projects/cluster/hibernate-jbc-cacheprovider/trunk/src/main/java/org/jboss/hibernate/jbc/cacheprovider/OptimisticTreeCacheProvider.java (from rev 76715, projects/cluster/hibernate-jbc-cacheprovider/trunk/src/main/java/org/jboss/hibernate/jbc/cacheprovider/OptimisticTreeCacheProviderHook.java)
===================================================================
--- projects/cluster/hibernate-jbc-cacheprovider/trunk/src/main/java/org/jboss/hibernate/jbc/cacheprovider/OptimisticTreeCacheProvider.java (rev 0)
+++ projects/cluster/hibernate-jbc-cacheprovider/trunk/src/main/java/org/jboss/hibernate/jbc/cacheprovider/OptimisticTreeCacheProvider.java 2008-08-06 15:55:46 UTC (rev 76720)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, the OpenSource J2EE webOS
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package org.jboss.hibernate.jbc.cacheprovider;
+
+import java.util.Properties;
+
+import org.hibernate.cache.CacheException;
+import org.jboss.logging.Logger;
+
+/**
+ * Trivial {@link TreeCacheProvider} subclass that logs a warning in
+ * {@link #start(Properties) start} if the underlying JBoss Cache
+ * is not configured for optimistic locking. Like the superclass,
+ * will provide working Cache implementations whether JBoss Cache is
+ * configured for optimistic locking or not; the only added behavior
+ * is the logging of the warning if the JBoss Cache configuration doesn't
+ * match the intent implied by the use of this class.
+ *
+ * @author <a href="mailto:galder.zamarreno at jboss.com">Galder Zamarreno</a>
+ * @author Brian Stansberry
+ * @deprecated TreeCacheProviderHook supports both optimistic and pessimistic
+ * cache configurations.
+ */
+public class OptimisticTreeCacheProvider extends TreeCacheProvider
+{
+ private static final Logger log = Logger.getLogger(OptimisticTreeCacheProvider.class);
+
+ public void start(Properties properties) throws CacheException
+ {
+ super.start(properties);
+
+ if (isOptimistic() == false)
+ {
+ log.warn("JBoss Cache is not configured for optimistic locking; " +
+ "provided Cache implementations therefore will not implement OptimisticCache");
+ }
+ }
+
+}
Deleted: projects/cluster/hibernate-jbc-cacheprovider/trunk/src/main/java/org/jboss/hibernate/jbc/cacheprovider/OptimisticTreeCacheProviderHook.java
===================================================================
--- projects/cluster/hibernate-jbc-cacheprovider/trunk/src/main/java/org/jboss/hibernate/jbc/cacheprovider/OptimisticTreeCacheProviderHook.java 2008-08-06 15:43:41 UTC (rev 76719)
+++ projects/cluster/hibernate-jbc-cacheprovider/trunk/src/main/java/org/jboss/hibernate/jbc/cacheprovider/OptimisticTreeCacheProviderHook.java 2008-08-06 15:55:46 UTC (rev 76720)
@@ -1,43 +0,0 @@
-/*
- * JBoss, the OpenSource J2EE webOS
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package org.jboss.hibernate.jbc.cacheprovider;
-
-import java.util.Properties;
-
-import org.hibernate.cache.CacheException;
-import org.jboss.logging.Logger;
-
-/**
- * Trivial {@link TreeCacheProviderHook} subclass that logs a warning in
- * {@link #start(Properties) start} if the underlying JBoss Cache
- * is not configured for optimistic locking. Like the superclass,
- * will provide working Cache implementations whether JBoss Cache is
- * configured for optimistic locking or not; the only added behavior
- * is the logging of the warning if the JBoss Cache configuration doesn't
- * match the intent implied by the use of this class.
- *
- * @author <a href="mailto:galder.zamarreno at jboss.com">Galder Zamarreno</a>
- * @author Brian Stansberry
- * @deprecated TreeCacheProviderHook supports both optimistic and pessimistic
- * cache configurations.
- */
-public class OptimisticTreeCacheProviderHook extends TreeCacheProviderHook
-{
- private static final Logger log = Logger.getLogger(OptimisticTreeCacheProviderHook.class);
-
- public void start(Properties properties) throws CacheException
- {
- super.start(properties);
-
- if (isOptimistic() == false)
- {
- log.warn("JBoss Cache is not configured for optimistic locking; " +
- "provided Cache implementations therefore will not implement OptimisticCache");
- }
- }
-
-}
Copied: projects/cluster/hibernate-jbc-cacheprovider/trunk/src/main/java/org/jboss/hibernate/jbc/cacheprovider/TreeCacheProvider.java (from rev 76715, projects/cluster/hibernate-jbc-cacheprovider/trunk/src/main/java/org/jboss/hibernate/jbc/cacheprovider/TreeCacheProviderHook.java)
===================================================================
--- projects/cluster/hibernate-jbc-cacheprovider/trunk/src/main/java/org/jboss/hibernate/jbc/cacheprovider/TreeCacheProvider.java (rev 0)
+++ projects/cluster/hibernate-jbc-cacheprovider/trunk/src/main/java/org/jboss/hibernate/jbc/cacheprovider/TreeCacheProvider.java 2008-08-06 15:55:46 UTC (rev 76720)
@@ -0,0 +1,148 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.hibernate.jbc.cacheprovider;
+
+import java.util.Properties;
+
+import javax.management.ObjectName;
+import javax.transaction.TransactionManager;
+
+import org.hibernate.cache.Cache;
+import org.hibernate.cache.CacheException;
+import org.hibernate.cache.CacheProvider;
+import org.jboss.cache.TreeCache;
+import org.jboss.cache.TreeCacheMBean;
+import org.jboss.logging.Logger;
+import org.jboss.mx.util.MBeanProxyExt;
+import org.jboss.mx.util.MBeanServerLocator;
+import org.jboss.tm.TransactionManagerLocator;
+
+/**
+ * Support for integration as a 2nd level cache with an already existing
+ * JBoss Cache (TreeCache) instance. The ObjectName of the cache is
+ * provided via the <code>hibernate.treecache.mbean.object_name</code>
+ * configuration property.
+ * <p/>
+ * This class supports both optimistic and pessimistic locking, providing
+ * instances of <code>org.hibernate.cache.OptimisticCache</code> if the
+ * underlying JBoss Cache is configured for optimistic locking.
+ *
+ * @author Gavin King
+ * @author Brian Stansberry
+ * @author <a href="mailto:galder.zamarreno at jboss.com">Galder Zamarreno</a>
+ */
+public class TreeCacheProvider
+ extends org.hibernate.cache.TreeCacheProvider
+ implements CacheProvider
+{
+ private static final Logger log = Logger.getLogger(TreeCacheProvider.class);
+
+ private org.jboss.cache.TreeCache cache;
+ private boolean optimistic;
+
+ /**
+ * Construct and configure the Cache representation of a named cache region.
+ *
+ * @param regionName the name of the cache region
+ * @param properties configuration settings
+ * @return The Cache representation of the named cache region. If the
+ * underlying JBoss Cache is configured for optimistic locking,
+ * the returned object will also implement org.hibernate.cache.OptimisticCache.
+ * @throws org.hibernate.cache.CacheException
+ * Indicates an error building the cache region.
+ */
+ public Cache buildCache(String regionName, Properties properties) throws CacheException
+ {
+ CacheProperties cacheProperties = new CacheProperties(properties);
+
+ if (optimistic)
+ {
+ return new OptimisticJBCCache(cache, regionName, cacheProperties);
+ }
+ else
+ {
+ /* removed dependency on ejb3's TxUtil */
+ return new JBCCache(cache, regionName, cacheProperties, getTransactionManager(properties));
+ }
+ }
+
+ public boolean isMinimalPutsEnabledByDefault()
+ {
+ return true;
+ }
+
+ public long nextTimestamp()
+ {
+ return System.currentTimeMillis() / 100;
+ }
+
+ /**
+ * Find the underlying JBoss Cache TreeCache instance.
+ *
+ * @param properties All current config settings.
+ * If {@link #HIBERNATE_CACHE_OBJECT_NAME_PROPERTY} is provided,
+ * the value will be the expected name of the cache; otherwise
+ * {@link #DEFAULT_MBEAN_OBJECT_NAME} will be used.
+ * @throws org.hibernate.cache.CacheException
+ * Indicates a problem preparing cache for use.
+ */
+ public void start(Properties properties)
+ {
+ CacheProperties cacheProperties = new CacheProperties(properties);
+
+ try
+ {
+ ObjectName mbeanObjectName = new ObjectName(cacheProperties.getCacheObjectName());
+ TreeCacheMBean mbean = (TreeCacheMBean) MBeanProxyExt.create(TreeCacheMBean.class, mbeanObjectName, MBeanServerLocator.locateJBoss());
+ cache = mbean.getInstance();
+ if ("OPTIMISTIC".equals(cache.getNodeLockingScheme()))
+ {
+ optimistic = true;
+ log.debug("JBoss Cache is configured for optimistic locking; " +
+ "provided Cache implementations will also implement OptimisticCache");
+ }
+ }
+ catch (Exception e)
+ {
+ throw new CacheException(e);
+ }
+ }
+
+ public void stop()
+ {
+ }
+
+ public boolean isOptimistic()
+ {
+ return optimistic;
+ }
+
+ public TreeCache getUnderlyingCache()
+ {
+ return cache;
+ }
+
+ protected TransactionManager getTransactionManager(Properties properties)
+ {
+ return TransactionManagerLocator.getInstance().locate();
+ }
+}
Deleted: projects/cluster/hibernate-jbc-cacheprovider/trunk/src/main/java/org/jboss/hibernate/jbc/cacheprovider/TreeCacheProviderHook.java
===================================================================
--- projects/cluster/hibernate-jbc-cacheprovider/trunk/src/main/java/org/jboss/hibernate/jbc/cacheprovider/TreeCacheProviderHook.java 2008-08-06 15:43:41 UTC (rev 76719)
+++ projects/cluster/hibernate-jbc-cacheprovider/trunk/src/main/java/org/jboss/hibernate/jbc/cacheprovider/TreeCacheProviderHook.java 2008-08-06 15:55:46 UTC (rev 76720)
@@ -1,148 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.hibernate.jbc.cacheprovider;
-
-import java.util.Properties;
-
-import javax.management.ObjectName;
-import javax.transaction.TransactionManager;
-
-import org.hibernate.cache.Cache;
-import org.hibernate.cache.CacheException;
-import org.hibernate.cache.CacheProvider;
-import org.jboss.cache.TreeCache;
-import org.jboss.cache.TreeCacheMBean;
-import org.jboss.logging.Logger;
-import org.jboss.mx.util.MBeanProxyExt;
-import org.jboss.mx.util.MBeanServerLocator;
-import org.jboss.tm.TransactionManagerLocator;
-
-/**
- * Support for integration as a 2nd level cache with an already existing
- * JBoss Cache (TreeCache) instance. The ObjectName of the cache is
- * provided via the <code>hibernate.treecache.mbean.object_name</code>
- * configuration property.
- * <p/>
- * This class supports both optimistic and pessimistic locking, providing
- * instances of <code>org.hibernate.cache.OptimisticCache</code> if the
- * underlying JBoss Cache is configured for optimistic locking.
- *
- * @author Gavin King
- * @author Brian Stansberry
- * @author <a href="mailto:galder.zamarreno at jboss.com">Galder Zamarreno</a>
- */
-public class TreeCacheProviderHook
- extends org.hibernate.cache.TreeCacheProvider
- implements CacheProvider
-{
- private static final Logger log = Logger.getLogger(TreeCacheProviderHook.class);
-
- private org.jboss.cache.TreeCache cache;
- private boolean optimistic;
-
- /**
- * Construct and configure the Cache representation of a named cache region.
- *
- * @param regionName the name of the cache region
- * @param properties configuration settings
- * @return The Cache representation of the named cache region. If the
- * underlying JBoss Cache is configured for optimistic locking,
- * the returned object will also implement org.hibernate.cache.OptimisticCache.
- * @throws org.hibernate.cache.CacheException
- * Indicates an error building the cache region.
- */
- public Cache buildCache(String regionName, Properties properties) throws CacheException
- {
- CacheProperties cacheProperties = new CacheProperties(properties);
-
- if (optimistic)
- {
- return new OptimisticJBCCache(cache, regionName, cacheProperties);
- }
- else
- {
- /* removed dependency on ejb3's TxUtil */
- return new JBCCache(cache, regionName, cacheProperties, getTransactionManager(properties));
- }
- }
-
- public boolean isMinimalPutsEnabledByDefault()
- {
- return true;
- }
-
- public long nextTimestamp()
- {
- return System.currentTimeMillis() / 100;
- }
-
- /**
- * Find the underlying JBoss Cache TreeCache instance.
- *
- * @param properties All current config settings.
- * If {@link #HIBERNATE_CACHE_OBJECT_NAME_PROPERTY} is provided,
- * the value will be the expected name of the cache; otherwise
- * {@link #DEFAULT_MBEAN_OBJECT_NAME} will be used.
- * @throws org.hibernate.cache.CacheException
- * Indicates a problem preparing cache for use.
- */
- public void start(Properties properties)
- {
- CacheProperties cacheProperties = new CacheProperties(properties);
-
- try
- {
- ObjectName mbeanObjectName = new ObjectName(cacheProperties.getCacheObjectName());
- TreeCacheMBean mbean = (TreeCacheMBean) MBeanProxyExt.create(TreeCacheMBean.class, mbeanObjectName, MBeanServerLocator.locateJBoss());
- cache = mbean.getInstance();
- if ("OPTIMISTIC".equals(cache.getNodeLockingScheme()))
- {
- optimistic = true;
- log.debug("JBoss Cache is configured for optimistic locking; " +
- "provided Cache implementations will also implement OptimisticCache");
- }
- }
- catch (Exception e)
- {
- throw new CacheException(e);
- }
- }
-
- public void stop()
- {
- }
-
- public boolean isOptimistic()
- {
- return optimistic;
- }
-
- public TreeCache getUnderlyingCache()
- {
- return cache;
- }
-
- protected TransactionManager getTransactionManager(Properties properties)
- {
- return TransactionManagerLocator.getInstance().locate();
- }
-}
Copied: projects/cluster/hibernate-jbc-cacheprovider/trunk/src/test/java/org/jboss/hibernate/jbc/cacheprovider/NonJndiTmTreeCacheProvider.java (from rev 76714, projects/cluster/hibernate-jbc-cacheprovider/trunk/src/test/java/org/jboss/hibernate/jbc/cacheprovider/NonJndiTmTreeCacheProviderHook.java)
===================================================================
--- projects/cluster/hibernate-jbc-cacheprovider/trunk/src/test/java/org/jboss/hibernate/jbc/cacheprovider/NonJndiTmTreeCacheProvider.java (rev 0)
+++ projects/cluster/hibernate-jbc-cacheprovider/trunk/src/test/java/org/jboss/hibernate/jbc/cacheprovider/NonJndiTmTreeCacheProvider.java 2008-08-06 15:55:46 UTC (rev 76720)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.hibernate.jbc.cacheprovider;
+
+import java.util.Properties;
+
+import javax.transaction.TransactionManager;
+
+import org.hibernate.transaction.TransactionManagerLookup;
+import org.hibernate.transaction.TransactionManagerLookupFactory;
+
+/**
+ * NonJndiTmTreeCacheProviderHook.
+ *
+ * @author <a href="mailto:galder.zamarreno at jboss.com">Galder Zamarreno</a>
+ */
+public class NonJndiTmTreeCacheProvider extends TreeCacheProvider
+{
+ protected TransactionManager getTransactionManager(Properties properties)
+ {
+ TransactionManagerLookup transactionManagerLookup = TransactionManagerLookupFactory.getTransactionManagerLookup(properties);
+ return transactionManagerLookup.getTransactionManager(properties);
+ }
+}
Deleted: projects/cluster/hibernate-jbc-cacheprovider/trunk/src/test/java/org/jboss/hibernate/jbc/cacheprovider/NonJndiTmTreeCacheProviderHook.java
===================================================================
--- projects/cluster/hibernate-jbc-cacheprovider/trunk/src/test/java/org/jboss/hibernate/jbc/cacheprovider/NonJndiTmTreeCacheProviderHook.java 2008-08-06 15:43:41 UTC (rev 76719)
+++ projects/cluster/hibernate-jbc-cacheprovider/trunk/src/test/java/org/jboss/hibernate/jbc/cacheprovider/NonJndiTmTreeCacheProviderHook.java 2008-08-06 15:55:46 UTC (rev 76720)
@@ -1,43 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.hibernate.jbc.cacheprovider;
-
-import java.util.Properties;
-
-import javax.transaction.TransactionManager;
-
-import org.hibernate.transaction.TransactionManagerLookup;
-import org.hibernate.transaction.TransactionManagerLookupFactory;
-
-/**
- * NonJndiTmTreeCacheProviderHook.
- *
- * @author <a href="mailto:galder.zamarreno at jboss.com">Galder Zamarreno</a>
- */
-public class NonJndiTmTreeCacheProviderHook extends TreeCacheProviderHook
-{
- protected TransactionManager getTransactionManager(Properties properties)
- {
- TransactionManagerLookup transactionManagerLookup = TransactionManagerLookupFactory.getTransactionManagerLookup(properties);
- return transactionManagerLookup.getTransactionManager(properties);
- }
-}
Modified: projects/cluster/hibernate-jbc-cacheprovider/trunk/src/test/java/org/jboss/hibernate/jbc/cacheprovider/functional/CacheTestCaseBase.java
===================================================================
--- projects/cluster/hibernate-jbc-cacheprovider/trunk/src/test/java/org/jboss/hibernate/jbc/cacheprovider/functional/CacheTestCaseBase.java 2008-08-06 15:43:41 UTC (rev 76719)
+++ projects/cluster/hibernate-jbc-cacheprovider/trunk/src/test/java/org/jboss/hibernate/jbc/cacheprovider/functional/CacheTestCaseBase.java 2008-08-06 15:55:46 UTC (rev 76720)
@@ -40,7 +40,7 @@
import org.jboss.cache.PropertyConfigurator;
import org.jboss.cache.TreeCache;
import org.jboss.hibernate.jbc.cacheprovider.CacheProperties;
-import org.jboss.hibernate.jbc.cacheprovider.TreeCacheProviderHook;
+import org.jboss.hibernate.jbc.cacheprovider.TreeCacheProvider;
import org.jboss.hibernate.jbc.cacheprovider.functional.util.DualNodeTestUtil;
import org.jboss.hibernate.jbc.cacheprovider.functional.util.TestCacheInstanceManager;
import org.jboss.logging.Logger;
Modified: projects/cluster/hibernate-jbc-cacheprovider/trunk/src/test/java/org/jboss/hibernate/jbc/cacheprovider/functional/DualNodeTestCaseBase.java
===================================================================
--- projects/cluster/hibernate-jbc-cacheprovider/trunk/src/test/java/org/jboss/hibernate/jbc/cacheprovider/functional/DualNodeTestCaseBase.java 2008-08-06 15:43:41 UTC (rev 76719)
+++ projects/cluster/hibernate-jbc-cacheprovider/trunk/src/test/java/org/jboss/hibernate/jbc/cacheprovider/functional/DualNodeTestCaseBase.java 2008-08-06 15:55:46 UTC (rev 76720)
@@ -22,7 +22,7 @@
import org.hibernate.engine.SessionFactoryImplementor;
import org.hibernate.junit.functional.ExecutionEnvironment;
import org.jboss.hibernate.jbc.cacheprovider.CacheProperties;
-import org.jboss.hibernate.jbc.cacheprovider.TreeCacheProviderHook;
+import org.jboss.hibernate.jbc.cacheprovider.TreeCacheProvider;
import org.jboss.hibernate.jbc.cacheprovider.functional.util.DualNodeConnectionProviderImpl;
import org.jboss.hibernate.jbc.cacheprovider.functional.util.DualNodeJtaTransactionManagerImpl;
import org.jboss.hibernate.jbc.cacheprovider.functional.util.DualNodeTestUtil;
Modified: projects/cluster/hibernate-jbc-cacheprovider/trunk/src/test/java/org/jboss/hibernate/jbc/cacheprovider/functional/OptimisticJBossCacheTest.java
===================================================================
--- projects/cluster/hibernate-jbc-cacheprovider/trunk/src/test/java/org/jboss/hibernate/jbc/cacheprovider/functional/OptimisticJBossCacheTest.java 2008-08-06 15:43:41 UTC (rev 76719)
+++ projects/cluster/hibernate-jbc-cacheprovider/trunk/src/test/java/org/jboss/hibernate/jbc/cacheprovider/functional/OptimisticJBossCacheTest.java 2008-08-06 15:55:46 UTC (rev 76720)
@@ -40,7 +40,7 @@
{
public static final String JBC_CONFIG = "org/jboss/hibernate/jbc/cacheprovider/functional/optimistic-treecache.xml";
- public static final String JBC_CACHE_PROVIDER = "org.jboss.hibernate.jbc.cacheprovider.TreeCacheProviderHook";
+ public static final String JBC_CACHE_PROVIDER = "org.jboss.hibernate.jbc.cacheprovider.TreeCacheProvider";
public OptimisticJBossCacheTest(String x)
{
Modified: projects/cluster/hibernate-jbc-cacheprovider/trunk/src/test/java/org/jboss/hibernate/jbc/cacheprovider/functional/PessimisticEntityReplicationTest.java
===================================================================
--- projects/cluster/hibernate-jbc-cacheprovider/trunk/src/test/java/org/jboss/hibernate/jbc/cacheprovider/functional/PessimisticEntityReplicationTest.java 2008-08-06 15:43:41 UTC (rev 76719)
+++ projects/cluster/hibernate-jbc-cacheprovider/trunk/src/test/java/org/jboss/hibernate/jbc/cacheprovider/functional/PessimisticEntityReplicationTest.java 2008-08-06 15:55:46 UTC (rev 76720)
@@ -41,7 +41,7 @@
import org.jboss.cache.Fqn;
import org.jboss.cache.PropertyConfigurator;
import org.jboss.cache.TreeCache;
-import org.jboss.hibernate.jbc.cacheprovider.TreeCacheProviderHook;
+import org.jboss.hibernate.jbc.cacheprovider.TreeCacheProvider;
import org.jboss.hibernate.jbc.cacheprovider.functional.util.DualNodeTestUtil;
import org.jboss.hibernate.jbc.cacheprovider.functional.util.TestCacheInstanceManager;
import org.jboss.logging.Logger;
Modified: projects/cluster/hibernate-jbc-cacheprovider/trunk/src/test/java/org/jboss/hibernate/jbc/cacheprovider/functional/PessimisticJBossCacheTest.java
===================================================================
--- projects/cluster/hibernate-jbc-cacheprovider/trunk/src/test/java/org/jboss/hibernate/jbc/cacheprovider/functional/PessimisticJBossCacheTest.java 2008-08-06 15:43:41 UTC (rev 76719)
+++ projects/cluster/hibernate-jbc-cacheprovider/trunk/src/test/java/org/jboss/hibernate/jbc/cacheprovider/functional/PessimisticJBossCacheTest.java 2008-08-06 15:55:46 UTC (rev 76720)
@@ -29,7 +29,7 @@
import org.hibernate.cfg.Environment;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
import org.jboss.cache.TreeCache;
-import org.jboss.hibernate.jbc.cacheprovider.TreeCacheProviderHook;
+import org.jboss.hibernate.jbc.cacheprovider.TreeCacheProvider;
/**
* Basic functional test of a pessimistic locking entity + query cache.
@@ -43,7 +43,7 @@
/** Use an overriden version TreeCacheProviderHook that does not lookup the
* transaction manager on the JNDI but instead use same as passed to Hibernate */
- public static final String JBC_CACHE_PROVIDER = "org.jboss.hibernate.jbc.cacheprovider.NonJndiTmTreeCacheProviderHook";
+ public static final String JBC_CACHE_PROVIDER = "org.jboss.hibernate.jbc.cacheprovider.NonJndiTmTreeCacheProvider";
public PessimisticJBossCacheTest(String x)
{
Modified: projects/cluster/hibernate-jbc-cacheprovider/trunk/src/test/java/org/jboss/hibernate/jbc/cacheprovider/functional/util/TestCacheInstanceManager.java
===================================================================
--- projects/cluster/hibernate-jbc-cacheprovider/trunk/src/test/java/org/jboss/hibernate/jbc/cacheprovider/functional/util/TestCacheInstanceManager.java 2008-08-06 15:43:41 UTC (rev 76719)
+++ projects/cluster/hibernate-jbc-cacheprovider/trunk/src/test/java/org/jboss/hibernate/jbc/cacheprovider/functional/util/TestCacheInstanceManager.java 2008-08-06 15:55:46 UTC (rev 76720)
@@ -39,7 +39,7 @@
import org.jboss.cache.PropertyConfigurator;
import org.jboss.cache.TreeCache;
import org.jboss.hibernate.jbc.cacheprovider.CacheProperties;
-import org.jboss.hibernate.jbc.cacheprovider.TreeCacheProviderHook;
+import org.jboss.hibernate.jbc.cacheprovider.TreeCacheProvider;
import org.jboss.logging.Logger;
/**
More information about the jboss-cvs-commits
mailing list