[jboss-cvs] JBossAS SVN: r107456 - branches/infinispan-int/hibernate-int/src/main/java/org/jboss/hibernate/jmx.

[jboss-cvs-commits at lists.jboss.org]

Author: pferraro
Date: 2010-08-05 15:47:38 -0400 (Thu, 05 Aug 2010)
New Revision: 107456

Modified:
   branches/infinispan-int/hibernate-int/src/main/java/org/jboss/hibernate/jmx/Hibernate.java
Log:
Update to work with infinispan 2LC provider.

Modified: branches/infinispan-int/hibernate-int/src/main/java/org/jboss/hibernate/jmx/Hibernate.java
===================================================================
--- branches/infinispan-int/hibernate-int/src/main/java/org/jboss/hibernate/jmx/Hibernate.java	2010-08-05 19:31:37 UTC (rev 107455)
+++ branches/infinispan-int/hibernate-int/src/main/java/org/jboss/hibernate/jmx/Hibernate.java	2010-08-05 19:47:38 UTC (rev 107456)
@@ -99,7 +99,7 @@
    private static final String QUERY_CACHE_ENABLED = "queryCacheEnabled";
    private static final String CACHE_PROVIDER_CLASS = "cacheProviderClass";
    private static final String CACHE_REGION_FACTORY_CLASS = "cacheRegionFactoryClass";
-   private static final String DEPLOYED_CACHE_JNDI_NAME = "deployedCacheJndiName";
+//   private static final String DEPLOYED_CACHE_JNDI_NAME = "deployedCacheJndiName";
    private static final String DEPLOYED_CACHE_MANAGER_JNDI_NAME = "deployedCacheManagerJndiName";
    private static final String MINIMAL_PUTS_ENABLED = "minimalPutsEnabled";
    private static final String CACHE_REGION_PREFIX = "cacheRegionPrefix";
@@ -248,7 +248,7 @@
             }
             else if ( SCAN_FOR_MAPPINGS_ENABLED.equals(name) && value != null )
             {
-               setScanForMappingsEnabled(Boolean.valueOf(value.toString()));
+               setScanForMappingsEnabled(Boolean.parseBoolean(value.toString()));
             }
             else
             {
@@ -441,17 +441,18 @@
       {
          configurationElements.put(Environment.TRANSACTION_STRATEGY, JTATransactionFactory.class.getName());
       }
-      
+/*      
       if ( getDeployedCacheJndiName() != null && getCacheRegionFactoryClass() == null)
       {
          // Implies shared cache region factory
          configurationElements.put(Environment.CACHE_REGION_FACTORY, org.hibernate.cache.jbc.JndiSharedJBossCacheRegionFactory.class.getName());
       }
-
+*/
       if ( getDeployedCacheManagerJndiName() != null && getCacheRegionFactoryClass() == null)
       {
          // Implies multliplexed cache region factory
-         configurationElements.put(Environment.CACHE_REGION_FACTORY, org.hibernate.cache.jbc.JndiMultiplexedJBossCacheRegionFactory.class.getName());
+         configurationElements.put(Environment.CACHE_REGION_FACTORY, org.hibernate.cache.infinispan.JndiInfinispanRegionFactory.class.getName());
+//         configurationElements.put(Environment.CACHE_REGION_FACTORY, org.hibernate.cache.jbc.JndiMultiplexedJBossCacheRegionFactory.class.getName());
       }
 
       if (configurationElements.get(Environment.FLUSH_BEFORE_COMPLETION) == null)
@@ -510,8 +511,9 @@
       setUnlessNull( settings, Environment.GENERATE_STATISTICS, ourConfig.remove(STAT_GENERATION_ENABLED) );
       setUnlessNull( settings, Environment.DEFAULT_CATALOG, ourConfig.remove(DEFAULT_CATALOG) );
       setUnlessNull( settings, Environment.USE_SECOND_LEVEL_CACHE, ourConfig.remove(SECOND_LEVEL_CACHE_ENABLED) );
-      setUnlessNull( settings, org.hibernate.cache.jbc.builder.JndiMultiplexingCacheInstanceManager.CACHE_FACTORY_RESOURCE_PROP, ourConfig.remove(DEPLOYED_CACHE_MANAGER_JNDI_NAME));
-      setUnlessNull( settings, org.hibernate.cache.jbc.builder.JndiSharedCacheInstanceManager.CACHE_RESOURCE_PROP, ourConfig.remove(DEPLOYED_CACHE_JNDI_NAME));
+//      setUnlessNull( settings, org.hibernate.cache.jbc.builder.JndiMultiplexingCacheInstanceManager.CACHE_FACTORY_RESOURCE_PROP, ourConfig.remove(DEPLOYED_CACHE_MANAGER_JNDI_NAME));
+      setUnlessNull( settings, org.hibernate.cache.infinispan.JndiInfinispanRegionFactory.CACHE_MANAGER_RESOURCE_PROP, ourConfig.remove(DEPLOYED_CACHE_MANAGER_JNDI_NAME));
+//      setUnlessNull( settings, org.hibernate.cache.jbc.builder.JndiSharedCacheInstanceManager.CACHE_RESOURCE_PROP, ourConfig.remove(DEPLOYED_CACHE_JNDI_NAME));
       
       // Set any remaining properties; presumably these are standard
       // Hibernate configuration properties
@@ -668,6 +670,7 @@
       }
    }
 
+   @Override
    public String toString()
    {
       return super.toString() + " [BeanName=" + beanName + ", JNDI=" + sessionFactoryName + "]";
@@ -975,7 +978,8 @@
     */
    public String getDeployedCacheJndiName()
    {
-      return getConfigurationElementAsString(DEPLOYED_CACHE_JNDI_NAME, org.hibernate.cache.jbc.builder.JndiSharedCacheInstanceManager.CACHE_RESOURCE_PROP);
+      return null;
+//      return getConfigurationElementAsString(DEPLOYED_CACHE_JNDI_NAME, org.hibernate.cache.jbc.builder.JndiSharedCacheInstanceManager.CACHE_RESOURCE_PROP);
    }
 
    /**
@@ -983,7 +987,7 @@
     */
    public void setDeployedCacheJndiName(String name)
    {
-      setConfigurationElement( name, DEPLOYED_CACHE_JNDI_NAME, org.hibernate.cache.jbc.builder.JndiSharedCacheInstanceManager.CACHE_RESOURCE_PROP);
+//      setConfigurationElement( name, DEPLOYED_CACHE_JNDI_NAME, org.hibernate.cache.jbc.builder.JndiSharedCacheInstanceManager.CACHE_RESOURCE_PROP);
    }
 
    /**
@@ -991,7 +995,8 @@
     */
    public String getDeployedCacheManagerJndiName()
    {
-      return getConfigurationElementAsString(DEPLOYED_CACHE_MANAGER_JNDI_NAME, org.hibernate.cache.jbc.builder.JndiMultiplexingCacheInstanceManager.CACHE_FACTORY_RESOURCE_PROP);
+      return getConfigurationElementAsString(DEPLOYED_CACHE_MANAGER_JNDI_NAME, org.hibernate.cache.infinispan.JndiInfinispanRegionFactory.CACHE_MANAGER_RESOURCE_PROP);
+//      return getConfigurationElementAsString(DEPLOYED_CACHE_MANAGER_JNDI_NAME, org.hibernate.cache.jbc.builder.JndiMultiplexingCacheInstanceManager.CACHE_FACTORY_RESOURCE_PROP);
    }
 
    /**
@@ -999,7 +1004,8 @@
     */
    public void setDeployedCacheManagerJndiName(String name)
    {
-      setConfigurationElement( name, DEPLOYED_CACHE_MANAGER_JNDI_NAME, org.hibernate.cache.jbc.builder.JndiMultiplexingCacheInstanceManager.CACHE_FACTORY_RESOURCE_PROP);
+      setConfigurationElement( name, DEPLOYED_CACHE_MANAGER_JNDI_NAME, org.hibernate.cache.infinispan.JndiInfinispanRegionFactory.CACHE_MANAGER_RESOURCE_PROP);
+//      setConfigurationElement( name, DEPLOYED_CACHE_MANAGER_JNDI_NAME, org.hibernate.cache.jbc.builder.JndiMultiplexingCacheInstanceManager.CACHE_FACTORY_RESOURCE_PROP);
    }
 
    public Boolean getBatchVersionedDataEnabled()