You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2008/11/17 03:54:58 UTC
svn commit: r718162 - in /servicemix/smx3/trunk:
core/servicemix-core/src/main/java/org/apache/servicemix/Main.java
distributions/apache-servicemix/src/main/release/bin/servicemix
distributions/apache-servicemix/src/main/release/bin/servicemix.bat pom.xml
Author: ffang
Date: Sun Nov 16 18:54:57 2008
New Revision: 718162
URL: http://svn.apache.org/viewvc?rev=718162&view=rev
Log:
[SM-1688]update classworlds version from 1.0.1 to 1.1
Modified:
servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/Main.java
servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/bin/servicemix
servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/bin/servicemix.bat
servicemix/smx3/trunk/pom.xml
Modified: servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/Main.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/Main.java?rev=718162&r1=718161&r2=718162&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/Main.java (original)
+++ servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/Main.java Sun Nov 16 18:54:57 2008
@@ -78,6 +78,16 @@
}
}
});
+ //this is for classworlds 1.1 launcher which use System.exit()
+ //explicitly after lauch Main. To avoid System.exit() being invoked
+ //during servicemix runing, we need keep ServiceMix main thread alive.
+ while (true) {
+ try {
+ Thread.sleep(60000);
+ } catch (InterruptedException e) {
+ //
+ }
+ }
} catch (Exception e) {
System.out.println("Caught: " + e);
Modified: servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/bin/servicemix
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/bin/servicemix?rev=718162&r1=718161&r2=718162&view=diff
==============================================================================
--- servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/bin/servicemix (original)
+++ servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/bin/servicemix Sun Nov 16 18:54:57 2008
@@ -216,7 +216,7 @@
setupClassworlds() {
# Setup the classpath
- CLASSPATH="$CLASSPATH:$SERVICEMIX_HOME/lib/classworlds-1.0.1.jar"
+ CLASSPATH="$CLASSPATH:$SERVICEMIX_HOME/lib/classworlds-1.1.jar"
# Setup Classworlds options
CLASSWORLDS_CONF="$SERVICEMIX_HOME/conf/servicemix.conf"
Modified: servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/bin/servicemix.bat
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/bin/servicemix.bat?rev=718162&r1=718161&r2=718162&view=diff
==============================================================================
--- servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/bin/servicemix.bat (original)
+++ servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/bin/servicemix.bat Sun Nov 16 18:54:57 2008
@@ -108,7 +108,7 @@
:SERVICEMIX_PROFILER_END
rem Setup the classpath
-set CLASSPATH=%CLASSPATH%;%SERVICEMIX_HOME%\lib\classworlds-1.0.1.jar
+set CLASSPATH=%CLASSPATH%;%SERVICEMIX_HOME%\lib\classworlds-1.1.jar
rem Setup boot options
set CLASSWORLDS_CONF=%SERVICEMIX_HOME%\conf\servicemix.conf
Modified: servicemix/smx3/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/pom.xml?rev=718162&r1=718161&r2=718162&view=diff
==============================================================================
--- servicemix/smx3/trunk/pom.xml (original)
+++ servicemix/smx3/trunk/pom.xml Sun Nov 16 18:54:57 2008
@@ -918,7 +918,7 @@
<dependency>
<groupId>classworlds</groupId>
<artifactId>classworlds</artifactId>
- <version>1.0.1</version>
+ <version>1.1</version>
</dependency>
<dependency>
<groupId>commons-attributes</groupId>