[hibernate-commits] Hibernate SVN: r10859 - in branches/Branch_3_2/Hibernate3/src/org/hibernate: jmx util

[hibernate-commits at lists.jboss.org]

Author: steve.ebersole at jboss.com
Date: 2006-11-21 19:02:40 -0500 (Tue, 21 Nov 2006)
New Revision: 10859

Modified:
   branches/Branch_3_2/Hibernate3/src/org/hibernate/jmx/HibernateServiceMBean.java
   branches/Branch_3_2/Hibernate3/src/org/hibernate/util/ExternalSessionFactoryConfig.java
Log:
HHH-2246 : mbean + cache-provider-config setting

Modified: branches/Branch_3_2/Hibernate3/src/org/hibernate/jmx/HibernateServiceMBean.java
===================================================================
--- branches/Branch_3_2/Hibernate3/src/org/hibernate/jmx/HibernateServiceMBean.java	2006-11-21 23:28:29 UTC (rev 10858)
+++ branches/Branch_3_2/Hibernate3/src/org/hibernate/jmx/HibernateServiceMBean.java	2006-11-22 00:02:40 UTC (rev 10859)
@@ -224,6 +224,16 @@
 	 */
 	public void setCacheProviderClass(String providerClassName);
 	/**
+	 * For cache providers which support this setting, get the
+	 * provider's specific configuration resource.
+	 */
+	public String getCacheProviderConfig();
+	/**
+	 * For cache providers which support this setting, specify the
+	 * provider's specific configuration resource.
+	 */
+	public void setCacheProviderConfig(String cacheProviderConfig);
+	/**
 	 * Is the query cache enabled?
 	 */
 	public String getQueryCacheEnabled();

Modified: branches/Branch_3_2/Hibernate3/src/org/hibernate/util/ExternalSessionFactoryConfig.java
===================================================================
--- branches/Branch_3_2/Hibernate3/src/org/hibernate/util/ExternalSessionFactoryConfig.java	2006-11-21 23:28:29 UTC (rev 10858)
+++ branches/Branch_3_2/Hibernate3/src/org/hibernate/util/ExternalSessionFactoryConfig.java	2006-11-22 00:02:40 UTC (rev 10859)
@@ -35,9 +35,10 @@
 	private String querySubstitutions;
 	private String showSqlEnabled;
 	private String commentsEnabled;
-	private String secondLevelCacheEnabled;
 	private String cacheProviderClass;
+	private String cacheProviderConfig;
 	private String cacheRegionPrefix;
+	private String secondLevelCacheEnabled;
 	private String minimalPutsEnabled;
 	private String queryCacheEnabled;
 
@@ -198,6 +199,14 @@
 		this.cacheProviderClass = cacheProviderClass;
 	}
 
+	public String getCacheProviderConfig() {
+		return cacheProviderConfig;
+	}
+
+	public void setCacheProviderConfig(String cacheProviderConfig) {
+		this.cacheProviderConfig = cacheProviderConfig;
+	}
+
 	public final String getCacheRegionPrefix() {
 		return cacheRegionPrefix;
 	}
@@ -310,10 +319,11 @@
 		setUnlessNull( props, Environment.QUERY_SUBSTITUTIONS, querySubstitutions );
 		setUnlessNull( props, Environment.SHOW_SQL, showSqlEnabled );
 		setUnlessNull( props, Environment.USE_SQL_COMMENTS, commentsEnabled );
-		setUnlessNull( props, Environment.USE_SECOND_LEVEL_CACHE, secondLevelCacheEnabled );
 		setUnlessNull( props, Environment.CACHE_PROVIDER, cacheProviderClass );
+		setUnlessNull( props, Environment.CACHE_PROVIDER_CONFIG, cacheProviderConfig );
 		setUnlessNull( props, Environment.CACHE_REGION_PREFIX, cacheRegionPrefix );
 		setUnlessNull( props, Environment.USE_MINIMAL_PUTS, minimalPutsEnabled );
+		setUnlessNull( props, Environment.USE_SECOND_LEVEL_CACHE, secondLevelCacheEnabled );
 		setUnlessNull( props, Environment.USE_QUERY_CACHE, queryCacheEnabled );
 
 		Map extraProperties = getExtraProperties();