geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r697438 - in /geronimo/server/trunk: framework/configs/geronimo-gbean-deployer/src/main/history/ framework/configs/jsr88-cli/src/main/history/ framework/configs/jsr88-deploymentfactory/src/main/history/ framework/configs/plugin/ framework/c...
Date Sun, 21 Sep 2008 00:45:31 GMT
Author: djencks
Date: Sat Sep 20 17:45:30 2008
New Revision: 697438

URL: http://svn.apache.org/viewvc?rev=697438&view=rev
Log:
GERONIMO-4239 Reaarrange some jsr88 related classes to fix a nasty classcast exception in the offline deployer. Move some farming classes around to eliminate an inessential dependency on deployment code

Added:
    geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/plugin/
      - copied from r696856, geronimo/server/trunk/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/plugin/
    geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/plugin/DConfigBeanRootSupport.java
      - copied unchanged from r697435, geronimo/server/trunk/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/plugin/DConfigBeanRootSupport.java
    geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/plugin/DConfigBeanSupport.java
      - copied unchanged from r697435, geronimo/server/trunk/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/plugin/DConfigBeanSupport.java
    geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/plugin/DeploymentConfigurationSupport.java
      - copied unchanged from r697435, geronimo/server/trunk/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/plugin/DeploymentConfigurationSupport.java
    geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/plugin/XmlBeanSupport.java
      - copied unchanged from r697435, geronimo/server/trunk/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/plugin/XmlBeanSupport.java
    geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/DeploymentExtendedJMXConnectorInfo.java   (with props)
    geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/DeploymentExtendedJMXConnectorInfoEditor.java
      - copied, changed from r696856, geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/config/BasicExtendedJMXConnectorInfoEditor.java
Removed:
    geronimo/server/trunk/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/plugin/
    geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/config/BasicExtendedJMXConnectorInfoEditor.java
Modified:
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/plugin/pom.xml
    geronimo/server/trunk/framework/configs/plugin/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartServerCommand.groovy
    geronimo/server/trunk/framework/modules/geronimo-deploy-config/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/LocalDeploymentManager.java
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
    geronimo/server/trunk/framework/modules/geronimo-service-builder/pom.xml
    geronimo/server/trunk/plugingroups/framework/src/main/history/dependencies.xml
    geronimo/server/trunk/plugingroups/web-jetty/src/main/history/dependencies.xml
    geronimo/server/trunk/plugingroups/web-tomcat/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/classloaders/geronimo-javaee-deployment_1.1MR3_spec/pom.xml
    geronimo/server/trunk/plugins/classloaders/geronimo-javaee-deployment_1.1MR3_spec/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/clustering/clustering/pom.xml
    geronimo/server/trunk/plugins/clustering/farming/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/clustering/farming/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/clustering/geronimo-clustering/pom.xml
    geronimo/server/trunk/plugins/clustering/geronimo-farm/pom.xml
    geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/config/BasicExtendedJMXConnectorInfo.java
    geronimo/server/trunk/plugins/clustering/plugin-farm-member/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/console/plugin-console-jetty/pom.xml
    geronimo/server/trunk/plugins/console/plugin-console-jetty/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/console/plugin-console-tomcat/pom.xml
    geronimo/server/trunk/plugins/console/plugin-console-tomcat/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/hotdeploy/hot-deployer/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml

Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml?rev=697438&r1=697437&r2=697438&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml Sat Sep 20 17:45:30 2008
@@ -12,16 +12,16 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>xml-resolver</groupId>
-        <artifactId>xml-resolver</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>xmlbeans</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
+        <groupId>xml-resolver</groupId>
+        <artifactId>xml-resolver</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency start="true">
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>plugin</artifactId>
         <type>car</type>

Modified: geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml?rev=697438&r1=697437&r2=697438&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml Sat Sep 20 17:45:30 2008
@@ -67,11 +67,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-deploy-config</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-utils</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml?rev=697438&r1=697437&r2=697438&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml Sat Sep 20 17:45:30 2008
@@ -17,11 +17,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.xmlbeans</groupId>
-        <artifactId>xmlbeans</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-plugin</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/framework/configs/plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/plugin/pom.xml?rev=697438&r1=697437&r2=697438&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/plugin/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/plugin/pom.xml Sat Sep 20 17:45:30 2008
@@ -57,18 +57,26 @@
         </dependency>
 
         <!-- not sure about this one - provides remote access -->
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-deploy-jsr88</artifactId>
-            <version>${version}</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-deploy-config</artifactId>
-            <version>${version}</version>
-        </dependency>
-        
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>geronimo-deploy-jsr88</artifactId>-->
+            <!--<version>${version}</version>-->
+        <!--</dependency>-->
+        <!---->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>geronimo-deploy-config</artifactId>-->
+            <!--<version>${version}</version>-->
+        <!--</dependency>-->
+        <!-- needed by geronimo-deploy-config -->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>xmlbeans</artifactId>-->
+            <!--<version>${version}</version>-->
+            <!--<type>car</type>-->
+        <!--</dependency>-->
+
+
         <dependency>
             <groupId>org.apache.geronimo.plugins.classloaders</groupId>
             <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
@@ -76,14 +84,6 @@
             <type>car</type>
         </dependency>
         
-        <!-- needed by geronimo-deploy-config -->
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>xmlbeans</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
         <dependency>
             <groupId>org.codehaus.plexus</groupId>
             <artifactId>plexus-archiver</artifactId>

Modified: geronimo/server/trunk/framework/configs/plugin/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/plugin/src/main/history/dependencies.xml?rev=697438&r1=697437&r2=697438&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/plugin/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/plugin/src/main/history/dependencies.xml Sat Sep 20 17:45:30 2008
@@ -7,16 +7,6 @@
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-deploy-config</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-deploy-jsr88</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-utils</artifactId>
         <type>jar</type>
@@ -47,11 +37,6 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>xmlbeans</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-component-api</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartServerCommand.groovy
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartServerCommand.groovy?rev=697438&r1=697437&r2=697438&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartServerCommand.groovy (original)
+++ geronimo/server/trunk/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartServerCommand.groovy Sat Sep 20 17:45:30 2008
@@ -76,6 +76,9 @@
     
     @Option(name='--secure', description='Use secure channel')
     boolean secure = false
+
+    @Option(name='-s', aliases=['--server'], description="Server name (when running mulitple servers from one installation)")
+    String server;
         
     protected Object doExecute() throws Exception {
         ant = new AntBuilder(log, io)
@@ -91,7 +94,10 @@
         properties['java.io.tmpdir'] = 'var/temp' // Use relative path
         properties['java.endorsed.dirs'] = prefixSystemPath('java.endorsed.dirs', new File(geronimoHome, 'lib/endorsed'))
         properties['java.ext.dirs'] = prefixSystemPath('java.ext.dirs', new File(geronimoHome, 'lib/ext'))
-        
+
+        if (server) {
+            properties['org.apache.geronimo.server.name'] = server
+        }
         processScripts()
         
         // Setup default java flags

Modified: geronimo/server/trunk/framework/modules/geronimo-deploy-config/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-config/pom.xml?rev=697438&r1=697437&r2=697438&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deploy-config/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deploy-config/pom.xml Sat Sep 20 17:45:30 2008
@@ -39,16 +39,6 @@
     
     <dependencies>
         <dependency>
-            <groupId>org.apache.xmlbeans</groupId>
-            <artifactId>xmlbeans</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
         </dependency>

Modified: geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/LocalDeploymentManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/LocalDeploymentManager.java?rev=697438&r1=697437&r2=697438&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/LocalDeploymentManager.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/LocalDeploymentManager.java Sat Sep 20 17:45:30 2008
@@ -48,7 +48,12 @@
         for (Object configurerName : configurerNames) {
             AbstractName name = (AbstractName) configurerName;
             try {
-                ModuleConfigurer configurer = (ModuleConfigurer) kernel.getGBean(name);
+                Object o = kernel.getGBean(name);
+                if (!(o instanceof ModuleConfigurer)) {
+                    log.error("Gbean classloader: " + o.getClass().getClassLoader());
+                    log.error("ModuleConfigurer classloader: " + ModuleConfigurer.class.getClassLoader());
+                }
+                ModuleConfigurer configurer = (ModuleConfigurer) o;
                 moduleConfigurers.add(configurer);
             } catch (GBeanNotFoundException e) {
                 log.warn("No gbean found for name returned in query : " + name);

Modified: geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java?rev=697438&r1=697437&r2=697438&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java Sat Sep 20 17:45:30 2008
@@ -1809,42 +1809,42 @@
         }
 
         public void addRemovedConfigID(Artifact obsolete) {
-            log.info("Removed artifact: " + obsolete);
+            log.debug("Removed artifact: {}", obsolete);
             downloadPoller.addRemovedConfigID(obsolete);
         }
 
         public void addInstalledConfigID(Artifact target) {
-            log.info("Installed artifact:" + target);
+            log.debug("Installed artifact: {}", target);
             downloadPoller.addInstalledConfigID(target);
         }
 
         public void addRestartedConfigID(Artifact target) {
-            log.info("Restarted artifact:" + target);
+            log.debug("Restarted artifact: {}", target);
             downloadPoller.addRestartedConfigID(target);
         }
 
         public void addSkippedConfigID(MissingDependencyException e) {
-            log.info("Skipped artifact due to: ", e);
+            log.debug("Skipped artifact due to: ", e);
             downloadPoller.addSkippedConfigID(e);
         }
 
         public void addDependencyPresent(Artifact dep) {
-            log.info("Artifact already installed:" + dep);
+            log.debug("Artifact already installed: {}", dep);
             downloadPoller.addDependencyPresent(dep);
         }
 
         public void addDependencyInstalled(Artifact dep) {
-            log.info("Installed dependency:" + dep);
+            log.debug("Installed dependency {}", dep);
             downloadPoller.addDependencyInstalled(dep);
         }
 
         public void setCurrentFile(String currentFile) {
-            log.info("Current file:" + currentFile);
+            log.debug("Current file: {}", currentFile);
             downloadPoller.setCurrentFile(currentFile);
         }
 
         public void setCurrentMessage(String currentMessage) {
-            log.info(currentMessage);
+            log.debug(currentMessage);
             downloadPoller.setCurrentMessage(currentMessage);
         }
 
@@ -1857,12 +1857,12 @@
         }
 
         public void setFailure(Exception failure) {
-            log.info("Failure: ", failure);
+            log.debug("Failure: {}", failure);
             downloadPoller.setFailure(failure);
         }
 
         public void setFinished() {
-            log.info("Finished");
+            log.debug("Finished");
             downloadPoller.setFinished();
         }
     }

Modified: geronimo/server/trunk/framework/modules/geronimo-service-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-service-builder/pom.xml?rev=697438&r1=697437&r2=697438&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-service-builder/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-service-builder/pom.xml Sat Sep 20 17:45:30 2008
@@ -40,9 +40,18 @@
 
         <!-- required for environment dconfigbean support -->
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-deploy-config</artifactId>
-            <version>${version}</version>
+            <groupId>org.apache.xmlbeans</groupId>
+            <artifactId>xmlbeans</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
         </dependency>
         
         <dependency>

Modified: geronimo/server/trunk/plugingroups/framework/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/framework/src/main/history/dependencies.xml?rev=697438&r1=697437&r2=697438&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/framework/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugingroups/framework/src/main/history/dependencies.xml Sat Sep 20 17:45:30 2008
@@ -82,17 +82,17 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>j2ee-system</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.yoko</groupId>
         <artifactId>yoko-rmi-spec</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>j2ee-system</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>rmi-naming</artifactId>
         <type>car</type>
     </dependency>

Modified: geronimo/server/trunk/plugingroups/web-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/web-jetty/src/main/history/dependencies.xml?rev=697438&r1=697437&r2=697438&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/web-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugingroups/web-jetty/src/main/history/dependencies.xml Sat Sep 20 17:45:30 2008
@@ -18,11 +18,6 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>client-system</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>jsr88-deploymentfactory</artifactId>
         <type>car</type>
     </dependency>
@@ -112,16 +107,16 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>j2ee-system</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.yoko</groupId>
         <artifactId>yoko-rmi-spec</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>j2ee-system</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>hot-deployer</artifactId>
         <type>car</type>

Modified: geronimo/server/trunk/plugingroups/web-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/web-tomcat/src/main/history/dependencies.xml?rev=697438&r1=697437&r2=697438&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/web-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugingroups/web-tomcat/src/main/history/dependencies.xml Sat Sep 20 17:45:30 2008
@@ -18,11 +18,6 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>client-system</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>jsr88-deploymentfactory</artifactId>
         <type>car</type>
     </dependency>
@@ -112,16 +107,16 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>j2ee-system</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.yoko</groupId>
         <artifactId>yoko-rmi-spec</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>j2ee-system</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>hot-deployer</artifactId>
         <type>car</type>

Modified: geronimo/server/trunk/plugins/classloaders/geronimo-javaee-deployment_1.1MR3_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/classloaders/geronimo-javaee-deployment_1.1MR3_spec/pom.xml?rev=697438&r1=697437&r2=697438&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/classloaders/geronimo-javaee-deployment_1.1MR3_spec/pom.xml (original)
+++ geronimo/server/trunk/plugins/classloaders/geronimo-javaee-deployment_1.1MR3_spec/pom.xml Sat Sep 20 17:45:30 2008
@@ -1,13 +1,14 @@
-<?xml version="1.0"?><project>
-  <parent>
-    <artifactId>classloaders</artifactId>
-    <groupId>org.apache.geronimo.plugins.classloaders</groupId>
-    <version>2.2-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
-<name>geronimo-javaee-deployment_1.1MR3_spec classloader</name>
-  <packaging>car</packaging>
+<?xml version="1.0"?>
+<project>
+    <parent>
+        <artifactId>classloaders</artifactId>
+        <groupId>org.apache.geronimo.plugins.classloaders</groupId>
+        <version>2.2-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
+    <name>geronimo-javaee-deployment_1.1MR3_spec classloader</name>
+    <packaging>car</packaging>
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
@@ -15,6 +16,11 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-deploy-config</artifactId>
+            <version>${version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-gbean-deployer-bootstrap</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -22,22 +28,22 @@
         </dependency>
     </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.geronimo.buildsupport</groupId>
-        <artifactId>car-maven-plugin</artifactId>
-        <configuration>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployerBootstrap}</deploymentConfig>
                     </deploymentConfigs>
                     <deployerName>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer</deployerName>
-          <category>Classloaders</category>
-          <instance>
-            <plugin-artifact></plugin-artifact>
-          </instance>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+                    <category>Classloaders</category>
+                    <instance>
+                        <plugin-artifact></plugin-artifact>
+                    </instance>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

Modified: geronimo/server/trunk/plugins/classloaders/geronimo-javaee-deployment_1.1MR3_spec/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/classloaders/geronimo-javaee-deployment_1.1MR3_spec/src/main/history/dependencies.xml?rev=697438&r1=697437&r2=697438&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/classloaders/geronimo-javaee-deployment_1.1MR3_spec/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/classloaders/geronimo-javaee-deployment_1.1MR3_spec/src/main/history/dependencies.xml Sat Sep 20 17:45:30 2008
@@ -7,6 +7,11 @@
         <type>car</type>
     </module-id>
     <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-deploy-config</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/plugins/clustering/clustering/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/clustering/pom.xml?rev=697438&r1=697437&r2=697438&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/clustering/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/clustering/pom.xml Sat Sep 20 17:45:30 2008
@@ -43,6 +43,8 @@
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
+            <!-- why is deployment needed for clustering??? -->
+            <!--<scope>provided</scope>-->
         </dependency>
         
         <dependency>

Modified: geronimo/server/trunk/plugins/clustering/farming/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/farming/src/main/history/dependencies.xml?rev=697438&r1=697437&r2=697438&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/farming/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/clustering/farming/src/main/history/dependencies.xml Sat Sep 20 17:45:30 2008
@@ -7,6 +7,11 @@
         <type>car</type>
     </module-id>
     <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-deploy-jsr88</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-farm</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/plugins/clustering/farming/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/farming/src/main/plan/plan.xml?rev=697438&r1=697437&r2=697438&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/farming/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/clustering/farming/src/main/plan/plan.xml Sat Sep 20 17:45:30 2008
@@ -82,7 +82,7 @@
     <gbean name="NodeInfo" class="org.apache.geronimo.farm.config.BasicNodeInfo">
           <attribute name="name">${PlanClusterNodeName}</attribute>
           <xml-attribute name="extendedJMXConnectorInfo">
-              <ns:javabean xmlns:ns="http://geronimo.apache.org/xml/ns/deployment/javabean-1.0" class="org.apache.geronimo.farm.config.BasicExtendedJMXConnectorInfo">
+              <ns:javabean xmlns:ns="http://geronimo.apache.org/xml/ns/deployment/javabean-1.0" class="org.apache.geronimo.farm.deployment.DeploymentExtendedJMXConnectorInfo">
                   <ns:property name="username">system</ns:property>
                   <ns:property name="password">manager</ns:property>
                   <ns:property name="protocol">rmi</ns:property>

Modified: geronimo/server/trunk/plugins/clustering/geronimo-clustering/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-clustering/pom.xml?rev=697438&r1=697437&r2=697438&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/geronimo-clustering/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/geronimo-clustering/pom.xml Sat Sep 20 17:45:30 2008
@@ -33,11 +33,11 @@
     <name>Geronimo Plugins, Clustering :: Core</name>
     
     <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-deploy-jsr88</artifactId>
-            <version>${version}</version>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>geronimo-deploy-jsr88</artifactId>-->
+            <!--<version>${version}</version>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>

Added: geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/DeploymentExtendedJMXConnectorInfo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/DeploymentExtendedJMXConnectorInfo.java?rev=697438&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/DeploymentExtendedJMXConnectorInfo.java (added)
+++ geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/DeploymentExtendedJMXConnectorInfo.java Sat Sep 20 17:45:30 2008
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.apache.geronimo.farm.deployment;
+
+import java.net.InetSocketAddress;
+
+import org.apache.geronimo.farm.config.BasicExtendedJMXConnectorInfo;
+import org.apache.geronimo.deployment.service.DoNotPersist;
+import org.apache.geronimo.deployment.service.EncryptOnPersist;
+
+/**
+ * @version $Rev:$ $Date:$
+ */
+public class DeploymentExtendedJMXConnectorInfo extends BasicExtendedJMXConnectorInfo {
+
+    @Override
+    @DoNotPersist
+    public InetSocketAddress getListenAddress() {
+        return super.getListenAddress();
+    }
+
+    @Override
+    @EncryptOnPersist
+    public String getPassword() {
+        return super.getPassword();
+    }
+}

Propchange: geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/DeploymentExtendedJMXConnectorInfo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/DeploymentExtendedJMXConnectorInfo.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/DeploymentExtendedJMXConnectorInfo.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/DeploymentExtendedJMXConnectorInfoEditor.java (from r696856, geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/config/BasicExtendedJMXConnectorInfoEditor.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/DeploymentExtendedJMXConnectorInfoEditor.java?p2=geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/DeploymentExtendedJMXConnectorInfoEditor.java&p1=geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/config/BasicExtendedJMXConnectorInfoEditor.java&r1=696856&r2=697438&rev=697438&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/config/BasicExtendedJMXConnectorInfoEditor.java (original)
+++ geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/DeploymentExtendedJMXConnectorInfoEditor.java Sat Sep 20 17:45:30 2008
@@ -17,18 +17,19 @@
  * under the License.
  */
 
-package org.apache.geronimo.farm.config;
+package org.apache.geronimo.farm.deployment;
 
 import org.apache.geronimo.deployment.service.JavaBeanXmlAttributeEditor;
+import org.apache.geronimo.farm.config.BasicExtendedJMXConnectorInfo;
 
 /**
  *
  * @version $Rev:$ $Date:$
  */
-public class BasicExtendedJMXConnectorInfoEditor extends JavaBeanXmlAttributeEditor {
+public class DeploymentExtendedJMXConnectorInfoEditor extends JavaBeanXmlAttributeEditor {
 
-    public BasicExtendedJMXConnectorInfoEditor() {
-        super(BasicExtendedJMXConnectorInfo.class);
+    public DeploymentExtendedJMXConnectorInfoEditor() {
+        super(DeploymentExtendedJMXConnectorInfo.class);
     }
 
 }

Modified: geronimo/server/trunk/plugins/clustering/geronimo-farm/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-farm/pom.xml?rev=697438&r1=697437&r2=697438&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/geronimo-farm/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/geronimo-farm/pom.xml Sat Sep 20 17:45:30 2008
@@ -40,11 +40,6 @@
             <version>${version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-service-builder</artifactId>
-            <version>${version}</version>
-        </dependency>
     </dependencies>
     
 </project>

Modified: geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/config/BasicExtendedJMXConnectorInfo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/config/BasicExtendedJMXConnectorInfo.java?rev=697438&r1=697437&r2=697438&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/config/BasicExtendedJMXConnectorInfo.java (original)
+++ geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/config/BasicExtendedJMXConnectorInfo.java Sat Sep 20 17:45:30 2008
@@ -19,20 +19,17 @@
 
 package org.apache.geronimo.farm.config;
 
-import java.io.Serializable;
 import java.io.IOException;
+import java.io.Serializable;
 import java.net.InetSocketAddress;
-import java.util.Map;
-import java.util.HashMap;
 import java.util.Collections;
+import java.util.Map;
 
+import javax.management.MBeanServerConnection;
 import javax.management.remote.JMXConnector;
 import javax.management.remote.JMXConnectorFactory;
 import javax.management.remote.JMXServiceURL;
-import javax.management.MBeanServerConnection;
 
-import org.apache.geronimo.deployment.service.DoNotPersist;
-import org.apache.geronimo.deployment.service.EncryptOnPersist;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.system.jmx.KernelDelegate;
 import org.slf4j.Logger;
@@ -70,7 +67,6 @@
         return host;
     }
 
-    @DoNotPersist
     public InetSocketAddress getListenAddress() {
         return new InetSocketAddress(host, port);
     }
@@ -103,7 +99,6 @@
         this.urlPath = urlPath;
     }
 
-    @EncryptOnPersist
     public String getPassword() {
         return password;
     }

Modified: geronimo/server/trunk/plugins/clustering/plugin-farm-member/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/plugin-farm-member/src/main/history/dependencies.xml?rev=697438&r1=697437&r2=697438&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/plugin-farm-member/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/clustering/plugin-farm-member/src/main/history/dependencies.xml Sat Sep 20 17:45:30 2008
@@ -13,27 +13,12 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-deployment</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-jmx-remoting</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>xml-resolver</groupId>
-        <artifactId>xml-resolver</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>plugin</artifactId>
         <type>car</type>
     </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-service-builder</artifactId>
-        <type>jar</type>
-    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/console/plugin-console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-console-jetty/pom.xml?rev=697438&r1=697437&r2=697438&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/plugin-console-jetty/pom.xml Sat Sep 20 17:45:30 2008
@@ -61,6 +61,12 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-deploy-jsr88</artifactId>
+            <version>${version}</version>
+        </dependency>
 
         <!-- to force build order -->
         <dependency>

Modified: geronimo/server/trunk/plugins/console/plugin-console-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-console-jetty/src/main/history/dependencies.xml?rev=697438&r1=697437&r2=697438&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-console-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/console/plugin-console-jetty/src/main/history/dependencies.xml Sat Sep 20 17:45:30 2008
@@ -7,6 +7,11 @@
         <type>car</type>
     </module-id>
     <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-deploy-jsr88</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>console-jetty</artifactId>
         <type>car</type>

Modified: geronimo/server/trunk/plugins/console/plugin-console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-console-tomcat/pom.xml?rev=697438&r1=697437&r2=697438&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-console-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/plugin-console-tomcat/pom.xml Sat Sep 20 17:45:30 2008
@@ -62,6 +62,12 @@
             <type>car</type>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-deploy-jsr88</artifactId>
+            <version>${version}</version>
+        </dependency>
+
         <!-- to force build order -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/server/trunk/plugins/console/plugin-console-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-console-tomcat/src/main/history/dependencies.xml?rev=697438&r1=697437&r2=697438&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-console-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/console/plugin-console-tomcat/src/main/history/dependencies.xml Sat Sep 20 17:45:30 2008
@@ -7,6 +7,11 @@
         <type>car</type>
     </module-id>
     <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-deploy-jsr88</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>console-tomcat</artifactId>
         <type>car</type>

Modified: geronimo/server/trunk/plugins/hotdeploy/hot-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/hotdeploy/hot-deployer/src/main/history/dependencies.xml?rev=697438&r1=697437&r2=697438&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/hotdeploy/hot-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/hotdeploy/hot-deployer/src/main/history/dependencies.xml Sat Sep 20 17:45:30 2008
@@ -8,6 +8,11 @@
     </module-id>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-deploy-jsr88</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-deploy-tool</artifactId>
         <type>jar</type>
     </dependency>

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml?rev=697438&r1=697437&r2=697438&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml Sat Sep 20 17:45:30 2008
@@ -51,6 +51,11 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-deploy-config</artifactId>
+            <version>${version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>jee-specs</artifactId>
             <version>${version}</version>
             <type>car</type>



Mime
View raw message