geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1231349 - in /geronimo/server/trunk/framework: buildsupport/car-maven-plugin/ features/framework/ modules/ modules/geronimo-cli/ modules/geronimo-cli/src/main/java/org/apache/geronimo/cli/ modules/geronimo-cli/src/main/java/org/apache/gero...
Date Fri, 13 Jan 2012 22:27:08 GMT
Author: djencks
Date: Fri Jan 13 22:27:08 2012
New Revision: 1231349

URL: http://svn.apache.org/viewvc?rev=1231349&view=rev
Log:
GERONIMO-6240 remove/clean up some unused startup code

Removed:
    geronimo/server/trunk/framework/modules/geronimo-cli/src/main/java/org/apache/geronimo/cli/AbstractCLI.java
    geronimo/server/trunk/framework/modules/geronimo-cli/src/main/java/org/apache/geronimo/cli/client/ClientCLI.java
    geronimo/server/trunk/framework/modules/geronimo-cli/src/main/java/org/apache/geronimo/cli/daemon/DaemonCLI.java
    geronimo/server/trunk/framework/modules/geronimo-cli/src/main/java/org/apache/geronimo/cli/deployer/DeployerCLI.java
    geronimo/server/trunk/framework/modules/geronimo-cli/src/main/java/org/apache/geronimo/cli/shutdown/ShutdownCLI.java
    geronimo/server/trunk/framework/modules/geronimo-cli/src/test/java/org/apache/geronimo/cli/AbstractCLITest.java
Modified:
    geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml
    geronimo/server/trunk/framework/features/framework/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-cli/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/geronimo/StartServerCommand.java
    geronimo/server/trunk/framework/modules/geronimo-system/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/EmbeddedDaemon.java
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/MainBridge.java
    geronimo/server/trunk/framework/modules/pom.xml

Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml?rev=1231349&r1=1231348&r2=1231349&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml (original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml Fri Jan 13 22:27:08
2012
@@ -41,59 +41,6 @@
     </description>
 
     <dependencies>
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.specs</groupId>-->
-            <!--<artifactId>geronimo-jaxb_2.2_spec</artifactId>-->
-        <!--</dependency>-->
-
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.bundles</groupId>-->
-            <!--<artifactId>jaxb-impl</artifactId>-->
-        <!--</dependency>-->
-
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.specs</groupId>-->
-            <!--<artifactId>geronimo-stax-api_1.2_spec</artifactId>-->
-        <!--</dependency>-->
-
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.bundles</groupId>-->
-            <!--<artifactId>woodstox-core-asl</artifactId>-->
-        <!--</dependency>-->
-
-        <!--<dependency>-->
-            <!--<groupId>org.codehaus.woodstox</groupId>-->
-            <!--<artifactId>stax2-api</artifactId>        -->
-        <!--</dependency>-->
-
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.specs</groupId>-->
-            <!--<artifactId>geronimo-activation_1.1_spec</artifactId>-->
-        <!--</dependency>-->
-        <!-- try to make javax.transaction classes loadable during build -->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.specs</groupId>-->
-            <!--<artifactId>geronimo-jta_1.1_spec</artifactId>-->
-        <!--</dependency>-->
-
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.framework</groupId>-->
-            <!--<artifactId>geronimo-hook</artifactId>-->
-            <!--<version>${project.version}</version>-->
-        <!--</dependency>-->
-
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.framework</groupId>-->
-            <!--<artifactId>geronimo-common</artifactId>-->
-            <!--<version>${project.version}</version>-->
-        <!--</dependency>-->
-
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.framework</groupId>-->
-            <!--<artifactId>geronimo-system</artifactId>-->
-            <!--<version>${project.version}</version>-->
-        <!--</dependency>-->
-
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-obr</artifactId>
@@ -106,12 +53,6 @@
             <version>${project.version}</version>
         </dependency>
 
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.framework</groupId>-->
-            <!--<artifactId>geronimo-service-builder</artifactId>-->
-            <!--<version>${project.version}</version>-->
-        <!--</dependency>-->
-
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-deploy-tool</artifactId>
@@ -130,28 +71,6 @@
             </exclusions>
         </dependency>
 
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.framework</groupId>-->
-            <!--<artifactId>geronimo-transformer</artifactId>-->
-            <!--<version>${project.version}</version>-->
-        <!--</dependency>-->
-
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.framework</groupId>-->
-            <!--<artifactId>geronimo-main</artifactId>-->
-            <!--<version>${project.version}</version>-->
-        <!--</dependency>-->
-        <!---->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.yoko</groupId>-->
-            <!--<artifactId>yoko-spec-corba</artifactId>-->
-        <!--</dependency>-->
-
-        <!--<dependency>-->
-            <!--<groupId>org.apache.yoko</groupId>-->
-            <!--<artifactId>yoko-rmi-spec</artifactId>-->
-        <!--</dependency>-->
-
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-project</artifactId>
@@ -197,12 +116,6 @@
             <version>1.0-alpha-43</version>
             <scope>provided</scope>
         </dependency>
-        <!--<dependency>-->
-            <!--<groupId>org.codehaus.plexus</groupId>-->
-            <!--<artifactId>plexus-classworlds</artifactId>-->
-            <!--<version>1.5.0</version>-->
-            <!--<scope>test</scope>-->
-        <!--</dependency>-->
         <dependency>
             <groupId>classworlds</groupId>
             <artifactId>classworlds</artifactId>
@@ -223,21 +136,6 @@
             <scope>test</scope>
         </dependency>
 
-        <!--<dependency>-->
-            <!--<groupId>commons-cli</groupId>-->
-            <!--<artifactId>commons-cli</artifactId>-->
-        <!--</dependency>-->
-
-        <!--<dependency>-->
-            <!--<groupId>org.apache.servicemix.bundles</groupId>-->
-            <!--<artifactId>org.apache.servicemix.bundles.xstream</artifactId>-->
-        <!--</dependency>-->
-
-        <!--<dependency>-->
-            <!--<groupId>org.apache.servicemix.bundles</groupId>-->
-            <!--<artifactId>org.apache.servicemix.bundles.xpp3</artifactId>-->
-        <!--</dependency>-->
-
         <dependency>
             <groupId>org.sonatype.gossip</groupId>
             <artifactId>gossip</artifactId>
@@ -268,10 +166,6 @@
             <groupId>org.apache.karaf</groupId>
             <artifactId>org.apache.karaf.main</artifactId>
         </dependency>
-        <!--<dependency>-->
-            <!--<groupId>org.ops4j.pax.url</groupId>-->
-            <!--<artifactId>pax-url-mvn</artifactId>-->
-        <!--</dependency>-->
         <dependency>
             <groupId>org.apache.karaf.tooling</groupId>
             <artifactId>karaf-maven-plugin</artifactId>

Modified: geronimo/server/trunk/framework/features/framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/framework/pom.xml?rev=1231349&r1=1231348&r2=1231349&view=diff
==============================================================================
--- geronimo/server/trunk/framework/features/framework/pom.xml (original)
+++ geronimo/server/trunk/framework/features/framework/pom.xml Fri Jan 13 22:27:08 2012
@@ -266,161 +266,24 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.framework.features</groupId>-->
-            <!--<artifactId>org.apache.geronimo.javaee-specs</artifactId>-->
-            <!--<version>${project.version}</version>-->
-            <!--<type>xml</type>-->
-            <!--<classifier>features</classifier>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.framework.features</groupId>-->
-            <!--<artifactId>org.apache.geronimo.jaxb-support</artifactId>-->
-            <!--<version>${project.version}</version>-->
-            <!--<type>xml</type>-->
-            <!--<classifier>features</classifier>-->
-        <!--</dependency>-->
-
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf.deployer</groupId>-->
-            <!--<artifactId>org.apache.karaf.deployer.blueprint</artifactId>-->
-            <!--<exclusions>-->
-                <!--<exclusion>-->
-                    <!--<groupId>org.apache.servicemix.bundles</groupId>-->
-                    <!--<artifactId>org.apache.servicemix.bundles.junit</artifactId>-->
-                <!--</exclusion>-->
-            <!--</exclusions>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf.deployer</groupId>-->
-            <!--<artifactId>org.apache.karaf.deployer.features</artifactId>-->
-            <!--<exclusions>-->
-                <!--<exclusion>-->
-                    <!--<groupId>org.apache.servicemix.bundles</groupId>-->
-                    <!--<artifactId>org.apache.servicemix.bundles.junit</artifactId>-->
-                <!--</exclusion>-->
-            <!--</exclusions>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf.features</groupId>-->
-            <!--<artifactId>org.apache.karaf.features.core</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf.features</groupId>-->
-            <!--<artifactId>org.apache.karaf.features.command</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf.features</groupId>-->
-            <!--<artifactId>org.apache.karaf.features.management</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf.shell</groupId>-->
-            <!--<artifactId>org.apache.karaf.shell.console</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf.shell</groupId>-->
-            <!--<artifactId>org.apache.karaf.shell.obr</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf.shell</groupId>-->
-            <!--<artifactId>org.apache.karaf.shell.osgi</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf.shell</groupId>-->
-            <!--<artifactId>org.apache.karaf.shell.log</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf.shell</groupId>-->
-            <!--<artifactId>org.apache.karaf.shell.config</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf.shell</groupId>-->
-            <!--<artifactId>org.apache.karaf.shell.packages</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf.shell</groupId>-->
-            <!--<artifactId>org.apache.karaf.shell.commands</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf.shell</groupId>-->
-            <!--<artifactId>org.apache.karaf.shell.ssh</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf.jaas</groupId>-->
-            <!--<artifactId>org.apache.karaf.jaas.boot</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf.jaas</groupId>-->
-            <!--<artifactId>org.apache.karaf.jaas.config</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.felix</groupId>-->
-            <!--<artifactId>org.apache.felix.bundlerepository</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.felix</groupId>-->
-            <!--<artifactId>org.apache.felix.fileinstall</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.mina</groupId>-->
-            <!--<artifactId>mina-core</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.felix</groupId>-->
-            <!--<artifactId>org.apache.felix.configadmin</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.felix</groupId>-->
-            <!--<artifactId>org.apache.felix.metatype</artifactId>-->
-        <!--</dependency>-->
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.prefs</artifactId>
-        </dependency>
-        <!--<dependency>-->
-            <!--<groupId>org.ops4j.pax.logging</groupId>-->
-            <!--<artifactId>pax-logging-api</artifactId>-->
-        <!--</dependency>-->
-        <dependency>
+         </dependency>
+         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-pax-logging</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <!--<dependency>-->
-            <!--<groupId>org.ops4j.pax.url</groupId>-->
-            <!--<artifactId>pax-url-mvn</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.ops4j.pax.url</groupId>-->
-            <!--<artifactId>pax-url-wrap</artifactId>-->
-        <!--</dependency>-->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-servlet_3.0_spec</artifactId>
         </dependency>
         <!--<dependency>-->
-            <!--<groupId>org.apache.sshd</groupId>-->
-            <!--<artifactId>sshd-core</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.eclipse.osgi</groupId>-->
-            <!--<artifactId>org.eclipse.osgi</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.felix</groupId>-->
-            <!--<artifactId>org.apache.felix.framework</artifactId>-->
-        <!--</dependency>-->
-
-        <!--<dependency>-->
-            <!--<groupId>org.apache.aries</groupId>-->
-            <!--<artifactId>org.apache.aries.util</artifactId>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>geronimo-main</artifactId>-->
+            <!--<version>${project.version}</version>-->
         <!--</dependency>-->
-
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-main</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-cli</artifactId>
@@ -447,12 +310,6 @@
             <artifactId>geronimo-shell</artifactId>
             <version>${version}</version>
         </dependency>
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.framework</groupId>-->
-            <!--<artifactId>j2ee-system</artifactId>-->
-            <!--<version>${version}</version>-->
-            <!--<type>car</type>-->
-        <!--</dependency>-->
         <!--agent -->
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
@@ -635,12 +492,12 @@
                                     <outputDirectory>target/classes/resources/lib</outputDirectory>
                                     <destFileName>geronimo-rmi-loader.jar</destFileName>
                                 </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.framework</groupId>
-                                    <artifactId>geronimo-main</artifactId>
-                                    <outputDirectory>target/classes/resources/lib</outputDirectory>
-                                    <destFileName>geronimo-main.jar</destFileName>
-                                </artifactItem>
+                                <!--<artifactItem>-->
+                                    <!--<groupId>org.apache.geronimo.framework</groupId>-->
+                                    <!--<artifactId>geronimo-main</artifactId>-->
+                                    <!--<outputDirectory>target/classes/resources/lib</outputDirectory>-->
+                                    <!--<destFileName>geronimo-main.jar</destFileName>-->
+                                <!--</artifactItem>-->
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.framework</groupId>
                                     <artifactId>geronimo-cli</artifactId>

Modified: geronimo/server/trunk/framework/modules/geronimo-cli/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-cli/pom.xml?rev=1231349&r1=1231348&r2=1231349&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-cli/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-cli/pom.xml Fri Jan 13 22:27:08 2012
@@ -33,12 +33,12 @@
     <name>Geronimo Framework, Modules :: CLI</name>
 
     <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-main</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>geronimo-main</artifactId>-->
+            <!--<version>${project.version}</version>-->
+            <!--<scope>provided</scope>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>commons-cli</groupId>

Modified: geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/geronimo/StartServerCommand.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/geronimo/StartServerCommand.java?rev=1231349&r1=1231348&r2=1231349&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/geronimo/StartServerCommand.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/geronimo/StartServerCommand.java
Fri Jan 13 22:27:08 2012
@@ -111,6 +111,7 @@ public class StartServerCommand extends 
              protected void process() throws Exception {
                  try {
                      Java javaTask = (Java) ant.createTask("java");
+                     //TODO KARAF won't work
                      javaTask.setClassname("org.apache.geronimo.cli.daemon.DaemonCLI");
                      Path path = javaTask.createClasspath();
                      File libDir = new File(geronimoHome, "lib");

Modified: geronimo/server/trunk/framework/modules/geronimo-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/pom.xml?rev=1231349&r1=1231348&r2=1231349&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/pom.xml Fri Jan 13 22:27:08 2012
@@ -51,12 +51,12 @@
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-main</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>geronimo-main</artifactId>-->
+            <!--<version>${project.version}</version>-->
+            <!--<scope>provided</scope>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>

Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/EmbeddedDaemon.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/EmbeddedDaemon.java?rev=1231349&r1=1231348&r2=1231349&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/EmbeddedDaemon.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/EmbeddedDaemon.java
Fri Jan 13 22:27:08 2012
@@ -53,6 +53,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
+ * This starts geronimo inside karaf.
+ *
  * @version $Rev:385659 $ $Date: 2007-03-07 14:40:07 +1100 (Wed, 07 Mar 2007) $
  */
 

Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/MainBridge.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/MainBridge.java?rev=1231349&r1=1231348&r2=1231349&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/MainBridge.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/MainBridge.java
Fri Jan 13 22:27:08 2012
@@ -32,15 +32,16 @@ import org.apache.geronimo.kernel.config
 import org.apache.geronimo.kernel.config.ConfigurationUtil;
 import org.apache.geronimo.kernel.config.PersistentConfigurationList;
 import org.apache.geronimo.kernel.repository.Artifact;
-import org.apache.geronimo.main.Main;
+//import org.apache.geronimo.main.Main;
 import org.osgi.framework.Bundle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
+ * TODO is this used?  How?
  * @version $Rev:385659 $ $Date$
  */
-public class MainBridge implements Main, GBeanLifecycle {
+public class MainBridge implements /*Main,*/ GBeanLifecycle {
     private static final Logger log = LoggerFactory.getLogger(MainBridge.class);
 
     protected final Kernel kernel;
@@ -118,7 +119,7 @@ public class MainBridge implements Main,
     }
 
     public void doStart() throws Exception {
-        bundle.getBundleContext().registerService(Main.class.getName(), this, new Hashtable());
+//        bundle.getBundleContext().registerService(Main.class.getName(), this, new Hashtable());
     }
 
     public void doStop() throws Exception {

Modified: geronimo/server/trunk/framework/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/pom.xml?rev=1231349&r1=1231348&r2=1231349&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/pom.xml Fri Jan 13 22:27:08 2012
@@ -61,7 +61,7 @@
         <module>geronimo-deploy-jsr88</module>
         <module>geronimo-deploy-config</module>
         <module>geronimo-rmi-loader</module>
-        <module>geronimo-main</module>
+        <!--<module>geronimo-main</module>-->
         <module>geronimo-bundle-recorder</module>
         <module>geronimo-hook</module>
     </modules>



Mime
View raw message