[jboss-svn-commits] JBL Code SVN: r14266 - in labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb: common and 1 other directory.

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

Author: kurt.stam at jboss.com
Date: 2007-08-15 15:17:25 -0400 (Wed, 15 Aug 2007)
New Revision: 14266

Modified:
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/client/ServiceInvoker.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
Log:
JBESB-467, Adding EPR caching.

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/client/ServiceInvoker.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/client/ServiceInvoker.java	2007-08-15 18:38:37 UTC (rev 14265)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/client/ServiceInvoker.java	2007-08-15 19:17:25 UTC (rev 14266)
@@ -88,10 +88,14 @@
      */
     private ThreadLocal<Long> syncPickupDeliveryTimeout = new ThreadLocal<Long>();
     /**
-     *
+     * 
      */
     private Date expirationDate;
     /**
+     * 
+     */
+    private long registryCacheLife;
+    /**
      * Dead letter channel Service invoker.
      */
     private static ServiceInvoker dlQueueInvoker;
@@ -110,6 +114,7 @@
         AssertArgument.isNotNull(service, "service");
         this.service = service;
         String lbClass = Configuration.getLoadBalancerPolicy();
+        registryCacheLife = Long.valueOf(Configuration.getRegistryCacheLife());
         try {
             Class c = ClassUtil.forName(lbClass, this.getClass());
             loadBalancer = (LoadBalancePolicy) c.newInstance();
@@ -433,7 +438,7 @@
             throw new MessageDeliverException(e.getMessage(), e);
         }
         serviceClusterInfo = new ServiceClusterInfoImpl(service.getName(), serviceEprs);
-        expirationDate = new Date(java.lang.System.currentTimeMillis() + 60000);
+        expirationDate = new Date(java.lang.System.currentTimeMillis() + registryCacheLife);
     }
 
 }

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	2007-08-15 18:38:37 UTC (rev 14265)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/common/Configuration.java	2007-08-15 19:17:25 UTC (rev 14266)
@@ -60,6 +60,7 @@
 			new KeyValuePair(Environment.ENCRYPT_FACTORY_CLASS, 		getEncryptionFactoryClass()),
             new KeyValuePair(Environment.LOAD_BALANCER_POLICY,          getLoadBalancerPolicy()),
             new KeyValuePair(Environment.REDELIVER_DLS_SERVICE_ON,      getRedeliveryDlsOn()),
+            new KeyValuePair(Environment.REGISTRY_CACHE_LIFE_MILLIES,   getRegistryCacheLife()),
 			new KeyValuePair(Environment.MSG_STORE_DB_CONNECTION_URL, 	getStoreUrl()),
 			new KeyValuePair(Environment.MSG_STORE_DB_JDBC_DRIVER, 		getStoreDriver()),
 			new KeyValuePair(Environment.MSG_STORE_DB_CONNECTION_USER, 	getStoreUser()),
@@ -145,6 +146,12 @@
         return ModulePropertyManager.getPropertyManager(ModulePropertyManager.CORE_MODULE).getProperty(Environment.REDELIVER_DLS_SERVICE_ON,
                     Environment.DEFAULT_REDELIVER_DLS_ON);
     }
+    
+    public static String getRegistryCacheLife()
+    {
+        return ModulePropertyManager.getPropertyManager(ModulePropertyManager.CORE_MODULE).getProperty(Environment.REGISTRY_CACHE_LIFE_MILLIES,
+                    Environment.DEFAULT_REGISTRY_CACHE_LIFE_MILLIES);
+    }
 	/**
 	 * The Registry Query Manager URI can be used to obtain information about services and their endPoints.
 	 * @return Registry Query Manager URI String

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	2007-08-15 18:38:37 UTC (rev 14265)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/common/Environment.java	2007-08-15 19:17:25 UTC (rev 14266)
@@ -59,6 +59,7 @@
 	public static final String ENCRYPT_FACTORY_CLASS          = "org.jboss.soa.esb.encryption.factory.class";
     public static final String LOAD_BALANCER_POLICY           = "org.jboss.soa.esb.loadbalancer.policy";
     public static final String REDELIVER_DLS_SERVICE_ON       = "org.jboss.soa.esb.dls.redeliver";
+    public static final String REGISTRY_CACHE_LIFE_MILLIES    = "org.jboss.soa.esb.registry.cache.life";
 	/** 
 	 * The Registry Query Manager URI defines the endPoint where registry queries can be made. 
 	 */
@@ -105,6 +106,7 @@
 	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_MILLIES    = "60000";
 	/*
 	 * DatabaseMessageStore Persistence Store properties.
 	 */