servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject svn commit: r718163 - in /servicemix/smx3/branches/servicemix-3.2: ./ core/servicemix-core/src/main/java/org/apache/servicemix/ distributions/apache-servicemix/src/main/release/bin/
Date Mon, 17 Nov 2008 02:55:37 GMT
Author: ffang
Date: Sun Nov 16 18:55:37 2008
New Revision: 718163

URL: http://svn.apache.org/viewvc?rev=718163&view=rev
Log:
[SM-1688]update classworlds version from 1.0.1 to 1.1

Modified:
    servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/main/java/org/apache/servicemix/Main.java
    servicemix/smx3/branches/servicemix-3.2/distributions/apache-servicemix/src/main/release/bin/servicemix
    servicemix/smx3/branches/servicemix-3.2/distributions/apache-servicemix/src/main/release/bin/servicemix.bat
    servicemix/smx3/branches/servicemix-3.2/pom.xml

Modified: servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/main/java/org/apache/servicemix/Main.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/main/java/org/apache/servicemix/Main.java?rev=718163&r1=718162&r2=718163&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/main/java/org/apache/servicemix/Main.java
(original)
+++ servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/main/java/org/apache/servicemix/Main.java
Sun Nov 16 18:55:37 2008
@@ -79,9 +79,20 @@
                     }
                 }
             });
+            //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);
             e.printStackTrace();
         }
     }
 }
+

Modified: servicemix/smx3/branches/servicemix-3.2/distributions/apache-servicemix/src/main/release/bin/servicemix
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/distributions/apache-servicemix/src/main/release/bin/servicemix?rev=718163&r1=718162&r2=718163&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/distributions/apache-servicemix/src/main/release/bin/servicemix
(original)
+++ servicemix/smx3/branches/servicemix-3.2/distributions/apache-servicemix/src/main/release/bin/servicemix
Sun Nov 16 18:55:37 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/branches/servicemix-3.2/distributions/apache-servicemix/src/main/release/bin/servicemix.bat
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/distributions/apache-servicemix/src/main/release/bin/servicemix.bat?rev=718163&r1=718162&r2=718163&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/distributions/apache-servicemix/src/main/release/bin/servicemix.bat
(original)
+++ servicemix/smx3/branches/servicemix-3.2/distributions/apache-servicemix/src/main/release/bin/servicemix.bat
Sun Nov 16 18:55:37 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/branches/servicemix-3.2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/pom.xml?rev=718163&r1=718162&r2=718163&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/pom.xml (original)
+++ servicemix/smx3/branches/servicemix-3.2/pom.xml Sun Nov 16 18:55:37 2008
@@ -1053,7 +1053,7 @@
             <dependency>
                 <groupId>classworlds</groupId>
                 <artifactId>classworlds</artifactId>
-                <version>1.0.1</version>
+                <version>1.1</version>
             </dependency>
             <dependency>
                 <groupId>commons-attributes</groupId>



Mime
View raw message