[jboss-cvs] JBossAS SVN: r95625 - branches/Branch_5_x/hibernate-int/src/main/org/jboss/hibernate/jmx.

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

Author: smarlow at redhat.com
Date: 2009-10-27 14:53:21 -0400 (Tue, 27 Oct 2009)
New Revision: 95625

Modified:
   branches/Branch_5_x/hibernate-int/src/main/org/jboss/hibernate/jmx/Hibernate.java
   branches/Branch_5_x/hibernate-int/src/main/org/jboss/hibernate/jmx/HibernateMBean.java
Log:
JBAS-7241 Update to Entity Manager 3.5 and JPA 2.  Switch to Hibernate 3.5.0.Beta-1

Modified: branches/Branch_5_x/hibernate-int/src/main/org/jboss/hibernate/jmx/Hibernate.java
===================================================================
--- branches/Branch_5_x/hibernate-int/src/main/org/jboss/hibernate/jmx/Hibernate.java	2009-10-27 18:06:19 UTC (rev 95624)
+++ branches/Branch_5_x/hibernate-int/src/main/org/jboss/hibernate/jmx/Hibernate.java	2009-10-27 18:53:21 UTC (rev 95625)
@@ -37,6 +37,7 @@
 import org.hibernate.jmx.StatisticsServiceMBean;
 import org.hibernate.transaction.JBossTransactionManagerLookup;
 import org.hibernate.transaction.JTATransactionFactory;
+import org.hibernate.Version;
 import org.jboss.aop.microcontainer.aspects.jmx.JMX;
 import org.jboss.beans.metadata.api.annotations.Inject;
 import org.jboss.beans.metadata.api.model.FromContext;
@@ -341,23 +342,23 @@
 
       if (this.deployedCacheJndiName != null)
       {
-         settings.setProperty(org.hibernate.cache.jbc2.builder.JndiSharedCacheInstanceManager.CACHE_RESOURCE_PROP, this.deployedCacheJndiName);
+         settings.setProperty(org.hibernate.cache.jbc.builder.JndiSharedCacheInstanceManager.CACHE_RESOURCE_PROP, this.deployedCacheJndiName);
          
          // Implies shared cache region factory
          if (!settings.containsKey(Environment.CACHE_REGION_FACTORY))
          {
-            settings.setProperty(Environment.CACHE_REGION_FACTORY, org.hibernate.cache.jbc2.JndiSharedJBossCacheRegionFactory.class.getName());
+            settings.setProperty(Environment.CACHE_REGION_FACTORY, org.hibernate.cache.jbc.JndiSharedJBossCacheRegionFactory.class.getName());
          }
       }
       
       if (this.deployedCacheManagerJndiName != null)
       {
-         settings.setProperty(org.hibernate.cache.jbc2.builder.JndiMultiplexingCacheInstanceManager.CACHE_FACTORY_RESOURCE_PROP, this.deployedCacheManagerJndiName);
+         settings.setProperty(org.hibernate.cache.jbc.builder.JndiMultiplexingCacheInstanceManager.CACHE_FACTORY_RESOURCE_PROP, this.deployedCacheManagerJndiName);
          
          // Implies multliplexed cache region factory
          if (!settings.containsKey(Environment.CACHE_REGION_FACTORY))
          {
-            settings.setProperty(Environment.CACHE_REGION_FACTORY, org.hibernate.cache.jbc2.JndiMultiplexedJBossCacheRegionFactory.class.getName());
+            settings.setProperty(Environment.CACHE_REGION_FACTORY, org.hibernate.cache.jbc.JndiMultiplexedJBossCacheRegionFactory.class.getName());
          }
       }
 
@@ -544,7 +545,7 @@
 
    public String getVersion()
    {
-      return Environment.VERSION;
+      return Version.getVersionString();
    }
 
    public SessionFactory getInstance()

Modified: branches/Branch_5_x/hibernate-int/src/main/org/jboss/hibernate/jmx/HibernateMBean.java
===================================================================
--- branches/Branch_5_x/hibernate-int/src/main/org/jboss/hibernate/jmx/HibernateMBean.java	2009-10-27 18:06:19 UTC (rev 95624)
+++ branches/Branch_5_x/hibernate-int/src/main/org/jboss/hibernate/jmx/HibernateMBean.java	2009-10-27 18:53:21 UTC (rev 95625)
@@ -90,7 +90,7 @@
 	/**
 	 * The JNDI name of a {@link org.jboss.cache.Cache} to be used for all regions of the second-level cache.
 	 * <br/>
-	 * N.B. implies {@link #getCacheRegionFactoryClass()} == {@link org.hibernate.cache.jbc2.JndiSharedCacheRegionFactory}
+	 * N.B. implies {@link #getCacheRegionFactoryClass()} == {@link org.hibernate.cache.jbc.JndiSharedCacheRegionFactory}
 	 *
 	 * @return The current setting
 	 */
@@ -106,7 +106,7 @@
     /**
      * The JNDI name of a {@link org.jboss.cache.CacheManager} to be used for acquiring cache regions for the second-level cache.
      * <br/>
-     * N.B. implies {@link #getCacheRegionFactoryClass()} == {@link org.hibernate.cache.jbc2.JndiMultiplexedCacheRegionFactory}
+     * N.B. implies {@link #getCacheRegionFactoryClass()} == {@link org.hibernate.cache.jbc.JndiMultiplexedCacheRegionFactory}
      *
      * @return The current setting
      */