You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ge...@apache.org on 2011/03/26 16:56:35 UTC
svn commit: r1085746 - in /servicemix/components/trunk: ./
shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/osgi/
shared-libraries/servicemix-common/src/test/java/org/apache/servicemix/common/
shared-libraries/servicemix-co...
Author: gertv
Date: Sat Mar 26 15:56:35 2011
New Revision: 1085746
URL: http://svn.apache.org/viewvc?rev=1085746&view=rev
Log:
Upgrade to servicemix-utils 1.5.0-SNAPSHOT
Modified:
servicemix/components/trunk/pom.xml
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/osgi/Configuration.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/test/java/org/apache/servicemix/common/ContainerTest.java
servicemix/components/trunk/shared-libraries/servicemix-common/src/test/java/org/apache/servicemix/common/osgi/ConfigurationTest.java
Modified: servicemix/components/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/pom.xml?rev=1085746&r1=1085745&r2=1085746&view=diff
==============================================================================
--- servicemix/components/trunk/pom.xml (original)
+++ servicemix/components/trunk/pom.xml Sat Mar 26 15:56:35 2011
@@ -80,7 +80,7 @@
<!-- ServiceMix Stuff -->
<servicemix.legal.version>1.0</servicemix.legal.version>
<servicemix.specs.version>1.7.0</servicemix.specs.version>
- <servicemix-utils.version>1.4.0</servicemix-utils.version>
+ <servicemix-utils.version>1.5.0-SNAPSHOT</servicemix-utils.version>
<servicemix.version>3.3.2</servicemix.version>
<!-- OSGi properties used by maven-bundle-plugin -->
Modified: servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/osgi/Configuration.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/osgi/Configuration.java?rev=1085746&r1=1085745&r2=1085746&view=diff
==============================================================================
--- servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/osgi/Configuration.java (original)
+++ servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/osgi/Configuration.java Sat Mar 26 15:56:35 2011
@@ -88,7 +88,7 @@ public class Configuration {
* Set the keep alive time on the executor
* @see org.apache.servicemix.executors.impl.ExecutorConfig#setKeepAliveTime(long)
*/
- public void setKeepAliveTime(int time) {
+ public void setKeepAliveTime(long time) {
logger.debug("Setting thread keep-alive time: {}", time);
executorConfig.setKeepAliveTime(time);
}
Modified: servicemix/components/trunk/shared-libraries/servicemix-common/src/test/java/org/apache/servicemix/common/ContainerTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/shared-libraries/servicemix-common/src/test/java/org/apache/servicemix/common/ContainerTest.java?rev=1085746&r1=1085745&r2=1085746&view=diff
==============================================================================
--- servicemix/components/trunk/shared-libraries/servicemix-common/src/test/java/org/apache/servicemix/common/ContainerTest.java (original)
+++ servicemix/components/trunk/shared-libraries/servicemix-common/src/test/java/org/apache/servicemix/common/ContainerTest.java Sat Mar 26 15:56:35 2011
@@ -52,9 +52,9 @@ public class ContainerTest extends TestC
assertNotNull(factory);
assertEquals("Executor config should have been copied from OSGi Configuration instance",
- 10, factory.getDefaultConfig().getCorePoolSize());
+ new Integer(10), factory.getDefaultConfig().getCorePoolSize());
assertEquals("Executor config should have been copied from OSGi Configuration instance",
- 50, factory.getDefaultConfig().getMaximumPoolSize());
+ new Integer(50), factory.getDefaultConfig().getMaximumPoolSize());
}
public void testUnknown() {
Modified: servicemix/components/trunk/shared-libraries/servicemix-common/src/test/java/org/apache/servicemix/common/osgi/ConfigurationTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/shared-libraries/servicemix-common/src/test/java/org/apache/servicemix/common/osgi/ConfigurationTest.java?rev=1085746&r1=1085745&r2=1085746&view=diff
==============================================================================
--- servicemix/components/trunk/shared-libraries/servicemix-common/src/test/java/org/apache/servicemix/common/osgi/ConfigurationTest.java (original)
+++ servicemix/components/trunk/shared-libraries/servicemix-common/src/test/java/org/apache/servicemix/common/osgi/ConfigurationTest.java Sat Mar 26 15:56:35 2011
@@ -39,11 +39,11 @@ public class ConfigurationTest extends T
ExecutorConfig executorConfig = config.getExecutorConfig();
assertNotNull(executorConfig);
- assertEquals(10, executorConfig.getCorePoolSize());
- assertEquals(50, executorConfig.getMaximumPoolSize());
- assertEquals(100, executorConfig.getQueueSize());
+ assertEquals(new Integer(10), executorConfig.getCorePoolSize());
+ assertEquals(new Integer(50), executorConfig.getMaximumPoolSize());
+ assertEquals(new Integer(100), executorConfig.getQueueSize());
assertFalse(executorConfig.isAllowCoreThreadsTimeout());
- assertEquals(30000, executorConfig.getKeepAliveTime());
+ assertEquals(new Long(30000), executorConfig.getKeepAliveTime());
}
}