Author: ffang
Date: Wed Mar 30 07:38:57 2011
New Revision: 1086864
URL: http://svn.apache.org/viewvc?rev=1086864&view=rev
Log:
[SMX4NMR-264]Make allowsCoreThreadTimeOut name consistent across mbeans and
properties
Modified:
servicemix/smx4/nmr/trunk/assembly/src/main/distribution/etc/org.apache.servicemix.jbi.cfg
servicemix/smx4/nmr/trunk/assembly/src/main/distribution/etc/org.apache.servicemix.nmr.cfg
servicemix/smx4/nmr/trunk/nmr/osgi/src/main/java/org/apache/servicemix/nmr/osgi/ExecutorConfigurator.java
servicemix/smx4/nmr/trunk/nmr/osgi/src/main/resources/OSGI-INF/blueprint/servicemix-nmr.xml
Modified:
servicemix/smx4/nmr/trunk/assembly/src/main/distribution/etc/org.apache.servicemix.jbi.cfg
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/src/main/distribution/etc/org.apache.servicemix.jbi.cfg?rev=1086864&r1=1086863&r2=1086864&view=diff
==============================================================================
---
servicemix/smx4/nmr/trunk/assembly/src/main/distribution/etc/org.apache.servicemix.jbi.cfg
(original)
+++
servicemix/smx4/nmr/trunk/assembly/src/main/distribution/etc/org.apache.servicemix.jbi.cfg
Wed Mar 30 07:38:57 2011
@@ -25,10 +25,10 @@ shutdownTimeout=0
# - corePoolSize defines the core thread pool size (default is 4)
# - maximumPoolSize defines the maximum thread pool size, -1 means an
unbounded thread pool size (default is -1)
# - queueSize defines the executor queue size (default is 1024)
-# - allowCoreThreadTimeout allows the core threads to timeout (defaults to
true)
+# - allowCoreThreadTimeOut allows the core threads to timeout (defaults to
true)
# - keepAliveTime is the amount of milliseconds a thread is kept alive when
idle (defaults to 60000)
corePoolSize=4
maximumPoolSize=-1
queueSize=1024
-allowCoreThreadTimeout=true
+allowCoreThreadTimeOut=true
keepAliveTime=60000
Modified:
servicemix/smx4/nmr/trunk/assembly/src/main/distribution/etc/org.apache.servicemix.nmr.cfg
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/src/main/distribution/etc/org.apache.servicemix.nmr.cfg?rev=1086864&r1=1086863&r2=1086864&view=diff
==============================================================================
---
servicemix/smx4/nmr/trunk/assembly/src/main/distribution/etc/org.apache.servicemix.nmr.cfg
(original)
+++
servicemix/smx4/nmr/trunk/assembly/src/main/distribution/etc/org.apache.servicemix.nmr.cfg
Wed Mar 30 07:38:57 2011
@@ -21,7 +21,7 @@
# - corePoolSize defines the core thread pool size (default is 4)
# - maximumPoolSize defines the maximum thread pool size, -1 means an
unbounded thread pool size (default is -1)
# - queueSize defines the executor queue size (default is 1024)
-# - allowCoreThreadTimeout allows the core threads to timeout (defaults to
true)
+# - allowCoreThreadTimeOut allows the core threads to timeout (defaults to
true)
# - keepAliveTime is the amount of milliseconds a thread is kept alive when
idle (defaults to 60000)
#
# Endpoints are provided a ThreadPool with specific configuration. If no
configuration
@@ -33,5 +33,5 @@
corePoolSize=4
maximumPoolSize=-1
queueSize=1024
-allowCoreThreadTimeout=true
+allowCoreThreadTimeOut=true
keepAliveTime=60000
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=1086864&r1=1086863&r2=1086864&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
Wed Mar 30 07:38:57 2011
@@ -63,8 +63,8 @@ public class ExecutorConfigurator implem
getConfig(configs, key).setQueueSize(getInt(properties,
key));
} else if (key.endsWith(".shutdownDelay")) {
getConfig(configs,
key).setShutdownDelay(getLong(properties, key));
- } else if (key.endsWith(".allowCoreThreadsTimeout")) {
- getConfig(configs,
key).setAllowCoreThreadsTimeout(getBool(properties, key));
+ } else if (key.endsWith(".allowCoreThreadTimeOut")) {
+ getConfig(configs,
key).setAllowCoreThreadTimeOut(getBool(properties, key));
} else if (key.endsWith(".bypassIfSynchronous")) {
getConfig(configs,
key).setBypassIfSynchronous(getBool(properties, key));
} else if (key.equals("corePoolSize")) {
@@ -81,8 +81,8 @@ public class ExecutorConfigurator implem
executorFactory.getDefaultConfig().setQueueSize(getInt(properties, key));
} else if (key.equals("shutdownDelay")) {
executorFactory.getDefaultConfig().setShutdownDelay(getLong(properties, key));
- } else if (key.equals("allowCoreThreadsTimeout")) {
-
executorFactory.getDefaultConfig().setAllowCoreThreadsTimeout(getBool(properties,
key));
+ } else if (key.equals("allowCoreThreadTimeOut")) {
+
executorFactory.getDefaultConfig().setAllowCoreThreadTimeOut(getBool(properties,
key));
} else if (key.equals("bypassIfSynchronous")) {
executorFactory.getDefaultConfig().setBypassIfSynchronous(getBool(properties,
key));
}
Modified:
servicemix/smx4/nmr/trunk/nmr/osgi/src/main/resources/OSGI-INF/blueprint/servicemix-nmr.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/osgi/src/main/resources/OSGI-INF/blueprint/servicemix-nmr.xml?rev=1086864&r1=1086863&r2=1086864&view=diff
==============================================================================
---
servicemix/smx4/nmr/trunk/nmr/osgi/src/main/resources/OSGI-INF/blueprint/servicemix-nmr.xml
(original)
+++
servicemix/smx4/nmr/trunk/nmr/osgi/src/main/resources/OSGI-INF/blueprint/servicemix-nmr.xml
Wed Mar 30 07:38:57 2011
@@ -120,7 +120,7 @@
<bean id="executorFactory"
class="org.apache.servicemix.executors.impl.ExecutorFactoryImpl">
<property name="defaultConfig">
<bean class="org.apache.servicemix.executors.impl.ExecutorConfig">
- <property name="allowCoreThreadsTimeout"
value="${allowCoreThreadsTimeout}"/>
+ <property name="allowCoreThreadTimeOut"
value="${allowCoreThreadTimeOut}"/>
<property name="corePoolSize" value="${corePoolSize}"/>
<property name="maximumPoolSize" value="${maximumPoolSize}"/>
<property name="queueSize" value="${queueSize}"/>
@@ -147,7 +147,7 @@
<cm:property-placeholder persistent-id="org.apache.servicemix.nmr">
<cm:default-properties>
<cm:property name="nmrId" value="org.apache.servicemix.NMR"/>
- <cm:property name="allowCoreThreadsTimeout" value="true"/>
+ <cm:property name="allowCoreThreadTimeOut" value="true"/>
<cm:property name="corePoolSize" value="4"/>
<cm:property name="maximumPoolSize" value="-1"/>
<cm:property name="queueSize" value="1024"/>
