Author: etnu
Date: Sun Nov 9 03:36:58 2008
New Revision: 712485
URL: http://svn.apache.org/viewvc?rev=712485&view=rev
Log:
Made JMX integration with ehcache optional
Modified:
incubator/shindig/trunk/java/common/conf/shindig.properties
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/cache/ehcache/EhCacheCacheProvider.java
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/cache/ehcache/EhCacheCacheProviderTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/EhCacheBackedDefaultHttpCacheTest.java
Modified: incubator/shindig/trunk/java/common/conf/shindig.properties
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/conf/shindig.properties?rev=712485&r1=712484&r2=712485&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/conf/shindig.properties (original)
+++ incubator/shindig/trunk/java/common/conf/shindig.properties Sun Nov 9
03:36:58 2008
@@ -42,5 +42,8 @@
# The location of the EhCache configuration file.
shindig.cache.ehcache.config=res://org/apache/shindig/common/cache/ehcache/ehcacheConfig.xml
+# True to enable JMX integration with cache stats
+shindig.cache.ehcache.jmx.enabled=true
+
# true to enable JMX stats.
shindig.cache.ehcache.jmx.stats=true
Modified:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/cache/ehcache/EhCacheCacheProvider.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/cache/ehcache/EhCacheCacheProvider.java?rev=712485&r1=712484&r2=712485&view=diff
==============================================================================
---
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/cache/ehcache/EhCacheCacheProvider.java
(original)
+++
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/cache/ehcache/EhCacheCacheProvider.java
Sun Nov 9 03:36:58 2008
@@ -44,14 +44,15 @@
@Inject
public EhCacheCacheProvider(@Named("shindig.cache.ehcache.config") String
configPath,
+ @Named("shindig.cache.ehcache.jmx.enabled")
boolean jmxEnabled,
@Named("shindig.cache.ehcache.jmx.stats")
boolean withCacheStats)
throws IOException {
InputStream configStream = ResourceLoader.open(configPath);
cacheManager = new CacheManager(configStream);
- create(withCacheStats);
+ create(jmxEnabled, withCacheStats);
}
- public void create(boolean withCacheStats) {
+ public void create(boolean jmxEnabled, boolean withCacheStats) {
/*
* Add in a shutdown hook
*/
@@ -68,8 +69,10 @@
});
// register the cache manager with JMX
- MBeanServer mBeanServer = ManagementFactory.getPlatformMBeanServer();
- ManagementService.registerMBeans(cacheManager, mBeanServer, true, true,
true, withCacheStats);
+ if (jmxEnabled) {
+ MBeanServer mBeanServer = ManagementFactory.getPlatformMBeanServer();
+ ManagementService.registerMBeans(cacheManager, mBeanServer, true, true,
true, withCacheStats);
+ }
}
/**
Modified:
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/cache/ehcache/EhCacheCacheProviderTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/cache/ehcache/EhCacheCacheProviderTest.java?rev=712485&r1=712484&r2=712485&view=diff
==============================================================================
---
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/cache/ehcache/EhCacheCacheProviderTest.java
(original)
+++
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/cache/ehcache/EhCacheCacheProviderTest.java
Sun Nov 9 03:36:58 2008
@@ -32,7 +32,7 @@
@Test
public void getAnonCache() throws Exception {
CacheProvider defaultProvider = new EhCacheCacheProvider(
- "res://org/apache/shindig/common/cache/ehcache/ehcacheConfig.xml",
true);
+ "res://org/apache/shindig/common/cache/ehcache/ehcacheConfig.xml",
true, true);
Cache<String, String> cache = defaultProvider.createCache(null);
Assert.assertNotNull(cache);
Assert.assertNull(cache.getElement("test"));
@@ -46,7 +46,7 @@
@Test
public void getNamedCache() throws Exception {
CacheProvider defaultProvider = new EhCacheCacheProvider(
- "res://org/apache/shindig/common/cache/ehcache/ehcacheConfig.xml",
true);
+ "res://org/apache/shindig/common/cache/ehcache/ehcacheConfig.xml",
true, true);
Cache<String, String> cache = defaultProvider.createCache("testcache");
Cache<String, String> cache2 = defaultProvider.createCache("testcache");
Assert.assertNotNull(cache);
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/EhCacheBackedDefaultHttpCacheTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/EhCacheBackedDefaultHttpCacheTest.java?rev=712485&r1=712484&r2=712485&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/EhCacheBackedDefaultHttpCacheTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/EhCacheBackedDefaultHttpCacheTest.java
Sun Nov 9 03:36:58 2008
@@ -28,6 +28,6 @@
@Override
protected CacheProvider getCacheProvider() throws Exception {
return new EhCacheCacheProvider(
- "res://org/apache/shindig/common/cache/ehcache/ehcacheConfig.xml",
true);
+ "res://org/apache/shindig/common/cache/ehcache/ehcacheConfig.xml",
true, true);
}
}