geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gdam...@apache.org
Subject svn commit: r503905 - in /geronimo/server/trunk: applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/util/ assemblies/geronimo-boilerplate-minimal/ assemblies/geronimo-boilerplate-minimal/src/main/resources/var/log/...
Date Mon, 05 Feb 2007 22:20:51 GMT
Author: gdamour
Date: Mon Feb  5 14:20:49 2007
New Revision: 503905

URL: http://svn.apache.org/viewvc?view=rev&rev=503905
Log:
Revert deployer changes as they do break the Eclipse plugin and TCK.
I will investigate offline.

svn merge -r503370:503369 .




Added:
    geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/config/offline-deployer-list
      - copied unchanged from r503369, geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/config/offline-deployer-list
    geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/offline-deployer-list
      - copied unchanged from r503369, geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/offline-deployer-list
    geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/var/config/offline-deployer-list
      - copied unchanged from r503369, geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/var/config/offline-deployer-list
    geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/offline-deployer-list
      - copied unchanged from r503369, geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/offline-deployer-list
    geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/var/config/offline-deployer-list
      - copied unchanged from r503369, geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/var/config/offline-deployer-list
Removed:
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/log/deployer-log4j.properties
    geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/config/jsr88-configurer-config.xml
    geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/config/offline-deployer-config.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/jsr88-configurer-config.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/offline-deployer-config.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/var/config/jsr88-configurer-config.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/var/config/offline-deployer-config.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/jsr88-configurer-config.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/offline-deployer-config.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/var/config/jsr88-configurer-config.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/var/config/offline-deployer-config.xml
    geronimo/server/trunk/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/OfflineDeployerStarter.java
    geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/SwitchablePersistentConfigurationList.java
    geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/Main.java
    geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/MainBootstrapper.java
    geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/SwitchableLocalAttributeManager.java
Modified:
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/util/PortletManager.java
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml
    geronimo/server/trunk/assemblies/geronimo-framework/pom.xml
    geronimo/server/trunk/assemblies/geronimo-framework/src/main/assembly/bin.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/assembly/bin.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/assembly/bin.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/pom.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/assembly/bin.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/assembly/bin.xml
    geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml
    geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml
    geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml
    geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml
    geronimo/server/trunk/configs/online-deployer/pom.xml
    geronimo/server/trunk/configs/online-deployer/src/plan/plan.xml
    geronimo/server/trunk/configs/pom.xml
    geronimo/server/trunk/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/jsr88/ClientConfigurer.java
    geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/factories/DeploymentFactoryImpl.java
    geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java
    geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/LocalDeploymentManager.java
    geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/RemoteDeploymentManager.java
    geronimo/server/trunk/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/AbstractCommand.java
    geronimo/server/trunk/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/DeployTool.java
    geronimo/server/trunk/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/ServerConnection.java
    geronimo/server/trunk/modules/geronimo-hot-deploy/src/main/java/org/apache/geronimo/deployment/hot/DirectoryHotDeployer.java
    geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationUtil.java

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/util/PortletManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/util/PortletManager.java?view=diff&rev=503905&r1=503904&r2=503905
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/util/PortletManager.java (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/util/PortletManager.java Mon Feb  5 14:20:49 2007
@@ -77,11 +77,6 @@
     // nothing yet
 
     private static ManagementHelper createHelper() {
-        Kernel kernel = getKernel();
-        return new KernelManagementHelper(kernel);
-    }
-
-    private static Kernel getKernel() {
         //todo: consider making this configurable; we could easily connect to a remote kernel if we wanted to
         Kernel kernel = null;
         try {
@@ -93,12 +88,11 @@
             log.debug("Unable to find kernel in JNDI; using KernelRegistry instead");
             kernel = KernelRegistry.getSingleKernel();
         }
-        return kernel;
+        return new KernelManagementHelper(kernel);
     }
 
     public static DeploymentManager getDeploymentManager(PortletRequest request) {
-        Kernel kernel = getKernel();
-        DeploymentFactoryImpl factory = new DeploymentFactoryImpl(kernel);
+        DeploymentFactoryImpl factory = new DeploymentFactoryImpl();
         try {
             return factory.getDeploymentManager("deployer:geronimo:inVM", null, null);
         } catch (DeploymentManagerCreationException e) {

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml?view=diff&rev=503905&r1=503904&r2=503905
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml Mon Feb  5 14:20:49 2007
@@ -62,6 +62,10 @@
                                     <artifactId>cglib-nodep</artifactId>
                                 </artifactItem>
                                 <artifactItem>
+                                    <groupId>commons-cli</groupId>
+                                    <artifactId>commons-cli</artifactId>
+                                </artifactItem>
+                                <artifactItem>
                                     <groupId>commons-logging</groupId>
                                     <artifactId>commons-logging</artifactId>
                                 </artifactItem>
@@ -74,6 +78,10 @@
                                     <artifactId>mx4j</artifactId>
                                 </artifactItem>
                                 <artifactItem>
+                                    <groupId>mx4j</groupId>
+                                    <artifactId>mx4j-remote</artifactId>
+                                </artifactItem>
+                                <artifactItem>
                                     <groupId>xpp3</groupId>
                                     <artifactId>xpp3</artifactId>
                                 </artifactItem>
@@ -82,6 +90,10 @@
                                     <artifactId>xstream</artifactId>
                                 </artifactItem>
                                 <artifactItem>
+                                    <groupId>jline</groupId>
+                                    <artifactId>jline</artifactId>
+                                </artifactItem>
+                                <artifactItem>
                                     <groupId>commons-jexl</groupId>
                                     <artifactId>commons-jexl</artifactId>
                                 </artifactItem>
@@ -90,8 +102,22 @@
                                     <artifactId>ognl</artifactId>
                                 </artifactItem>
                                 <artifactItem>
+                                    <groupId>org.apache.geronimo.specs</groupId>
+                                    <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
+                                </artifactItem>
+                                <artifactItem>
                                     <groupId>org.apache.geronimo.modules</groupId>
                                     <artifactId>geronimo-common</artifactId>
+                                    <version>${version}</version>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <artifactId>geronimo-deploy-jsr88</artifactId>
+                                    <version>${version}</version>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <artifactId>geronimo-deploy-tool</artifactId>
                                     <version>${version}</version>
                                 </artifactItem>
                                 <artifactItem>

Modified: geronimo/server/trunk/assemblies/geronimo-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-framework/pom.xml?view=diff&rev=503905&r1=503904&r2=503905
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-framework/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-framework/pom.xml Mon Feb  5 14:20:49 2007
@@ -90,20 +90,6 @@
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>offline-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jsr88-cli</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
- 
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>unavailable-client-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -131,8 +117,7 @@
                 <directory>${pom.basedir}/src/main/var/config</directory>
                 <includes>
                     <include>config.xml</include>
-                    <include>offline-deployer-config.xml</include>
-                    <include>jsr88-configurer-config.xml</include>
+                    <include>offline-deployer-list</include>
                 </includes>
                 <filtering>true</filtering>
             </resource>
@@ -212,8 +197,7 @@
                                 <move todir="${project.build.directory}/scratch">
                                     <fileset dir="${project.build.directory}/classes">
                                         <include name="config.xml"/>
-                                        <include name="offline-deployer-config.xml"/>
-                                        <include name="jsr88-configurer-config.xml"/>
+                                        <include name="offline-deployer-list"/>
                                     </fileset>
                                 </move>
                             </tasks>

Modified: geronimo/server/trunk/assemblies/geronimo-framework/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-framework/src/main/assembly/bin.xml?view=diff&rev=503905&r1=503904&r2=503905
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-framework/src/main/assembly/bin.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-framework/src/main/assembly/bin.xml Mon Feb  5 14:20:49 2007
@@ -132,11 +132,17 @@
         <fileSet>
             <directory>target/scratch</directory>
             <outputDirectory>var/config</outputDirectory>
+            <includes>
+                <include>offline-deployer-list</include>
+            </includes>
+        </fileSet>
+        
+        <fileSet>
+            <directory>target/scratch</directory>
+            <outputDirectory>var/config</outputDirectory>
             <fileMode>0644</fileMode>
             <includes>
                 <include>config.xml</include>
-                <include>jsr88-configurer-config.xml</include>
-                <include>offline-deployer-config.xml</include>
             </includes>
         </fileSet>
     </fileSets>

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml?view=diff&rev=503905&r1=503904&r2=503905
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml Mon Feb  5 14:20:49 2007
@@ -207,27 +207,6 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>online-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>offline-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jsr88-cli</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -345,33 +324,12 @@
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jsr88-jar-configurer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jsr88-rar-configurer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jsr88-war-configurer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jsr88-ear-configurer</artifactId>
+            <artifactId>online-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
         
-        <dependency>
+       <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>openjpa</artifactId>
             <version>${version}</version>
@@ -399,15 +357,14 @@
             <!--
             HACK: Because this is a pom packaging and assembly files/file is broke
                   we need to filter with the resources plugin... and must be a jar packaging
-                  because for some reason maven-resources-plugin can not
+                  because for some %^&#ing reason maven-resources-plugin can not
                   be attached!!!!
             -->
             <resource>
                 <directory>${pom.basedir}/src/main/var/config</directory>
                 <includes>
                     <include>config.xml</include>
-                    <include>offline-deployer-config.xml</include>
-                    <include>jsr88-configurer-config.xml</include>
+                    <include>offline-deployer-list</include>
                 </includes>
                 <filtering>true</filtering>
             </resource>
@@ -482,8 +439,7 @@
                                 <move todir="${project.build.directory}/scratch">
                                     <fileset dir="${project.build.directory}/classes">
                                         <include name="config.xml"/>
-                                        <include name="offline-deployer-config.xml"/>
-                                        <include name="jsr88-configurer-config.xml"/>
+                                        <include name="offline-deployer-list"/>
                                     </fileset>
                                 </move>
                             </tasks>

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/assembly/bin.xml?view=diff&rev=503905&r1=503904&r2=503905
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/assembly/bin.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/assembly/bin.xml Mon Feb  5 14:20:49 2007
@@ -145,11 +145,17 @@
         <fileSet>
             <directory>target/scratch</directory>
             <outputDirectory>var/config</outputDirectory>
+            <includes>
+                <include>offline-deployer-list</include>
+            </includes>
+        </fileSet>
+        
+        <fileSet>
+            <directory>target/scratch</directory>
+            <outputDirectory>var/config</outputDirectory>
             <fileMode>0644</fileMode>
             <includes>
                 <include>config.xml</include>
-                <include>jsr88-configurer-config.xml</include>
-                <include>offline-deployer-config.xml</include>
             </includes>
         </fileSet>
     </fileSets>

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml?view=diff&rev=503905&r1=503904&r2=503905
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml Mon Feb  5 14:20:49 2007
@@ -94,7 +94,7 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
-
+        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>remote-deploy-jetty</artifactId>
@@ -125,41 +125,6 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>offline-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jsr88-cli</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
- 
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jsr88-rar-configurer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jsr88-war-configurer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jsr88-ear-configurer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>unavailable-client-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -194,8 +159,7 @@
                 <directory>${pom.basedir}/src/main/var/config</directory>
                 <includes>
                     <include>config.xml</include>
-                    <include>offline-deployer-config.xml</include>
-                    <include>jsr88-configurer-config.xml</include>
+                    <include>offline-deployer-list</include>
                 </includes>
                 <filtering>true</filtering>
             </resource>
@@ -270,8 +234,7 @@
                                 <move todir="${project.build.directory}/scratch">
                                     <fileset dir="${project.build.directory}/classes">
                                         <include name="config.xml"/>
-                                        <include name="offline-deployer-config.xml"/>
-                                        <include name="jsr88-configurer-config.xml"/>
+                                        <include name="offline-deployer-list"/>
                                     </fileset>
                                 </move>
                             </tasks>

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/assembly/bin.xml?view=diff&rev=503905&r1=503904&r2=503905
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/assembly/bin.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/assembly/bin.xml Mon Feb  5 14:20:49 2007
@@ -132,11 +132,17 @@
         <fileSet>
             <directory>target/scratch</directory>
             <outputDirectory>var/config</outputDirectory>
+            <includes>
+                <include>offline-deployer-list</include>
+            </includes>
+        </fileSet>
+        
+        <fileSet>
+            <directory>target/scratch</directory>
+            <outputDirectory>var/config</outputDirectory>
             <fileMode>0644</fileMode>
             <includes>
                 <include>config.xml</include>
-                <include>jsr88-configurer-config.xml</include>
-                <include>offline-deployer-config.xml</include>
             </includes>
         </fileSet>
     </fileSets>

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/pom.xml?view=diff&rev=503905&r1=503904&r2=503905
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/pom.xml Mon Feb  5 14:20:49 2007
@@ -322,49 +322,7 @@
             <type>car</type>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>offline-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jsr88-cli</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jsr88-jar-configurer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jsr88-rar-configurer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jsr88-war-configurer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jsr88-ear-configurer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
+       <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>openjpa</artifactId>
             <version>${version}</version>
@@ -379,8 +337,7 @@
                 <directory>${pom.basedir}/src/main/var/config</directory>
                 <includes>
                     <include>config.xml</include>
-                    <include>offline-deployer-config.xml</include>
-                    <include>jsr88-configurer-config.xml</include>
+                    <include>offline-deployer-list</include>
                 </includes>
                 <filtering>true</filtering>
             </resource>
@@ -455,8 +412,7 @@
                                 <move todir="${project.build.directory}/scratch">
                                     <fileset dir="${project.build.directory}/classes">
                                         <include name="config.xml"/>
-                                        <include name="offline-deployer-config.xml"/>
-                                        <include name="jsr88-configurer-config.xml"/>
+                                        <include name="offline-deployer-list"/>
                                     </fileset>
                                 </move>
                             </tasks>

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/assembly/bin.xml?view=diff&rev=503905&r1=503904&r2=503905
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/assembly/bin.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/assembly/bin.xml Mon Feb  5 14:20:49 2007
@@ -145,11 +145,17 @@
         <fileSet>
             <directory>target/scratch</directory>
             <outputDirectory>var/config</outputDirectory>
+            <includes>
+                <include>offline-deployer-list</include>
+            </includes>
+        </fileSet>
+        
+        <fileSet>
+            <directory>target/scratch</directory>
+            <outputDirectory>var/config</outputDirectory>
             <fileMode>0644</fileMode>
             <includes>
                 <include>config.xml</include>
-                <include>jsr88-configurer-config.xml</include>
-                <include>offline-deployer-config.xml</include>
             </includes>
         </fileSet>
     </fileSets>

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml?view=diff&rev=503905&r1=503904&r2=503905
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml Mon Feb  5 14:20:49 2007
@@ -122,41 +122,6 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>offline-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jsr88-cli</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jsr88-rar-configurer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jsr88-war-configurer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jsr88-ear-configurer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
@@ -194,8 +159,7 @@
                 <directory>${pom.basedir}/src/main/var/config</directory>
                 <includes>
                     <include>config.xml</include>
-                    <include>offline-deployer-config.xml</include>
-                    <include>jsr88-configurer-config.xml</include>
+                    <include>offline-deployer-list</include>
                 </includes>
                 <filtering>true</filtering>
             </resource>
@@ -270,8 +234,7 @@
                                 <move todir="${project.build.directory}/scratch">
                                     <fileset dir="${project.build.directory}/classes">
                                         <include name="config.xml"/>
-                                        <include name="offline-deployer-config.xml"/>
-                                        <include name="jsr88-configurer-config.xml"/>
+                                        <include name="offline-deployer-list"/>
                                     </fileset>
                                 </move>
                             </tasks>

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/assembly/bin.xml?view=diff&rev=503905&r1=503904&r2=503905
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/assembly/bin.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/assembly/bin.xml Mon Feb  5 14:20:49 2007
@@ -132,11 +132,17 @@
         <fileSet>
             <directory>target/scratch</directory>
             <outputDirectory>var/config</outputDirectory>
+            <includes>
+                <include>offline-deployer-list</include>
+            </includes>
+        </fileSet>
+        
+        <fileSet>
+            <directory>target/scratch</directory>
+            <outputDirectory>var/config</outputDirectory>
             <fileMode>0644</fileMode>
             <includes>
                 <include>config.xml</include>
-                <include>jsr88-configurer-config.xml</include>
-                <include>offline-deployer-config.xml</include>
             </includes>
         </fileSet>
     </fileSets>

Modified: geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml?view=diff&rev=503905&r1=503904&r2=503905
==============================================================================
--- geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml Mon Feb  5 14:20:49 2007
@@ -87,6 +87,9 @@
         </xml-attribute>
     </gbean>
 
+
+    <gbean name="ClientConfigurer" class="org.apache.geronimo.client.builder.jsr88.ClientConfigurer"/>
+
     <gbean name="SwitchingClientServiceRefBuilder" class="org.apache.geronimo.naming.deployment.SwitchingServiceRefBuilder">
         <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
         <references name="JAXRPCBuilder">

Modified: geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml?view=diff&rev=503905&r1=503904&r2=503905
==============================================================================
--- geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml Mon Feb  5 14:20:49 2007
@@ -85,4 +85,6 @@
         <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee</attribute>
     </gbean>
 
+    <gbean name="RARConfigurer" class="org.apache.geronimo.connector.deployment.RARConfigurer"/>
+
 </module>

Modified: geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml?view=diff&rev=503905&r1=503904&r2=503905
==============================================================================
--- geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml Mon Feb  5 14:20:49 2007
@@ -142,6 +142,8 @@
         <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee</attribute>
     </gbean>
 
+    <gbean name="EARConfigurer" class="org.apache.geronimo.j2ee.jsr88.EARConfigurer"/>
+
     <gbean name="SwitchingServiceRefBuilder" class="org.apache.geronimo.naming.deployment.SwitchingServiceRefBuilder">
         <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
         <references name="JAXRPCBuilder">

Modified: geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml?view=diff&rev=503905&r1=503904&r2=503905
==============================================================================
--- geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml Mon Feb  5 14:20:49 2007
@@ -128,4 +128,6 @@
         <attribute name="servletName">dummy</attribute>
     </gbean>
 
+    <gbean name="Jetty6WARConfigurer" class="org.apache.geronimo.web.deployment.WARConfigurer"/>
+
 </module>

Modified: geronimo/server/trunk/configs/online-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/online-deployer/pom.xml?view=diff&rev=503905&r1=503904&r2=503905
==============================================================================
--- geronimo/server/trunk/configs/online-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/online-deployer/pom.xml Mon Feb  5 14:20:49 2007
@@ -45,7 +45,7 @@
                             <Extension-Dirs>lib/ext</Extension-Dirs>
                         </manifestEntries>
                         <manifest>
-                            <mainClass>org.apache.geronimo.kernel.util.MainBootstrapper</mainClass>
+                            <mainClass>org.apache.geronimo.deployment.cli.DeployTool</mainClass>
                         </manifest>
                     </archive>
 
@@ -74,10 +74,32 @@
                             <version>${version}</version>
                         </element>
                         <element>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-deploy-jsr88</artifactId>
+                            <version>${version}</version>
+                        </element>
+                        <element>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-deploy-tool</artifactId>
+                            <version>${version}</version>
+                        </element>
+                        <element>
+                            <groupId>org.apache.geronimo.specs</groupId>
+                            <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
+                        </element>
+                        <element>
                             <groupId>mx4j</groupId>
                             <artifactId>mx4j</artifactId>
                         </element>
                         <element>
+                            <groupId>mx4j</groupId>
+                            <artifactId>mx4j-remote</artifactId>
+                        </element>
+                        <element>
+                            <groupId>commons-cli</groupId>
+                            <artifactId>commons-cli</artifactId>
+                        </element>
+                        <element>
                             <groupId>commons-logging</groupId>
                             <artifactId>commons-logging</artifactId>
                         </element>
@@ -88,6 +110,10 @@
                         <element>
                             <groupId>log4j</groupId>
                             <artifactId>log4j</artifactId>
+                        </element>
+                        <element>
+                            <groupId>jline</groupId>
+                            <artifactId>jline</artifactId>
                         </element>
                         <element>
                             <groupId>xpp3</groupId>

Modified: geronimo/server/trunk/configs/online-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/online-deployer/src/plan/plan.xml?view=diff&rev=503905&r1=503904&r2=503905
==============================================================================
--- geronimo/server/trunk/configs/online-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/online-deployer/src/plan/plan.xml Mon Feb  5 14:20:49 2007
@@ -19,84 +19,5 @@
 <!-- $Rev$ $Date$ -->
 
 <module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
-
-    <!-- ServerInfo service -->
-    <gbean name="ServerInfo" class="org.apache.geronimo.system.serverinfo.BasicServerInfo"/>
-
-    <!--Repository-->
-    <gbean name="Repository" class="org.apache.geronimo.system.repository.Maven2Repository">
-        <attribute name="root">repository/</attribute>
-        <reference name="ServerInfo">
-            <name>ServerInfo</name>
-        </reference>
-    </gbean>
-
-    <!--Configuration Store service-->
-    <gbean name="Local" class="org.apache.geronimo.system.configuration.RepositoryConfigurationStore">
-        <reference name="Repository">
-            <name>Repository</name>
-        </reference>
-    </gbean>
-
-    <!--User-editable attribute service-->
-    <gbean name="AttributeManager" class="org.apache.geronimo.system.configuration.LocalAttributeManager">
-        <reference name="ServerInfo">
-            <name>ServerInfo</name>
-        </reference>
-        <attribute name="readOnly">true</attribute>
-        <attribute name="configFile">var/config/jsr88-configurer-config.xml</attribute>
-    </gbean>
-
-    <!-- ArtifactManager -->
-    <gbean name="ArtifactManager" class="org.apache.geronimo.kernel.repository.DefaultArtifactManager"/>
-
-    <!-- ArtifactResolver -->
-    <gbean name="ArtifactResolver" class="org.apache.geronimo.system.resolver.ExplicitDefaultArtifactResolver">
-        <reference name="ArtifactManager">
-            <name>ArtifactManager</name>
-        </reference>
-        <reference name="Repositories"></reference>
-        <attribute name="versionMapLocation">var/config/artifact_aliases.properties</attribute>
-        <reference name="ServerInfo">
-            <name>ServerInfo</name>
-        </reference>
-    </gbean>
-
-    <!--Server attribute service-->
-    <gbean name="ServerAttributeManager" class="org.apache.geronimo.system.configuration.SwitchableLocalAttributeManager">
-        <reference name="ServerInfo">
-            <name>ServerInfo</name>
-        </reference>
-        <attribute name="configFile">var/config/config.xml</attribute>
-    </gbean>
-
-    <!--Configuration Manager service-->
-    <gbean name="ConfigurationManager" class="org.apache.geronimo.kernel.config.EditableKernelConfigurationManager">
-        <reference name="Repositories"></reference>
-        <reference name="Stores"></reference>
-        <reference name="Watchers"></reference>
-        <reference name="AttributeStore">
-            <name>AttributeManager</name>
-        </reference>
-        <reference name="PersistentConfigurationList">
-            <type>AttributeStore</type>
-            <name>ServerAttributeManager</name>
-        </reference>
-        <reference name="ArtifactManager">
-            <name>ArtifactManager</name>
-        </reference>
-        <reference name="ArtifactResolver">
-            <name>ArtifactResolver</name>
-        </reference>
-    </gbean>
-
-    <!-- Logging service -->
-    <gbean name="Logger" class="org.apache.geronimo.system.logging.log4j.Log4jService">
-        <attribute name="configFileName">var/log/deployer-log4j.properties</attribute>
-        <attribute name="refreshPeriodSeconds">60</attribute>
-        <reference name="ServerInfo">
-            <name>ServerInfo</name>
-        </reference>
-    </gbean>
-
+    <environment/>
 </module>

Modified: geronimo/server/trunk/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/pom.xml?view=diff&rev=503905&r1=503904&r2=503905
==============================================================================
--- geronimo/server/trunk/configs/pom.xml (original)
+++ geronimo/server/trunk/configs/pom.xml Mon Feb  5 14:20:49 2007
@@ -128,15 +128,9 @@
         <module>javamail</module>
         <module>jsp-examples-jetty</module>
         <module>jsp-examples-tomcat</module>
-        <module>jsr88-cli</module>
-        <module>jsr88-jar-configurer</module>
-        <module>jsr88-rar-configurer</module>
-        <module>jsr88-war-configurer</module>
-        <module>jsr88-ear-configurer</module>
         <module>ldap-demo-jetty</module>
         <module>ldap-demo-tomcat</module>
         <module>ldap-realm</module>
-        <module>offline-deployer</module>
         <module>online-deployer</module>
         <module>openejb</module>
         <module>openejb-deployer</module>

Modified: geronimo/server/trunk/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/jsr88/ClientConfigurer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/jsr88/ClientConfigurer.java?view=diff&rev=503905&r1=503904&r2=503905
==============================================================================
--- geronimo/server/trunk/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/jsr88/ClientConfigurer.java (original)
+++ geronimo/server/trunk/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/jsr88/ClientConfigurer.java Mon Feb  5 14:20:49 2007
@@ -20,15 +20,16 @@
 
 package org.apache.geronimo.client.builder.jsr88;
 
+import javax.enterprise.deploy.spi.DeploymentConfiguration;
 import javax.enterprise.deploy.model.DeployableObject;
 import javax.enterprise.deploy.shared.ModuleType;
-import javax.enterprise.deploy.spi.DeploymentConfiguration;
 
 import org.apache.geronimo.deployment.ModuleConfigurer;
+import org.apache.geronimo.j2ee.jsr88.EARConfiguration;
+import org.apache.geronimo.j2ee.jsr88.EARConfigurer;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
-import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-import org.apache.geronimo.j2ee.jsr88.EARConfiguration;
 
 /**
  *

Modified: geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/factories/DeploymentFactoryImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/factories/DeploymentFactoryImpl.java?view=diff&rev=503905&r1=503904&r2=503905
==============================================================================
--- geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/factories/DeploymentFactoryImpl.java (original)
+++ geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/factories/DeploymentFactoryImpl.java Mon Feb  5 14:20:49 2007
@@ -17,10 +17,12 @@
 
 package org.apache.geronimo.deployment.plugin.factories;
 
-import java.io.IOException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
+import org.apache.geronimo.deployment.plugin.DisconnectedDeploymentManager;
+import org.apache.geronimo.deployment.plugin.jmx.LocalDeploymentManager;
+import org.apache.geronimo.deployment.plugin.jmx.RemoteDeploymentManager;
+import org.apache.geronimo.kernel.KernelRegistry;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 import javax.enterprise.deploy.shared.factories.DeploymentFactoryManager;
 import javax.enterprise.deploy.spi.DeploymentManager;
@@ -29,15 +31,9 @@
 import javax.management.remote.JMXConnector;
 import javax.management.remote.JMXConnectorFactory;
 import javax.management.remote.JMXServiceURL;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.deployment.plugin.DisconnectedDeploymentManager;
-import org.apache.geronimo.deployment.plugin.jmx.LocalDeploymentManager;
-import org.apache.geronimo.deployment.plugin.jmx.RemoteDeploymentManager;
-import org.apache.geronimo.kernel.GBeanNotFoundException;
-import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.kernel.KernelRegistry;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Implementation of JSR88 DeploymentFactory.
@@ -54,16 +50,6 @@
     public static final String URI_PREFIX = "deployer:geronimo:";
     private static final int DEFAULT_PORT = 1099;
 
-    private final Kernel baseKernel;
-    
-    public DeploymentFactoryImpl() {
-        baseKernel = null;
-    }
-    
-    public DeploymentFactoryImpl(Kernel baseKernel) {
-        this.baseKernel = baseKernel;
-    }
-    
     public String getDisplayName() {
         return "Apache Geronimo";
     }
@@ -135,7 +121,22 @@
 
         try {
             if (params.getProtocol().equals("jmx")) {
-                return newRemoteDeploymentManager(username, password, params);
+                Map environment = new HashMap();
+                String[] credentials = new String[]{username, password};
+                environment.put(JMXConnector.CREDENTIALS, credentials);
+                try {
+                    JMXServiceURL address = new JMXServiceURL("service:jmx:rmi:///jndi/rmi://"+params.getHost()+":"+params.getPort()+"/JMXConnector");
+                    JMXConnector jmxConnector = JMXConnectorFactory.connect(address, environment);
+                    RemoteDeploymentManager manager = new RemoteDeploymentManager(jmxConnector, params.getHost());
+                    if(!manager.isSameMachine()) {
+                        manager.setAuthentication(username, password);
+                    }
+                    return manager;
+                } catch (IOException e) {
+                    throw (DeploymentManagerCreationException)new DeploymentManagerCreationException(e.getMessage()).initCause(e);
+                } catch (SecurityException e) {
+                    throw (AuthenticationFailedException) new AuthenticationFailedException("Invalid login.").initCause(e);
+                }
             } else if(params.getProtocol().equals("inVM")) {
                 return new LocalDeploymentManager(KernelRegistry.getKernel(params.getHost()));
             } else {
@@ -152,33 +153,6 @@
         }
     }
 
-    protected DeploymentManager newRemoteDeploymentManager(String username, String password, ConnectParams params) throws DeploymentManagerCreationException, AuthenticationFailedException {
-        Map environment = new HashMap();
-        String[] credentials = new String[]{username, password};
-        environment.put(JMXConnector.CREDENTIALS, credentials);
-        try {
-            JMXServiceURL address = new JMXServiceURL("service:jmx:rmi:///jndi/rmi://"+params.getHost()+":"+params.getPort()+"/JMXConnector");
-            JMXConnector jmxConnector = JMXConnectorFactory.connect(address, environment);
-            RemoteDeploymentManager manager;
-            if (null != baseKernel) {
-                manager = (RemoteDeploymentManager) baseKernel.getGBean(RemoteDeploymentManager.class);
-            } else {
-                manager = new RemoteDeploymentManager(Collections.EMPTY_LIST);
-            }
-            manager.init(jmxConnector, params.getHost());
-            if(!manager.isSameMachine()) {
-                manager.setAuthentication(username, password);
-            }
-            return manager;
-        } catch (GBeanNotFoundException e) {
-            throw (DeploymentManagerCreationException)new DeploymentManagerCreationException(e.getMessage()).initCause(e);
-        } catch (IOException e) {
-            throw (DeploymentManagerCreationException)new DeploymentManagerCreationException(e.getMessage()).initCause(e);
-        } catch (SecurityException e) {
-            throw (AuthenticationFailedException) new AuthenticationFailedException("Invalid login.").initCause(e);
-        }
-    }
-
     static {
         DeploymentFactoryManager manager = DeploymentFactoryManager.getInstance();
         manager.registerDeploymentFactory(new DeploymentFactoryImpl());
@@ -212,4 +186,7 @@
         }
     }
 
+    public static void main(String[] args) {
+        System.out.println("Parsed: "+new DeploymentFactoryImpl().parseURI("deployer:geronimo:inVM"));
+    }
 }

Modified: geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java?view=diff&rev=503905&r1=503904&r2=503905
==============================================================================
--- geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java (original)
+++ geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java Mon Feb  5 14:20:49 2007
@@ -19,9 +19,11 @@
 import java.io.File;
 import java.io.InputStream;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.HashMap;
 
 import javax.enterprise.deploy.model.DeployableObject;
 import javax.enterprise.deploy.shared.DConfigBeanVersionType;
@@ -47,6 +49,8 @@
 import org.apache.geronimo.deployment.plugin.local.StopCommand;
 import org.apache.geronimo.deployment.plugin.local.UndeployCommand;
 import org.apache.geronimo.gbean.AbstractName;
+import org.apache.geronimo.gbean.AbstractNameQuery;
+import org.apache.geronimo.kernel.GBeanNotFoundException;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.config.ConfigurationInfo;
 import org.apache.geronimo.kernel.config.ConfigurationManager;
@@ -64,15 +68,8 @@
     protected Kernel kernel;
     private ConfigurationManager configurationManager;
     private CommandContext commandContext;
-    private final Collection<ModuleConfigurer> moduleConfigurers;
+    protected final Map<ModuleType, ModuleConfigurer> moduleConfigurers = new HashMap<ModuleType, ModuleConfigurer>();
 
-    public JMXDeploymentManager(Collection<ModuleConfigurer> moduleConfigurers) {
-        if (null == moduleConfigurers) {
-            throw new IllegalArgumentException("moduleConfigurers is required");
-        }
-        this.moduleConfigurers = moduleConfigurers;
-    }
-    
     protected void initialize(Kernel kernel) {
         this.kernel = kernel;
         configurationManager = ConfigurationUtil.getConfigurationManager(kernel);
@@ -291,13 +288,7 @@
         if (dObj == null) {
             throw new NullPointerException("No deployable object supplied to configure");
         }
-        ModuleConfigurer configurer = null;
-        for (ModuleConfigurer moduleConfigurer : moduleConfigurers) {
-            if (moduleConfigurer.getModuleType() == dObj.getType()) {
-                configurer = moduleConfigurer;
-               break;
-            }
-        }
+        ModuleConfigurer configurer = moduleConfigurers.get(dObj.getType());
         if (configurer == null) {
             throw new InvalidModuleException("No configurer for module type: " + dObj.getType() + " registered");
         }

Modified: geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/LocalDeploymentManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/LocalDeploymentManager.java?view=diff&rev=503905&r1=503904&r2=503905
==============================================================================
--- geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/LocalDeploymentManager.java (original)
+++ geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/LocalDeploymentManager.java Mon Feb  5 14:20:49 2007
@@ -16,17 +16,15 @@
  */
 package org.apache.geronimo.deployment.plugin.jmx;
 
-import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.deployment.ModuleConfigurer;
+import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.GBeanNotFoundException;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.AbstractNameQuery;
-import org.apache.geronimo.kernel.GBeanNotFoundException;
-import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.deployment.ModuleConfigurer;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * Connects to a kernel in the same VM.
@@ -38,23 +36,16 @@
     private static final AbstractNameQuery CONFIGURER_QUERY = new AbstractNameQuery(ModuleConfigurer.class.getName());
 
     public LocalDeploymentManager(Kernel kernel) {
-        super(loadModuleConfigurers(kernel));
         initialize(kernel);
-    }
-    
-    private static Collection<ModuleConfigurer> loadModuleConfigurers(Kernel kernel) {
-        Collection<ModuleConfigurer> moduleConfigurers = new ArrayList<ModuleConfigurer>();
         Set configurerNames = kernel.listGBeans(CONFIGURER_QUERY);
         for (Object configurerName : configurerNames) {
             AbstractName name = (AbstractName) configurerName;
             try {
                 ModuleConfigurer configurer = (ModuleConfigurer) kernel.getGBean(name);
-                moduleConfigurers.add(configurer);
+                moduleConfigurers.put(configurer.getModuleType(), configurer);
             } catch (GBeanNotFoundException e) {
                 log.warn("No gbean found for name returned in query : " + name);
             }
         }
-        return moduleConfigurers;
     }
-    
 }

Modified: geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/RemoteDeploymentManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/RemoteDeploymentManager.java?view=diff&rev=503905&r1=503904&r2=503905
==============================================================================
--- geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/RemoteDeploymentManager.java (original)
+++ geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/RemoteDeploymentManager.java Mon Feb  5 14:20:49 2007
@@ -22,15 +22,13 @@
 import java.net.InetAddress;
 import java.net.NetworkInterface;
 import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
 import java.util.Enumeration;
 import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
 import java.util.Set;
-
+import java.util.Map;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Arrays;
 import javax.enterprise.deploy.shared.CommandType;
 import javax.enterprise.deploy.spi.Target;
 import javax.enterprise.deploy.spi.TargetModuleID;
@@ -40,9 +38,6 @@
 import javax.management.remote.JMXConnector;
 import javax.security.auth.login.FailedLoginException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.deployment.ModuleConfigurer;
 import org.apache.geronimo.deployment.plugin.GeronimoDeploymentManager;
 import org.apache.geronimo.deployment.plugin.local.AbstractDeployCommand;
 import org.apache.geronimo.deployment.plugin.local.DistributeCommand;
@@ -50,16 +45,16 @@
 import org.apache.geronimo.deployment.plugin.remote.RemoteDeployUtil;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.AbstractNameQuery;
-import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoBuilder;
-import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.system.jmx.KernelDelegate;
-import org.apache.geronimo.system.plugin.DownloadPoller;
 import org.apache.geronimo.system.plugin.DownloadResults;
-import org.apache.geronimo.system.plugin.PluginInstaller;
 import org.apache.geronimo.system.plugin.PluginList;
+import org.apache.geronimo.system.plugin.DownloadPoller;
 import org.apache.geronimo.system.plugin.PluginMetadata;
+import org.apache.geronimo.system.plugin.PluginInstaller;
 import org.apache.geronimo.system.plugin.PluginRepositoryList;
+import org.apache.geronimo.kernel.repository.Artifact;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * Connects to a Kernel in a remote VM (may or many not be on the same machine).
@@ -72,17 +67,13 @@
     private JMXConnector jmxConnector;
     private boolean isSameMachine;
 
-    public RemoteDeploymentManager(Collection<ModuleConfigurer> moduleConfigurers) {
-        super(moduleConfigurers);
-    }
-
-    public void init(JMXConnector jmxConnector, String hostname) throws IOException {
+    public RemoteDeploymentManager(JMXConnector jmxConnector, String hostname) throws IOException {
         this.jmxConnector = jmxConnector;
         MBeanServerConnection mbServerConnection = jmxConnector.getMBeanServerConnection();
         initialize(new KernelDelegate(mbServerConnection));
         checkSameMachine(hostname);
     }
-    
+
     public boolean isSameMachine() {
         return isSameMachine;
     }
@@ -283,22 +274,4 @@
         }
         return (URL[]) list.toArray(new URL[list.size()]);
     }
-    
-    public static final GBeanInfo GBEAN_INFO;
-    public static final String GBEAN_REF_MODULE_CONFIGURERS = "ModuleConfigurers";
-    
-    static {
-        GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(RemoteDeploymentManager.class, "RemoteDeploymentManager");
-        infoFactory.addInterface(GeronimoDeploymentManager.class);
-        infoFactory.addReference(GBEAN_REF_MODULE_CONFIGURERS, ModuleConfigurer.class);
-
-        infoFactory.setConstructor(new String[] {GBEAN_REF_MODULE_CONFIGURERS});
-        
-        GBEAN_INFO = infoFactory.getBeanInfo();
-    }
-
-    public static GBeanInfo getGBeanInfo() {
-        return GBEAN_INFO;
-    }
-
 }

Modified: geronimo/server/trunk/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/AbstractCommand.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/AbstractCommand.java?view=diff&rev=503905&r1=503904&r2=503905
==============================================================================
--- geronimo/server/trunk/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/AbstractCommand.java (original)
+++ geronimo/server/trunk/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/AbstractCommand.java Mon Feb  5 14:20:49 2007
@@ -17,20 +17,21 @@
 
 package org.apache.geronimo.deployment.cli;
 
-import java.io.OutputStreamWriter;
+import org.apache.geronimo.common.DeploymentException;
+
+import javax.enterprise.deploy.spi.status.ProgressObject;
+import javax.enterprise.deploy.spi.status.ProgressListener;
+import javax.enterprise.deploy.spi.status.ProgressEvent;
+import javax.enterprise.deploy.spi.TargetModuleID;
+import javax.enterprise.deploy.spi.Target;
+import javax.enterprise.deploy.spi.DeploymentManager;
 import java.io.PrintWriter;
-import java.util.HashSet;
+import java.io.OutputStreamWriter;
 import java.util.List;
 import java.util.Set;
-
-import javax.enterprise.deploy.spi.DeploymentManager;
-import javax.enterprise.deploy.spi.Target;
-import javax.enterprise.deploy.spi.TargetModuleID;
-import javax.enterprise.deploy.spi.status.ProgressEvent;
-import javax.enterprise.deploy.spi.status.ProgressListener;
-import javax.enterprise.deploy.spi.status.ProgressObject;
-
-import org.apache.geronimo.common.DeploymentException;
+import java.util.HashSet;
+import java.util.Collection;
+import java.util.LinkedList;
 
 /**
  * Base class for CLI deployer commands.  Tracks some simple properties and

Modified: geronimo/server/trunk/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/DeployTool.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/DeployTool.java?view=diff&rev=503905&r1=503904&r2=503905
==============================================================================
--- geronimo/server/trunk/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/DeployTool.java (original)
+++ geronimo/server/trunk/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/DeployTool.java Mon Feb  5 14:20:49 2007
@@ -17,30 +17,11 @@
 
 package org.apache.geronimo.deployment.cli;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
 import org.apache.geronimo.common.DeploymentException;
-import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoBuilder;
-import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.kernel.util.Main;
+import org.apache.geronimo.common.GeronimoEnvironment;
 
+import java.util.*;
+import java.io.*;
 
 /**
  * The main class for the CLI deployer.  Handles chunking the input arguments
@@ -54,39 +35,56 @@
  *
  * @version $Rev$ $Date$
  */
-public class DeployTool implements Main {
+public class DeployTool {
+    private final static Map commands = new HashMap();
 
-    private static final Collection<DeployCommand> commands = new ArrayList<DeployCommand>();
+    public static void registerCommand(DeployCommand command) {
+        String key = command.getCommandName();
+        if(commands.containsKey(key)) {
+            throw new IllegalArgumentException("Command "+key+" is already registered!");
+        } else {
+            commands.put(key, command);
+        }
+    }
+
+    private static DeployCommand getCommand(String name) {
+        return (DeployCommand) commands.get(name);
+    }
+
+    private static DeployCommand[] getAllCommands() {
+        DeployCommand[] list = (DeployCommand[]) commands.values().toArray(new DeployCommand[0]);
+        Arrays.sort(list, new Comparator() {
+            public int compare(Object o1, Object o2) {
+                return ((DeployCommand)o1).getCommandName().compareTo(((DeployCommand)o2).getCommandName());
+            }
+        });
+        return list;
+    }
 
     static {
-        commands.add(new CommandLogin());
-        commands.add(new CommandDeploy());
-        commands.add(new CommandDistribute());
-        commands.add(new CommandListModules());
-        commands.add(new CommandListTargets());
-        commands.add(new CommandRedeploy());
-        commands.add(new CommandStart());
-        commands.add(new CommandStop());
-        commands.add(new CommandRestart());
-        commands.add(new CommandUndeploy());
-        commands.add(new CommandListConfigurations());
-        commands.add(new CommandInstallCAR());
+        // Perform initialization tasks common with the various Geronimo process environments.
+        GeronimoEnvironment.init();
+        
+        registerCommand(new CommandLogin());
+        registerCommand(new CommandDeploy());
+        registerCommand(new CommandDistribute());
+        registerCommand(new CommandListModules());
+        registerCommand(new CommandListTargets());
+        registerCommand(new CommandRedeploy());
+        registerCommand(new CommandStart());
+        registerCommand(new CommandStop());
+        registerCommand(new CommandRestart());
+        registerCommand(new CommandUndeploy());
+        registerCommand(new CommandListConfigurations());
+        registerCommand(new CommandInstallCAR());
     }
 
     private boolean failed = false;
     String[] generalArgs = new String[0];
     ServerConnection con = null;
     private boolean multipleCommands = false;
-    private final Kernel kernel;
 
-    public DeployTool(Kernel kernel) {
-        if (null == kernel) {
-            throw new IllegalArgumentException("kernel is required");
-        }
-        this.kernel = kernel;
-    }
-    
-    public int execute(String args[]) {
+    public boolean execute(String args[]) {
         PrintWriter out = new PrintWriter(new OutputStreamWriter(System.out), true);
         InputStream in = System.in;
 
@@ -156,7 +154,7 @@
             } else {
                 try {
                     if(con == null) {
-                        con = new ServerConnection(generalArgs, out, in, kernel);
+                        con = new ServerConnection(generalArgs, out, in);
                     }
                     try {
                         dc.execute(out, con, commandArgs);
@@ -180,7 +178,7 @@
         }
         out.flush();
         System.out.flush();
-        return failed ? 1 : 0;
+        return !failed;
     }
 
     public static String[] splitCommand(String line) {
@@ -312,40 +310,11 @@
         return (String[]) list.toArray(new String[list.size()]);
     }
 
-    private DeployCommand getCommand(String commandName) {
-        for (DeployCommand command : commands) {
-            if (command.getCommandName().equals(commandName)) {
-                return command;
-            }
+    public static void main(String[] args) {
+        if(!new DeployTool().execute(args)) {
+            System.exit(1);
+        } else {
+            System.exit(0);
         }
-        return null;
     }
-
-    private DeployCommand[] getAllCommands() {
-        DeployCommand[] list = (DeployCommand[]) commands.toArray(new DeployCommand[0]);
-        Arrays.sort(list, new Comparator() {
-            public int compare(Object o1, Object o2) {
-                return ((DeployCommand)o1).getCommandName().compareTo(((DeployCommand)o2).getCommandName());
-            }
-        });
-        return list;
-    }
-    
-    
-    public static final GBeanInfo GBEAN_INFO;
-    
-    static {
-        GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic("DeployTool", DeployTool.class, "DeployTool");
-
-        infoBuilder.addInterface(Main.class);
-        
-        infoBuilder.setConstructor(new String[] {"kernel"});
-        
-        GBEAN_INFO = infoBuilder.getBeanInfo();
-    }
-    
-    public static GBeanInfo getGBeanInfo() {
-        return GBEAN_INFO;
-    }
-
 }

Modified: geronimo/server/trunk/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/ServerConnection.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/ServerConnection.java?view=diff&rev=503905&r1=503904&r2=503905
==============================================================================
--- geronimo/server/trunk/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/ServerConnection.java (original)
+++ geronimo/server/trunk/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/ServerConnection.java Mon Feb  5 14:20:49 2007
@@ -20,11 +20,11 @@
 import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintWriter;
 import java.io.Serializable;
+import java.io.FileNotFoundException;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -41,8 +41,11 @@
 import org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryImpl;
 import org.apache.geronimo.deployment.plugin.jmx.JMXDeploymentManager;
 import org.apache.geronimo.deployment.plugin.jmx.LocalDeploymentManager;
-import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.util.SimpleEncryption;
+import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.config.ConfigurationManager;
+import org.apache.geronimo.kernel.config.ConfigurationUtil;
+import org.apache.geronimo.system.main.LocalServer;
 
 /**
  * Supports online connections to the server, via JSR-88, valid only
@@ -109,13 +112,8 @@
     private SavedAuthentication auth;
     private boolean logToSysErr;
     private boolean verboseMessages;
-    private final Kernel kernel;
 
-    public ServerConnection(String[] args, PrintWriter out, InputStream in, Kernel kernel) throws DeploymentException {
-        if (null == kernel) {
-            throw new IllegalArgumentException("kernel is required");
-        }
-        this.kernel = kernel;
+    public ServerConnection(String[] args, PrintWriter out, InputStream in) throws DeploymentException {
         String uri = null, driver = null, user = null, password = null, host = null;
         Integer port = null;
         this.out = out;
@@ -196,8 +194,17 @@
             uri = DEFAULT_URI + "://" + (host == null ? "" : host) + (port == null ? "" : ":" + port);
         }
         if (offline) {
-            startOfflineDeployer(kernel);
-            manager = new LocalDeploymentManager(kernel);
+            LocalServer localServer;
+            try {
+                localServer = new LocalServer("org.apache.geronimo.configs/j2ee-system//car", "var/config/offline-deployer-list");
+            } catch (Exception e) {
+                throw new DeploymentException("Could not start local server", e);
+            }
+            Kernel kernel = localServer.getKernel();
+            ConfigurationManager configurationManager = ConfigurationUtil.getConfigurationManager(kernel);
+            configurationManager.setOnline(false);
+
+            manager = new LocalDeploymentManager(localServer.getKernel());
         } else {
             tryToConnect(uri, driver, user, password, true);
         }
@@ -206,11 +213,6 @@
         }
     }
 
-    protected void startOfflineDeployer(Kernel kernel) throws DeploymentException {
-        OfflineDeployerStarter offlineDeployerStarter = new OfflineDeployerStarter(kernel);
-        offlineDeployerStarter.start();
-    }
-
     public void close() throws DeploymentException {
         if (manager != null) {
             manager.release();
@@ -230,7 +232,7 @@
         if (driver != null) {
             loadDriver(driver, mgr);
         } else {
-            mgr.registerDeploymentFactory(new DeploymentFactoryImpl(kernel));
+            mgr.registerDeploymentFactory(new DeploymentFactoryImpl());
         }
         String useURI = argURI == null ? DEFAULT_URI : argURI;
 

Modified: geronimo/server/trunk/modules/geronimo-hot-deploy/src/main/java/org/apache/geronimo/deployment/hot/DirectoryHotDeployer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-hot-deploy/src/main/java/org/apache/geronimo/deployment/hot/DirectoryHotDeployer.java?view=diff&rev=503905&r1=503904&r2=503905
==============================================================================
--- geronimo/server/trunk/modules/geronimo-hot-deploy/src/main/java/org/apache/geronimo/deployment/hot/DirectoryHotDeployer.java (original)
+++ geronimo/server/trunk/modules/geronimo-hot-deploy/src/main/java/org/apache/geronimo/deployment/hot/DirectoryHotDeployer.java Mon Feb  5 14:20:49 2007
@@ -142,7 +142,7 @@
 
     public void doStart() throws Exception {
         if (factory == null) {
-            factory = new DeploymentFactoryImpl(kernel);
+            factory = new DeploymentFactoryImpl();
         }
         File dir = serverInfo.resolve(path);
         if (!dir.exists()) {

Modified: geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationUtil.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationUtil.java?view=diff&rev=503905&r1=503904&r2=503905
==============================================================================
--- geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationUtil.java (original)
+++ geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationUtil.java Mon Feb  5 14:20:49 2007
@@ -237,12 +237,12 @@
     }
 
     /**
-     * Gets the name of the ConfigurationManager running in the specified kernel.
+     * Gets a reference or proxy to the ConfigurationManager running in the specified kernel.
      *
-     * @return Its AbstractName
+     * @return The ConfigurationManager
      * @throws IllegalStateException Occurs if a ConfigurationManager cannot be identified
      */
-    public static AbstractName getConfigurationManagerName(Kernel kernel) {
+    public static ConfigurationManager getConfigurationManager(Kernel kernel) {
         Set names = kernel.listGBeans(new AbstractNameQuery(ConfigurationManager.class.getName()));
         for (Iterator iterator = names.iterator(); iterator.hasNext();) {
             AbstractName abstractName = (AbstractName) iterator.next();
@@ -256,18 +256,7 @@
         if (names.size() > 1) {
             throw new IllegalStateException("More than one Configuration Manager was found in the kernel");
         }
-        return (AbstractName) names.iterator().next();
-    }
-    
-    
-    /**
-     * Gets a reference or proxy to the ConfigurationManager running in the specified kernel.
-     *
-     * @return The ConfigurationManager
-     * @throws IllegalStateException Occurs if a ConfigurationManager cannot be identified
-     */
-    public static ConfigurationManager getConfigurationManager(Kernel kernel) {
-        AbstractName configurationManagerName = getConfigurationManagerName(kernel);
+        AbstractName configurationManagerName = (AbstractName) names.iterator().next();
         return (ConfigurationManager) kernel.getProxyManager().createProxy(configurationManagerName, ConfigurationManager.class);
     }
 



Mime
View raw message