[jboss-svn-commits] JBL Code SVN: r34131 - in labs/jbossesb/trunk/product: rosetta/src/org/jboss/internal/soa/esb/services/registry and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Jul 23 06:16:12 EDT 2010
Author: kevin.conner at jboss.com
Date: 2010-07-23 06:16:11 -0400 (Fri, 23 Jul 2010)
New Revision: 34131
Modified:
labs/jbossesb/trunk/product/install/conf/jbossesb-properties.xml
labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/CachingRegistryInterceptor.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/common/Configuration.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/common/Environment.java
labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/registry/CachingRegistryInterceptorUnitTest.java
Log:
Enable caching registry interceptor, set default to SI cache life: JBESB-3224
Modified: labs/jbossesb/trunk/product/install/conf/jbossesb-properties.xml
===================================================================
--- labs/jbossesb/trunk/product/install/conf/jbossesb-properties.xml 2010-07-23 10:10:57 UTC (rev 34130)
+++ labs/jbossesb/trunk/product/install/conf/jbossesb-properties.xml 2010-07-23 10:16:11 UTC (rev 34131)
@@ -72,15 +72,14 @@
<property name="org.jboss.soa.esb.scout.proxy.uddiNameSpace" value="urn:uddi-org:api_v3"/>
<!-- specify the interceptors, in order -->
- <property name="org.jboss.soa.esb.registry.interceptors" value="org.jboss.internal.soa.esb.services.registry.InVMRegistryInterceptor"/>
- <!-- Example of specifying multiple registry interceptors
<property name="org.jboss.soa.esb.registry.interceptors"
value="org.jboss.internal.soa.esb.services.registry.InVMRegistryInterceptor, org.jboss.internal.soa.esb.services.registry.CachingRegistryInterceptor"/>
- -->
<!-- The following properties modify the cache interceptor behaviour -->
<property name="org.jboss.soa.esb.registry.cache.maxSize" value="100"/>
+ <!-- If the validityPeriod is not specified then it will default to the same value as org.jboss.soa.esb.registry.cache.life
<property name="org.jboss.soa.esb.registry.cache.validityPeriod" value="600000"/>
+ -->
<!-- Organization Category to be used by this deployment. -->
<property name="org.jboss.soa.esb.registry.orgCategory" value="org.jboss.soa.esb.:category"/>
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/CachingRegistryInterceptor.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/CachingRegistryInterceptor.java 2010-07-23 10:10:57 UTC (rev 34130)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/CachingRegistryInterceptor.java 2010-07-23 10:16:11 UTC (rev 34131)
@@ -33,6 +33,7 @@
import org.jboss.soa.esb.Service;
import org.jboss.soa.esb.addressing.EPR;
import org.jboss.soa.esb.common.Configuration;
+import org.jboss.soa.esb.common.Environment;
import org.jboss.soa.esb.services.registry.AbstractRegistryInterceptor;
import org.jboss.soa.esb.services.registry.RegistryException;
import org.jboss.soa.esb.services.registry.ServiceNotFoundException;
@@ -56,7 +57,7 @@
/**
* The default cache validity period.
*/
- private static final long DEFAULT_VALIDITY_PERIOD = (10*60*1000L) ;
+ private static final long DEFAULT_VALIDITY_PERIOD = Environment.DEFAULT_REGISTRY_CACHE_LIFE_MILLIS_VALUE ;
/**
* The maximum number of services stored in the cache.
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/common/Configuration.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/common/Configuration.java 2010-07-23 10:10:57 UTC (rev 34130)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/common/Configuration.java 2010-07-23 10:16:11 UTC (rev 34131)
@@ -461,7 +461,8 @@
*/
public static String getRegistryCacheValidityPeriod()
{
- return ModulePropertyManager.getPropertyManager(ModulePropertyManager.REGISTRY_MODULE).getProperty(Environment.REGISTRY_CACHE_VALIDITY_PERIOD) ;
+ return ModulePropertyManager.getPropertyManager(ModulePropertyManager.REGISTRY_MODULE).getProperty(Environment.REGISTRY_CACHE_VALIDITY_PERIOD,
+ getRegistryCacheLife()) ;
}
/**
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/common/Environment.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/common/Environment.java 2010-07-23 10:10:57 UTC (rev 34130)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/common/Environment.java 2010-07-23 10:16:11 UTC (rev 34131)
@@ -170,7 +170,8 @@
public static final String DEFAULT_JNDI_PKG_PREFIX = "org.jnp.interfaces";
public static final String DEFAULT_LOAD_BALANCER_POLICY = "org.jboss.soa.esb.listeners.ha.FirstAvailable";
public static final String DEFAULT_REDELIVER_DLS_ON = "true";
- public static final String DEFAULT_REGISTRY_CACHE_LIFE_MILLIS = "60000";
+ public static final long DEFAULT_REGISTRY_CACHE_LIFE_MILLIS_VALUE = 60000;
+ public static final String DEFAULT_REGISTRY_CACHE_LIFE_MILLIS = Long.toString(DEFAULT_REGISTRY_CACHE_LIFE_MILLIS_VALUE);
/*
* DatabaseMessageStore Persistence Store properties.
*/
Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/registry/CachingRegistryInterceptorUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/registry/CachingRegistryInterceptorUnitTest.java 2010-07-23 10:10:57 UTC (rev 34130)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/registry/CachingRegistryInterceptorUnitTest.java 2010-07-23 10:16:11 UTC (rev 34131)
@@ -30,12 +30,17 @@
import junit.framework.TestCase;
import org.jboss.soa.esb.addressing.EPR;
+import org.jboss.soa.esb.common.Configuration;
+import org.jboss.soa.esb.common.Environment;
+import org.jboss.soa.esb.common.ModulePropertyManager;
import org.jboss.soa.esb.services.registry.Registry;
import org.jboss.soa.esb.services.registry.RegistryException;
import org.jboss.soa.esb.services.registry.RegistryInterceptor;
import org.jboss.soa.esb.services.registry.ServiceNotFoundException;
+import com.arjuna.common.util.propertyservice.PropertyManager;
+
/**
* Unit tests for the caching registry interceptor
*
@@ -194,6 +199,60 @@
assertEquals("Registry findEPRs invocation", numServices, concurrency.getFindEPRsCount()) ;
assertFalse("Barrier timeout", concurrency.isTimeout()) ;
}
+
+ /**
+ * Test default configuration values.
+ * @throws Exception
+ */
+ public void testConfig()
+ throws Exception
+ {
+ final PropertyManager corePM = ModulePropertyManager.getPropertyManager(ModulePropertyManager.CORE_MODULE) ;
+ final String origCacheLifeMillis = corePM.getProperty(Environment.REGISTRY_CACHE_LIFE_MILLIS) ;
+
+ final PropertyManager registryPM = ModulePropertyManager.getPropertyManager(ModulePropertyManager.REGISTRY_MODULE) ;
+ final String origCacheValidityPeriod = registryPM.getProperty(Environment.REGISTRY_CACHE_VALIDITY_PERIOD) ;
+
+ try
+ {
+ setProperties(corePM, null, registryPM, null) ;
+ String validityPeriod = Configuration.getRegistryCacheValidityPeriod() ;
+ assertEquals("default", Environment.DEFAULT_REGISTRY_CACHE_LIFE_MILLIS, validityPeriod) ;
+
+ final String cacheLifeMillis = "600000" ;
+ setProperties(corePM, cacheLifeMillis, registryPM, null) ;
+ validityPeriod = Configuration.getRegistryCacheValidityPeriod() ;
+ assertEquals("cacheLifeMillis", cacheLifeMillis, validityPeriod) ;
+
+ final String cacheValidityPeriod = "900000" ;
+ setProperties(corePM, cacheLifeMillis, registryPM, cacheValidityPeriod) ;
+ validityPeriod = Configuration.getRegistryCacheValidityPeriod() ;
+ assertEquals("cacheValidityPeriod", cacheValidityPeriod, validityPeriod) ;
+ }
+ finally
+ {
+ setProperties(corePM, origCacheLifeMillis, registryPM, origCacheValidityPeriod) ;
+ }
+ }
+
+ private void setProperties(final PropertyManager corePM, final String cacheLifeMillis,
+ final PropertyManager registryPM, final String cacheValidityPeriod)
+ {
+ setProperty(corePM, Environment.REGISTRY_CACHE_LIFE_MILLIS, cacheLifeMillis) ;
+ setProperty(registryPM, Environment.REGISTRY_CACHE_VALIDITY_PERIOD, cacheValidityPeriod) ;
+ }
+
+ private void setProperty(final PropertyManager pm, final String name, final String value)
+ {
+ if (value == null)
+ {
+ pm.removeProperty(name) ;
+ }
+ else
+ {
+ pm.setProperty(name, value) ;
+ }
+ }
private static final class CacheRegistryStatsInterceptor implements RegistryInterceptor
{
More information about the jboss-svn-commits
mailing list