servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r606008 - in /servicemix/smx4/runtime/trunk: assembly/src/main/distribution/text/etc/ assembly/src/main/filtered-resources/etc/ gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/
Date Thu, 20 Dec 2007 19:41:32 GMT
Author: gnodet
Date: Thu Dec 20 11:41:29 2007
New Revision: 606008

URL: http://svn.apache.org/viewvc?rev=606008&view=rev
Log:
Fix bundles start order

Removed:
    servicemix/smx4/runtime/trunk/assembly/src/main/distribution/text/etc/org.apache.servicemix.management.cfg
Modified:
    servicemix/smx4/runtime/trunk/assembly/src/main/distribution/text/etc/config.properties
    servicemix/smx4/runtime/trunk/assembly/src/main/filtered-resources/etc/startup.properties
    servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/SpringCommandRegistry.java

Modified: servicemix/smx4/runtime/trunk/assembly/src/main/distribution/text/etc/config.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/assembly/src/main/distribution/text/etc/config.properties?rev=606008&r1=606007&r2=606008&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/assembly/src/main/distribution/text/etc/config.properties
(original)
+++ servicemix/smx4/runtime/trunk/assembly/src/main/distribution/text/etc/config.properties
Thu Dec 20 11:41:29 2007
@@ -30,8 +30,8 @@
 #org.osgi.framework.bootdelegation=sun.*,com.sun.*
 
 # To enable the use of the startup.properties file to control the start level:
-#felix.auto.start=startup.properties
-felix.auto.start=all
+felix.auto.start=startup.properties
+#felix.auto.start=all
 
 felix.startlevel.framework=100
 felix.startlevel.bundle=50

Modified: servicemix/smx4/runtime/trunk/assembly/src/main/filtered-resources/etc/startup.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/assembly/src/main/filtered-resources/etc/startup.properties?rev=606008&r1=606007&r2=606008&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/assembly/src/main/filtered-resources/etc/startup.properties
(original)
+++ servicemix/smx4/runtime/trunk/assembly/src/main/filtered-resources/etc/startup.properties
Thu Dec 20 11:41:29 2007
@@ -20,39 +20,38 @@
 # This file allows you to control the start level of each bundle.
 #
 
-# TODO: replace all the version numbers here with variable refs.
-
 #
-# Libs that don't start services should probably get loaded first.
+# Startup core services like logging
 #
-org.apache.servicemix.bundles.ant-1.7.0-4.0-SNAPSHOT.jar=10
-org.apache.servicemix.bundles.aopalliance-1.0-4.0-SNAPSHOT.jar=10
-org.apache.servicemix.bundles.cglib-2.1_3-4.0-SNAPSHOT.jar=10
-org.apache.servicemix.bundles.mina-1.1.6-r602102-4.0-SNAPSHOT.jar=10
-org.apache.servicemix.bundles.xstream-1.2.2-4.0-SNAPSHOT.jar=10
-geronimo-servlet_2.5_spec-1.1.1-SNAPSHOT.jar=10
-geronimo-stax-api_1.0_spec-1.0.1-SNAPSHOT.jar=10
-org.osgi.compendium-0.9.0-20070713.230317-1.jar=10
-spring-aop-2.5.jar=10
-spring-beans-2.5.jar=10
-spring-context-2.5.jar=10
-spring-core-2.5.jar=10
-spring-osgi-core-1.0-m3.jar=10
-spring-osgi-extender-1.0-m3.jar=10
-spring-osgi-io-1.0-m3.jar=10
+geronimo-servlet_2.5_spec-${geronimo.servlet.version}.jar=10
+org.osgi.compendium-${felix.compendium.version}.jar=10
+org.apache.felix.configadmin-${felix.configadmin.version}.jar=10
+org.apache.servicemix.runtime.filemonitor-${version}.jar=15
+pax-logging-api-${pax.logging.version}.jar=20
+pax-logging-service-${pax.logging.version}.jar=20
 
 #
-# Startup core services like logging
+# The rest of the services..
 #
-pax-logging-api-0.9.8-20071205.114123-4.jar=20
-pax-logging-service-0.9.8-20071205.114123-4.jar=20
-org.apache.servicemix.runtime.filemonitor-${version}.jar=20
+org.apache.servicemix.bundles.ant-${ant.version}-${version}.jar=50
+org.apache.servicemix.bundles.aopalliance-${aopalliance.version}-${version}.jar=50
+org.apache.servicemix.bundles.cglib-${cglib.version}-${version}.jar=50
+org.apache.servicemix.bundles.mina-${mina.version}-${version}.jar=50
+org.apache.servicemix.bundles.xstream-${xstream.version}-${version}.jar=50
+geronimo-stax-api_1.0_spec-${geronimo.stax.version}.jar=50
+spring-aop-${spring.version}.jar=50
+spring-beans-${spring.version}.jar=50
+spring-context-${spring.version}.jar=50
+spring-core-${spring.version}.jar=50
+spring-osgi-core-${spring.osgi.version}.jar=50
+spring-osgi-extender-${spring.osgi.version}.jar=50
+spring-osgi-io-${spring.osgi.version}.jar=50
+org.apache.felix.bundlerepository-${felix.bundlerepository.version}.jar=50
+org.apache.servicemix.runtime.gshell.obr-${version}.jar=50
+org.apache.servicemix.runtime.gshell.osgi-${version}.jar=50
 
 #
-# The rest of the services..
+# Start console last
 #
-org.apache.felix.bundlerepository-1.1.0-20071205.111236-2.jar=50
-org.apache.felix.configadmin-0.9.0-20070906.081947-8.jar=50
-org.apache.servicemix.gshell.core-${version}.jar=50
-org.apache.servicemix.gshell.obr-${version}.jar=50
-org.apache.servicemix.gshell.osgi-${version}.jar=50
+org.apache.servicemix.runtime.gshell.core-${version}.jar=100
+

Modified: servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/SpringCommandRegistry.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/SpringCommandRegistry.java?rev=606008&r1=606007&r2=606008&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/SpringCommandRegistry.java
(original)
+++ servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/SpringCommandRegistry.java
Thu Dec 20 11:41:29 2007
@@ -145,9 +145,10 @@
     public Node findNode(String s) throws NotFoundException {
         Node start = (Node) env.getVariables().get(CURRENT_NODE);
         if (start != null) {
-            Node n = findNode(start, s);
-            if (n != null) {
-                return n;
+            try {
+                return findNode(start, s);
+            } catch (NotFoundException e) {
+                // Ignore, we need to try at root level
             }
         }
         return findNode(layout, s);



Mime
View raw message