[hibernate-commits] Hibernate SVN: r20294 - core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc.

[hibernate-commits at lists.jboss.org]

Author: steve.ebersole at jboss.com
Date: 2010-08-31 14:44:56 -0400 (Tue, 31 Aug 2010)
New Revision: 20294

Modified:
   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
Log:
HHH-5489 - Deprecate jbosscache as a second level cache provider, in favor of infinispan


Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/JBossCacheRegionFactory.java
===================================================================
--- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/JBossCacheRegionFactory.java	2010-08-31 18:19:55 UTC (rev 20293)
+++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/JBossCacheRegionFactory.java	2010-08-31 18:44:56 UTC (rev 20294)
@@ -43,6 +43,8 @@
 import org.hibernate.cfg.Settings;
 import org.hibernate.util.PropertiesHelper;
 import org.jboss.cache.DefaultCacheFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * {@link RegionFactory} that uses one or more JBoss Cache instances for 
@@ -62,11 +64,15 @@
  * Also exposes an overloaded constructor that allows injection of different
  * <code>CacheInstanceManager</code> implementations.
  * </p>
+ *
+ * @deprecated Favor Infinispan integration; see HHH-5489 for details.
  * 
  * @author Steve Ebersole
  * @author Brian Stansberry
  */
+ at Deprecated
 public class JBossCacheRegionFactory implements RegionFactory {
+	private static final Logger log = LoggerFactory.getLogger( JBossCacheRegionFactory.class );
     private CacheInstanceManager cacheInstanceManager;
 
     /**
@@ -83,6 +89,7 @@
      *  Create a new JBossCacheRegionFactory.
      */
     public JBossCacheRegionFactory() {
+		log.warn( "Integration with JBossCache is deprecated in favor of Infinispan" );
     }
 
     /**
@@ -93,6 +100,7 @@
      */
     public JBossCacheRegionFactory(CacheInstanceManager cacheInstanceManager) {
         this.cacheInstanceManager = cacheInstanceManager;
+		log.warn( "Integration with JBossCache is deprecated in favor of Infinispan" );
     }
 
     public CacheInstanceManager getCacheInstanceManager() {

Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/JndiMultiplexedJBossCacheRegionFactory.java
===================================================================
--- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/JndiMultiplexedJBossCacheRegionFactory.java	2010-08-31 18:19:55 UTC (rev 20293)
+++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/JndiMultiplexedJBossCacheRegionFactory.java	2010-08-31 18:44:56 UTC (rev 20294)
@@ -25,6 +25,9 @@
 
 import java.util.Properties;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import org.hibernate.cache.jbc.builder.JndiMultiplexingCacheInstanceManager;
 
 /**
@@ -41,10 +44,13 @@
  * This version finds the factory in JNDI. See 
  * {@link JndiMultiplexingCacheInstanceManager} for configuration details. 
  * </p>
- * 
+ *
+ * @deprecated Favor Infinispan integration; see HHH-5489 for details.
+ *
  * @author Brian Stansberry
  * @version $Revision$
  */
+ at Deprecated
 public class JndiMultiplexedJBossCacheRegionFactory extends JBossCacheRegionFactory {
 
     /**

Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/JndiSharedJBossCacheRegionFactory.java
===================================================================
--- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/JndiSharedJBossCacheRegionFactory.java	2010-08-31 18:19:55 UTC (rev 20293)
+++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/JndiSharedJBossCacheRegionFactory.java	2010-08-31 18:44:56 UTC (rev 20294)
@@ -37,10 +37,13 @@
  * using the value of the {@link JndiSharedCacheInstanceManager#CACHE_RESOURCE_PROP}
  * configuration property as the name to look up. 
  * </p>
+ *
+ * @deprecated Favor Infinispan integration; see HHH-5489 for details.
  * 
  * @author Brian Stansberry
  * @version $Revision$
  */
+ at Deprecated
 public class JndiSharedJBossCacheRegionFactory extends JBossCacheRegionFactory {
 
     /**

Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/MultiplexedJBossCacheRegionFactory.java
===================================================================
--- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/MultiplexedJBossCacheRegionFactory.java	2010-08-31 18:19:55 UTC (rev 20293)
+++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/MultiplexedJBossCacheRegionFactory.java	2010-08-31 18:44:56 UTC (rev 20294)
@@ -41,10 +41,13 @@
  * This version instantiates the factory itself. See 
  * {@link MultiplexingCacheInstanceManager} for configuration details. 
  * </p>
- * 
+ *
+ * @deprecated Favor Infinispan integration; see HHH-5489 for details.
+ *
  * @author Brian Stansberry
  * @version $Revision$
  */
+ at Deprecated
 public class MultiplexedJBossCacheRegionFactory extends JBossCacheRegionFactory {
 
     /**

Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/SharedJBossCacheRegionFactory.java
===================================================================
--- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/SharedJBossCacheRegionFactory.java	2010-08-31 18:19:55 UTC (rev 20293)
+++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/SharedJBossCacheRegionFactory.java	2010-08-31 18:44:56 UTC (rev 20294)
@@ -28,6 +28,8 @@
 import org.hibernate.cache.jbc.builder.JndiSharedCacheInstanceManager;
 import org.hibernate.cache.jbc.builder.SharedCacheInstanceManager;
 import org.jboss.cache.DefaultCacheFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * {@link JBossCacheRegionFactory} that uses
@@ -40,10 +42,13 @@
  * {@link JndiSharedCacheInstanceManager#CACHE_RESOURCE_PROP}
  * configuration property. 
  * </p>
- * 
+ *
+ * @deprecated Favor Infinispan integration; see HHH-5489 for details.
+ *
  * @author Brian Stansberry
  * @version $Revision$
  */
+ at Deprecated
 public class SharedJBossCacheRegionFactory extends JBossCacheRegionFactory {
 
     /**