You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by lh...@apache.org on 2011/01/13 10:15:04 UTC
svn commit: r1058467 - in /servicemix/smx4: features/trunk/pom.xml
nmr/trunk/nmr/osgi/src/main/java/org/apache/servicemix/nmr/osgi/ExecutorConfigurator.java
nmr/trunk/pom.xml
Author: lhein
Date: Thu Jan 13 09:15:04 2011
New Revision: 1058467
URL: http://svn.apache.org/viewvc?rev=1058467&view=rev
Log:
- using now servicemix-utils 1.4.0-SNAPSHOT
- using now nmr 1.4.0-SNAPSHOT
- reworked executor configurator (see SMX4NMR-246)
Modified:
servicemix/smx4/features/trunk/pom.xml
servicemix/smx4/nmr/trunk/nmr/osgi/src/main/java/org/apache/servicemix/nmr/osgi/ExecutorConfigurator.java
servicemix/smx4/nmr/trunk/pom.xml
Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=1058467&r1=1058466&r2=1058467&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Thu Jan 13 09:15:04 2011
@@ -242,9 +242,9 @@
<!-- ServiceMix Components and Resources -->
<smx3.version>3.3.1</smx3.version>
- <servicemix-utils.version>1.3.0</servicemix-utils.version>
+ <servicemix-utils.version>1.4.0-SNAPSHOT</servicemix-utils.version>
<servicemix.legal.version>1.0</servicemix.legal.version>
- <servicemix.nmr.version>1.3.0</servicemix.nmr.version>
+ <servicemix.nmr.version>1.4.0-SNAPSHOT</servicemix.nmr.version>
<servicemix.specs.version>1.6.0</servicemix.specs.version>
<servicemix-bean.version>2010.02</servicemix-bean.version>
Modified: servicemix/smx4/nmr/trunk/nmr/osgi/src/main/java/org/apache/servicemix/nmr/osgi/ExecutorConfigurator.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/osgi/src/main/java/org/apache/servicemix/nmr/osgi/ExecutorConfigurator.java?rev=1058467&r1=1058466&r2=1058467&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/osgi/src/main/java/org/apache/servicemix/nmr/osgi/ExecutorConfigurator.java (original)
+++ servicemix/smx4/nmr/trunk/nmr/osgi/src/main/java/org/apache/servicemix/nmr/osgi/ExecutorConfigurator.java Thu Jan 13 09:15:04 2011
@@ -16,16 +16,16 @@
*/
package org.apache.servicemix.nmr.osgi;
-import java.util.Dictionary;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
-
import org.apache.servicemix.executors.impl.ExecutorConfig;
import org.apache.servicemix.executors.impl.ExecutorFactoryImpl;
import org.osgi.service.cm.ConfigurationException;
import org.osgi.service.cm.ManagedService;
+import java.util.Dictionary;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* A managed service that will update the configurations based on the ConfigAdmin configuration
*/
@@ -42,7 +42,9 @@ public class ExecutorConfigurator implem
}
public void updated(Dictionary properties) throws ConfigurationException {
- ExecutorConfig defaultConfig = new ExecutorConfig();
+ if (executorFactory.getDefaultConfig() == null) {
+ executorFactory.setDefaultConfig(new ExecutorConfig(true, null));
+ }
Map<String, ExecutorConfig> configs = new HashMap<String, ExecutorConfig>();
if (properties != null) {
for (Enumeration e = properties.keys(); e.hasMoreElements();) {
@@ -66,27 +68,26 @@ public class ExecutorConfigurator implem
} else if (key.endsWith(".bypassIfSynchronous")) {
getConfig(configs, key).setBypassIfSynchronous(getBool(properties, key));
} else if (key.equals("corePoolSize")) {
- defaultConfig.setCorePoolSize(getInt(properties, key));
+ executorFactory.getDefaultConfig().setCorePoolSize(getInt(properties, key));
} else if (key.equals("maximumPoolSize")) {
- defaultConfig.setMaximumPoolSize(getInt(properties, key));
+ executorFactory.getDefaultConfig().setMaximumPoolSize(getInt(properties, key));
} else if (key.equals("keepAliveTime")) {
- defaultConfig.setKeepAliveTime(getLong(properties, key));
+ executorFactory.getDefaultConfig().setKeepAliveTime(getLong(properties, key));
} else if (key.equals("threadDaemon")) {
- defaultConfig.setThreadDaemon(getBool(properties, key));
+ executorFactory.getDefaultConfig().setThreadDaemon(getBool(properties, key));
} else if (key.equals("threadPriority")) {
- defaultConfig.setThreadPriority(getInt(properties, key));
+ executorFactory.getDefaultConfig().setThreadPriority(getInt(properties, key));
} else if (key.equals("queueSize")) {
- defaultConfig.setQueueSize(getInt(properties, key));
+ executorFactory.getDefaultConfig().setQueueSize(getInt(properties, key));
} else if (key.equals("shutdownDelay")) {
- defaultConfig.setShutdownDelay(getLong(properties, key));
+ executorFactory.getDefaultConfig().setShutdownDelay(getLong(properties, key));
} else if (key.equals("allowCoreThreadsTimeout")) {
- defaultConfig.setAllowCoreThreadsTimeout(getBool(properties, key));
+ executorFactory.getDefaultConfig().setAllowCoreThreadsTimeout(getBool(properties, key));
} else if (key.equals("bypassIfSynchronous")) {
- defaultConfig.setBypassIfSynchronous(getBool(properties, key));
+ executorFactory.getDefaultConfig().setBypassIfSynchronous(getBool(properties, key));
}
}
}
- executorFactory.setDefaultConfig(defaultConfig);
executorFactory.setConfigs(configs);
}
@@ -94,7 +95,7 @@ public class ExecutorConfigurator implem
String name = key.substring(0, key.lastIndexOf('.'));
ExecutorConfig config = configs.get(name);
if (config == null) {
- config = new ExecutorConfig();
+ config = new ExecutorConfig(false, executorFactory.getDefaultConfig());
configs.put(name, config);
}
return config;
Modified: servicemix/smx4/nmr/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/pom.xml?rev=1058467&r1=1058466&r2=1058467&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/pom.xml Thu Jan 13 09:15:04 2011
@@ -103,7 +103,7 @@
<servicemix-shared.version>2010.02</servicemix-shared.version>
<servicemix.legal.version>1.0</servicemix.legal.version>
<servicemix.specs.version>1.6.0</servicemix.specs.version>
- <servicemix-utils.version>1.3.0</servicemix-utils.version>
+ <servicemix-utils.version>1.4.0-SNAPSHOT</servicemix-utils.version>
<!-- PAX -->
<pax.exam.version>1.2.3</pax.exam.version>