[jboss-svn-commits] JBL Code SVN: r18740 - in labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product: rosetta/src/org/jboss/soa/esb/actions and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Mar 6 14:47:40 EST 2008
Author: mark.little at jboss.com
Date: 2008-03-06 14:47:40 -0500 (Thu, 06 Mar 2008)
New Revision: 18740
Modified:
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/docs/MessageActionGuide.odt
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/docs/ReleaseNotes.odt
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/actions/Aggregator.java
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/common/Configuration.java
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/common/Environment.java
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actionhandlers/ExceptionFlowTest.java
Log:
http://jira.jboss.com/jira/browse/JBESB-1552
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/docs/MessageActionGuide.odt
===================================================================
(Binary files differ)
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/docs/ReleaseNotes.odt
===================================================================
(Binary files differ)
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/actions/Aggregator.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/actions/Aggregator.java 2008-03-06 18:10:52 UTC (rev 18739)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/actions/Aggregator.java 2008-03-06 19:47:40 UTC (rev 18740)
@@ -75,7 +75,7 @@
protected ConfigTree config;
private Logger logger = Logger.getLogger(Aggregator.class);
- private Long timeoutInMillies=null;
+ private Long timeoutInMillis=null;
private Set<String> receivedSplits = new HashSet<String>();
private String splitId;
@@ -86,21 +86,30 @@
this.config = config;
String timeoutAttr = config.getAttribute("timeoutInMillies", null);
+ /*
+ * http://jira.jboss.com/jira/browse/JBESB-1552
+ */
+
if (timeoutAttr != null)
+ logger.warn("Aggregator config: timeoutInMillies is deprecated. Use timeoutInMillis in future.");
+ else
+ timeoutAttr = config.getAttribute("timeoutInMillis", null);
+
+ if (timeoutAttr != null)
{
try
{
- timeoutInMillies = Long.valueOf(timeoutAttr);
+ timeoutInMillis = Long.valueOf(timeoutAttr);
}
catch (NumberFormatException ex)
{
- logger.error("Invalid value for timeoutInMillies: "+timeoutAttr);
+ logger.error("Invalid value for timeoutInMillis: "+timeoutAttr);
throw new ConfigurationException(ex);
}
}
- logger.debug("Aggregator config: timeoutInMillies=" + timeoutInMillies);
+ logger.debug("Aggregator config: timeoutInMillis=" + timeoutInMillis);
splitId = config.getAttribute("splitId");
}
@@ -349,9 +358,9 @@
*/
private boolean isTimedOut(long splitterTimeStamp)
{
- if (timeoutInMillies!=null) {
+ if (timeoutInMillis!=null) {
long now = new Date().getTime();
- long expiration = splitterTimeStamp + timeoutInMillies;
+ long expiration = splitterTimeStamp + timeoutInMillis;
if (logger.isDebugEnabled()) {
DateFormat dateFormat = DateFormat.getTimeInstance();
logger.debug("Current time=" + dateFormat.format(new Date(now))
@@ -390,7 +399,7 @@
boolean running = true ;
while(running) {
//no need to check if no timeout is set
- if (timeoutInMillies!=null) {
+ if (timeoutInMillis!=null) {
// is a snapshot so no lock needed
for (Map<Integer, Message > messageMap : aggregatedMessageMap.values()) {
//Check the first message, they all have the same time stamp
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/common/Configuration.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/common/Configuration.java 2008-03-06 18:10:52 UTC (rev 18739)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/common/Configuration.java 2008-03-06 19:47:40 UTC (rev 18740)
@@ -62,7 +62,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.REGISTRY_CACHE_LIFE_MILLIS, 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()),
@@ -151,8 +151,8 @@
public static String getRegistryCacheLife()
{
- return ModulePropertyManager.getPropertyManager(ModulePropertyManager.CORE_MODULE).getProperty(Environment.REGISTRY_CACHE_LIFE_MILLIES,
- Environment.DEFAULT_REGISTRY_CACHE_LIFE_MILLIES);
+ return ModulePropertyManager.getPropertyManager(ModulePropertyManager.CORE_MODULE).getProperty(Environment.REGISTRY_CACHE_LIFE_MILLIS,
+ Environment.DEFAULT_REGISTRY_CACHE_LIFE_MILLIS);
}
/**
* The Registry Query Manager URI can be used to obtain information about services and their endPoints.
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/common/Environment.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/common/Environment.java 2008-03-06 18:10:52 UTC (rev 18739)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/common/Environment.java 2008-03-06 19:47:40 UTC (rev 18740)
@@ -60,7 +60,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";
+ public static final String REGISTRY_CACHE_LIFE_MILLIS = "org.jboss.soa.esb.registry.cache.life";
public static final String REMOVE_DEAD_EPR = "org.jboss.soa.esb.failure.detect.removeDeadEPR";
public static final String EXCEPTION_ON_DELIVERY_FAILURE = "org.jboss.soa.esb.exceptionOnDeliverFailure";
@@ -125,7 +125,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";
+ public static final String DEFAULT_REGISTRY_CACHE_LIFE_MILLIS = "60000";
/*
* DatabaseMessageStore Persistence Store properties.
*/
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actionhandlers/ExceptionFlowTest.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actionhandlers/ExceptionFlowTest.java 2008-03-06 18:10:52 UTC (rev 18739)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actionhandlers/ExceptionFlowTest.java 2008-03-06 19:47:40 UTC (rev 18740)
@@ -106,7 +106,7 @@
//Move the process to service1
processInstance.signal();
jbpmContext.close();
- //Our timer fires after 1000 millies, so let's wait for that
+ //Our timer fires after 1000 millis, so let's wait for that
int seconds=0;
while(true) {
jbpmContext = jbpmConfiguration.createJbpmContext();
More information about the jboss-svn-commits
mailing list