geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1221384 - /geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/BootActivator.java
Date Tue, 20 Dec 2011 18:04:03 GMT
Author: djencks
Date: Tue Dec 20 18:04:03 2011
New Revision: 1221384

URL: http://svn.apache.org/viewvc?rev=1221384&view=rev
Log:
GERONIMO-6240 start up geronimo from the BootActivator

Modified:
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/BootActivator.java

Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/BootActivator.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/BootActivator.java?rev=1221384&r1=1221383&r2=1221384&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/BootActivator.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/BootActivator.java
Tue Dec 20 18:04:03 2011
@@ -23,6 +23,7 @@ import java.io.InputStream;
 import java.net.URL;
 import java.util.Dictionary;
 
+import org.apache.geronimo.cli.daemon.DaemonCLParser;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.kernel.GBeanNotFoundException;
 import org.apache.geronimo.kernel.Kernel;
@@ -76,7 +77,12 @@ public class BootActivator implements Bu
 
             // register Main service if Main GBean present
             if (bundleContext.getServiceReference(org.apache.geronimo.main.Main.class.getName())
== null) { 
-                registerMainService(bundleContext, kernel);
+                final Main main = kernel.getGBean(Main.class);
+                DaemonCLParser parser = new DaemonCLParser(System.out);
+                //TODO fish the args out of karaf Main
+                parser.parse(new String[] {});
+                main.execute(parser);
+//                registerMainService(bundleContext, kernel);
             }
 
         } else {



Mime
View raw message