geronimo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Joe Bohn <joe.b...@earthlink.net>
Subject Re: svn commit: r508724 [1/3] - 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/va...
Date Mon, 19 Feb 2007 16:44:00 GMT
This appears to be breaking tck again.  Please take a look at the tck 
list for details of the problem.

Thanks,
Joe


gdamour@apache.org wrote:
> Author: gdamour
> Date: Sat Feb 17 00:01:26 2007
> New Revision: 508724
> 
> URL: http://svn.apache.org/viewvc?view=rev&rev=508724
> Log:
> Second attempt to change the way the online/offline deployers and the JSR88
> deployment driver work. The first attempt was breaking the TCK amd the 
> eclipse plugin.
> 
> 
> Online deployer, i.e. deployer.jar, boots a Kernel to load its dependencies,
>  e.g. geronimo-deploy-tool, and registers the available ModuleConfigurers with 
> the DeploymentManager.
> 
> ModuleConfigurers to be registered are loaded by the persistent configuration 
> list jsr88-configurer-config.xml.
> 
> In the case of an offline deployment, the online deployer starts the 
> offline-deployer configuration within the same Kernel. In turn, the 
> offline-deployer configuration starts a list of configurations to register 
> the available module builders.
> 
> Add a log4j configuration for the online deployer.
> 
> DeploymentFactoryBootstrapper is the new JSR88 deployment driver. It boots a 
> kernel; starts the configuration list jsr88-configurer-config.xml; retrieves
> the "actual" DeploymentFactory implementation from the kernel; and delegates
> to this retrieved imoplementation.
> The JSR88 JAR driver is now named jsr88-deploymentfactory.jar.
> 
> 
> This fixes:
> * GERONIMO-2794 - Improve online deployer to register ModuleConfigurers from the repository; and
> * GERONIMO-2767 - Minimize side effects of the offline deployer
> 
> Added:
>     geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/log/deployer-log4j.properties
>       - copied unchanged from r503370, 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
>       - copied unchanged from r503370, 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
>       - copied unchanged from r503370, 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
>       - copied unchanged from r503370, 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
>       - copied unchanged from r503370, 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
>       - copied unchanged from r503370, 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
>       - copied unchanged from r503370, 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
>       - copied unchanged from r503370, 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
>       - copied unchanged from r503370, 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
>       - copied unchanged from r503370, 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
>       - copied unchanged from r503370, geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/var/config/offline-deployer-config.xml
>     geronimo/server/trunk/configs/jsr88-deploymentfactory/
>     geronimo/server/trunk/configs/jsr88-deploymentfactory/LICENSE.txt
>     geronimo/server/trunk/configs/jsr88-deploymentfactory/NOTICE.txt
>     geronimo/server/trunk/configs/jsr88-deploymentfactory/pom.xml
>     geronimo/server/trunk/configs/jsr88-deploymentfactory/src/
>     geronimo/server/trunk/configs/jsr88-deploymentfactory/src/main/
>     geronimo/server/trunk/configs/jsr88-deploymentfactory/src/main/resources/
>     geronimo/server/trunk/configs/jsr88-deploymentfactory/src/main/resources/META-INF/
>     geronimo/server/trunk/configs/jsr88-deploymentfactory/src/main/resources/META-INF/startup-jar
>     geronimo/server/trunk/configs/jsr88-deploymentfactory/src/plan/
>     geronimo/server/trunk/configs/jsr88-deploymentfactory/src/plan/plan.xml
>     geronimo/server/trunk/modules/geronimo-deploy-jsr88-bootstrapper/
>     geronimo/server/trunk/modules/geronimo-deploy-jsr88-bootstrapper/LICENSE.txt
>     geronimo/server/trunk/modules/geronimo-deploy-jsr88-bootstrapper/NOTICE.txt
>     geronimo/server/trunk/modules/geronimo-deploy-jsr88-bootstrapper/pom.xml
>     geronimo/server/trunk/modules/geronimo-deploy-jsr88-bootstrapper/src/
>     geronimo/server/trunk/modules/geronimo-deploy-jsr88-bootstrapper/src/main/
>     geronimo/server/trunk/modules/geronimo-deploy-jsr88-bootstrapper/src/main/java/
>     geronimo/server/trunk/modules/geronimo-deploy-jsr88-bootstrapper/src/main/java/org/
>     geronimo/server/trunk/modules/geronimo-deploy-jsr88-bootstrapper/src/main/java/org/apache/
>     geronimo/server/trunk/modules/geronimo-deploy-jsr88-bootstrapper/src/main/java/org/apache/geronimo/
>     geronimo/server/trunk/modules/geronimo-deploy-jsr88-bootstrapper/src/main/java/org/apache/geronimo/deployment/
>     geronimo/server/trunk/modules/geronimo-deploy-jsr88-bootstrapper/src/main/java/org/apache/geronimo/deployment/plugin/
>     geronimo/server/trunk/modules/geronimo-deploy-jsr88-bootstrapper/src/main/java/org/apache/geronimo/deployment/plugin/factories/
>     geronimo/server/trunk/modules/geronimo-deploy-jsr88-bootstrapper/src/main/java/org/apache/geronimo/deployment/plugin/factories/DeploymentFactoryBootstrapper.java
>     geronimo/server/trunk/modules/geronimo-deploy-jsr88-bootstrapper/src/test/
>     geronimo/server/trunk/modules/geronimo-deploy-jsr88-bootstrapper/src/test/java/
>     geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/factories/DeploymentFactoryWithKernel.java
>     geronimo/server/trunk/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/OfflineDeployerStarter.java
>       - copied unchanged from r503370, 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
>       - copied unchanged from r503370, 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/repository/AbstractRepository.java
>     geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/repository/CopyArtifactTypeHandler.java
>     geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/repository/Maven1Repository.java
>     geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/repository/Maven2Repository.java
>     geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/repository/UnpackArtifactTypeHandler.java
>     geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/Main.java
>       - copied unchanged from r503370, 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
>       - copied, changed from r503370, geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/MainBootstrapper.java
>     geronimo/server/trunk/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/repository/AbstractRepositoryTest.java
>     geronimo/server/trunk/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/repository/Maven1RepositoryTest.java
>     geronimo/server/trunk/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/repository/Maven2RepositoryTest.java
>     geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/
>     geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m1/
>     geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m1/junk/
>     geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m1/junk/propertiess/
>     geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m1/junk/propertiess/junk-1.5.properties
>     geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m1/org.bar/
>     geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m1/org.bar/propertiess/
>     geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m1/org.bar/propertiess/test-1.3.properties
>     geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m1/org.bar/propertiess/test-1.5.properties
>     geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m1/org.foo/
>     geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m1/org.foo/propertiess/
>     geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m1/org.foo/propertiess/test-2.0.1.properties
>     geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m2/
>     geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m2/junk/
>     geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m2/junk/junk/
>     geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m2/junk/junk/1.5/
>     geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m2/junk/junk/1.5/junk-1.5.properties
>     geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m2/org/
>     geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m2/org/bar/
>     geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m2/org/bar/test/
>     geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m2/org/bar/test/1.3/
>     geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m2/org/bar/test/1.3/test-1.3.properties
>     geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m2/org/bar/test/1.5/
>     geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m2/org/bar/test/1.5/test-1.5.properties
>     geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m2/org/foo/
>     geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m2/org/foo/test/
>     geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m2/org/foo/test/2.0.1/
>     geronimo/server/trunk/modules/geronimo-kernel/src/test/repo/m2/org/foo/test/2.0.1/test-2.0.1.properties
>     geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/SwitchableLocalAttributeManager.java
>       - copied unchanged from r503370, geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/SwitchableLocalAttributeManager.java
>     geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/repository/ServerInfoRootResolver.java
> Removed:
>     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
>     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
>     geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/var/config/offline-deployer-list
>     geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/repository/CopyArtifactTypeHandler.java
>     geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/repository/UnpackArtifactTypeHandler.java
>     geronimo/server/trunk/modules/geronimo-system/src/test/java/org/apache/geronimo/system/repository/
>     geronimo/server/trunk/modules/geronimo-system/src/test/repo/
> 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/jsr88-cli/pom.xml
>     geronimo/server/trunk/configs/jsr88-cli/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/maven-plugins/geronimo-maven-plugin/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/pom.xml
>     geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/DisconnectedDeploymentManager.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-jsr88/src/test/java/org/apache/geronimo/deployment/plugin/DeploymentConfigurationTest.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/pom.xml
>     geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationUtil.java
>     geronimo/server/trunk/modules/geronimo-system/pom.xml
>     geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/repository/AbstractRepository.java
>     geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/repository/Maven1Repository.java
>     geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/repository/Maven2Repository.java
>     geronimo/server/trunk/modules/pom.xml
> 
> 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=508724&r1=508723&r2=508724
> ==============================================================================
> --- 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 Sat Feb 17 00:01:26 2007
> @@ -36,6 +36,7 @@
>  import org.apache.commons.logging.Log;
>  import org.apache.commons.logging.LogFactory;
>  import org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryImpl;
> +import org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryWithKernel;
>  import org.apache.geronimo.gbean.AbstractName;
>  import org.apache.geronimo.gbean.GBeanData;
>  import org.apache.geronimo.kernel.Kernel;
> @@ -77,6 +78,11 @@
>      // 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 {
> @@ -88,11 +94,12 @@
>              log.debug("Unable to find kernel in JNDI; using KernelRegistry instead");
>              kernel = KernelRegistry.getSingleKernel();
>          }
> -        return new KernelManagementHelper(kernel);
> +        return kernel;
>      }
>  
>      public static DeploymentManager getDeploymentManager(PortletRequest request) {
> -        DeploymentFactoryImpl factory = new DeploymentFactoryImpl();
> +        Kernel kernel = getKernel();
> +        DeploymentFactoryImpl factory = new DeploymentFactoryWithKernel(kernel);
>          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=508724&r1=508723&r2=508724
> ==============================================================================
> --- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml (original)
> +++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml Sat Feb 17 00:01:26 2007
> @@ -62,10 +62,6 @@
>                                      <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>
> @@ -78,10 +74,6 @@
>                                      <artifactId>mx4j</artifactId>
>                                  </artifactItem>
>                                  <artifactItem>
> -                                    <groupId>mx4j</groupId>
> -                                    <artifactId>mx4j-remote</artifactId>
> -                                </artifactItem>
> -                                <artifactItem>
>                                      <groupId>xpp3</groupId>
>                                      <artifactId>xpp3</artifactId>
>                                  </artifactItem>
> @@ -90,10 +82,6 @@
>                                      <artifactId>xstream</artifactId>
>                                  </artifactItem>
>                                  <artifactItem>
> -                                    <groupId>jline</groupId>
> -                                    <artifactId>jline</artifactId>
> -                                </artifactItem>
> -                                <artifactItem>
>                                      <groupId>commons-jexl</groupId>
>                                      <artifactId>commons-jexl</artifactId>
>                                  </artifactItem>
> @@ -102,37 +90,28 @@
>                                      <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>
> +                                    <artifactId>geronimo-kernel</artifactId>
>                                      <version>${version}</version>
>                                  </artifactItem>
>                                  <artifactItem>
>                                      <groupId>org.apache.geronimo.modules</groupId>
> -                                    <artifactId>geronimo-kernel</artifactId>
> +                                    <artifactId>geronimo-util</artifactId>
>                                      <version>${version}</version>
>                                  </artifactItem>
>                                  <artifactItem>
>                                      <groupId>org.apache.geronimo.modules</groupId>
> -                                    <artifactId>geronimo-util</artifactId>
> +                                    <artifactId>geronimo-system</artifactId>
>                                      <version>${version}</version>
>                                  </artifactItem>
>                                  <artifactItem>
>                                      <groupId>org.apache.geronimo.modules</groupId>
> -                                    <artifactId>geronimo-system</artifactId>
> +                                    <artifactId>geronimo-deploy-jsr88-bootstrapper</artifactId>
>                                      <version>${version}</version>
>                                  </artifactItem>
>                              </artifactItems>
> 
> 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=508724&r1=508723&r2=508724
> ==============================================================================
> --- geronimo/server/trunk/assemblies/geronimo-framework/pom.xml (original)
> +++ geronimo/server/trunk/assemblies/geronimo-framework/pom.xml Sat Feb 17 00:01:26 2007
> @@ -90,6 +90,27 @@
>          
>          <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-deploymentfactory</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>
> @@ -117,7 +138,8 @@
>                  <directory>${pom.basedir}/src/main/var/config</directory>
>                  <includes>
>                      <include>config.xml</include>
> -                    <include>offline-deployer-list</include>
> +                    <include>offline-deployer-config.xml</include>
> +                    <include>jsr88-configurer-config.xml</include>
>                  </includes>
>                  <filtering>true</filtering>
>              </resource>
> @@ -197,7 +219,8 @@
>                                  <move todir="${project.build.directory}/scratch">
>                                      <fileset dir="${project.build.directory}/classes">
>                                          <include name="config.xml"/>
> -                                        <include name="offline-deployer-list"/>
> +                                        <include name="offline-deployer-config.xml"/>
> +                                        <include name="jsr88-configurer-config.xml"/>
>                                      </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=508724&r1=508723&r2=508724
> ==============================================================================
> --- geronimo/server/trunk/assemblies/geronimo-framework/src/main/assembly/bin.xml (original)
> +++ geronimo/server/trunk/assemblies/geronimo-framework/src/main/assembly/bin.xml Sat Feb 17 00:01:26 2007
> @@ -69,6 +69,14 @@
>          </dependencySet>
>          
>          <dependencySet>
> +            <outputDirectory>lib</outputDirectory>
> +            <outputFileNameMapping>jsr88-deploymentfactory.jar</outputFileNameMapping>
> +            <includes>
> +                <include>org.apache.geronimo.configs:jsr88-deploymentfactory</include>
> +            </includes>
> +        </dependencySet>
> +
> +        <dependencySet>
>              <outputDirectory>bin</outputDirectory>
>              <outputFileNameMapping>shutdown.jar</outputFileNameMapping>
>              <includes>
> @@ -132,17 +140,11 @@
>          <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=508724&r1=508723&r2=508724
> ==============================================================================
> --- geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml (original)
> +++ geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml Sat Feb 17 00:01:26 2007
> @@ -207,6 +207,34 @@
>  
>          <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>jsr88-deploymentfactory</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>
> @@ -324,12 +352,33 @@
>          
>          <dependency>
>              <groupId>org.apache.geronimo.configs</groupId>
> -            <artifactId>online-deployer</artifactId>
> +            <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>
> +        <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>openjpa</artifactId>
>              <version>${version}</version>
> @@ -357,14 +406,15 @@
>              <!--
>              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 %^&#ing reason maven-resources-plugin can not
> +                  because for some 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-list</include>
> +                    <include>offline-deployer-config.xml</include>
> +                    <include>jsr88-configurer-config.xml</include>
>                  </includes>
>                  <filtering>true</filtering>
>              </resource>
> @@ -439,7 +489,8 @@
>                                  <move todir="${project.build.directory}/scratch">
>                                      <fileset dir="${project.build.directory}/classes">
>                                          <include name="config.xml"/>
> -                                        <include name="offline-deployer-list"/>
> +                                        <include name="offline-deployer-config.xml"/>
> +                                        <include name="jsr88-configurer-config.xml"/>
>                                      </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=508724&r1=508723&r2=508724
> ==============================================================================
> --- 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 Sat Feb 17 00:01:26 2007
> @@ -77,6 +77,14 @@
>          </dependencySet>
>          
>          <dependencySet>
> +            <outputDirectory>lib</outputDirectory>
> +            <outputFileNameMapping>jsr88-deploymentfactory.jar</outputFileNameMapping>
> +            <includes>
> +                <include>org.apache.geronimo.configs:jsr88-deploymentfactory</include>
> +            </includes>
> +        </dependencySet>
> +        
> +        <dependencySet>
>              <outputDirectory>bin</outputDirectory>
>              <outputFileNameMapping>shutdown.jar</outputFileNameMapping>
>              <includes>
> @@ -145,17 +153,11 @@
>          <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=508724&r1=508723&r2=508724
> ==============================================================================
> --- geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml (original)
> +++ geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml Sat Feb 17 00:01:26 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,6 +125,48 @@
>  
>          <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-deploymentfactory</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>
> @@ -159,7 +201,8 @@
>                  <directory>${pom.basedir}/src/main/var/config</directory>
>                  <includes>
>                      <include>config.xml</include>
> -                    <include>offline-deployer-list</include>
> +                    <include>offline-deployer-config.xml</include>
> +                    <include>jsr88-configurer-config.xml</include>
>                  </includes>
>                  <filtering>true</filtering>
>              </resource>
> @@ -234,7 +277,8 @@
>                                  <move todir="${project.build.directory}/scratch">
>                                      <fileset dir="${project.build.directory}/classes">
>                                          <include name="config.xml"/>
> -                                        <include name="offline-deployer-list"/>
> +                                        <include name="offline-deployer-config.xml"/>
> +                                        <include name="jsr88-configurer-config.xml"/>
>                                      </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=508724&r1=508723&r2=508724
> ==============================================================================
> --- 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 Sat Feb 17 00:01:26 2007
> @@ -69,6 +69,14 @@
>          </dependencySet>
>          
>          <dependencySet>
> +            <outputDirectory>lib</outputDirectory>
> +            <outputFileNameMapping>jsr88-deploymentfactory.jar</outputFileNameMapping>
> +            <includes>
> +                <include>org.apache.geronimo.configs:jsr88-deploymentfactory</include>
> +            </includes>
> +        </dependencySet>
> +        
> +        <dependencySet>
>              <outputDirectory>bin</outputDirectory>
>              <outputFileNameMapping>shutdown.jar</outputFileNameMapping>
>              <includes>
> @@ -132,17 +140,11 @@
>          <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=508724&r1=508723&r2=508724
> ==============================================================================
> --- geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/pom.xml (original)
> +++ geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/pom.xml Sat Feb 17 00:01:26 2007
> @@ -322,7 +322,56 @@
>              <type>car</type>
>          </dependency>
>  
> -       <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-deploymentfactory</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>
>              <groupId>org.apache.geronimo.configs</groupId>
>              <artifactId>openjpa</artifactId>
>              <version>${version}</version>
> @@ -337,7 +386,8 @@
>                  <directory>${pom.basedir}/src/main/var/config</directory>
>                  <includes>
>                      <include>config.xml</include>
> -                    <include>offline-deployer-list</include>
> +                    <include>offline-deployer-config.xml</include>
> +                    <include>jsr88-configurer-config.xml</include>
>                  </includes>
>                  <filtering>true</filtering>
>              </resource>
> @@ -412,7 +462,8 @@
>                                  <move todir="${project.build.directory}/scratch">
>                                      <fileset dir="${project.build.directory}/classes">
>                                          <include name="config.xml"/>
> -                                        <include name="offline-deployer-list"/>
> +                                        <include name="offline-deployer-config.xml"/>
> +                                        <include name="jsr88-configurer-config.xml"/>
>                                      </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=508724&r1=508723&r2=508724
> ==============================================================================
> --- 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 Sat Feb 17 00:01:26 2007
> @@ -77,6 +77,14 @@
>          </dependencySet>
>          
>          <dependencySet>
> +            <outputDirectory>lib</outputDirectory>
> +            <outputFileNameMapping>jsr88-deploymentfactory.jar</outputFileNameMapping>
> +            <includes>
> +                <include>org.apache.geronimo.configs:jsr88-deploymentfactory</include>
> +            </includes>
> +        </dependencySet>
> +
> +        <dependencySet>
>              <outputDirectory>bin</outputDirectory>
>              <outputFileNameMapping>shutdown.jar</outputFileNameMapping>
>              <includes>
> @@ -145,17 +153,11 @@
>          <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=508724&r1=508723&r2=508724
> ==============================================================================
> --- geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml (original)
> +++ geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml Sat Feb 17 00:01:26 2007
> @@ -122,6 +122,48 @@
>              <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-deploymentfactory</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>
> @@ -159,7 +201,8 @@
>                  <directory>${pom.basedir}/src/main/var/config</directory>
>                  <includes>
>                      <include>config.xml</include>
> -                    <include>offline-deployer-list</include>
> +                    <include>offline-deployer-config.xml</include>
> +                    <include>jsr88-configurer-config.xml</include>
>                  </includes>
>                  <filtering>true</filtering>
>              </resource>
> @@ -234,7 +277,8 @@
>                                  <move todir="${project.build.directory}/scratch">
>                                      <fileset dir="${project.build.directory}/classes">
>                                          <include name="config.xml"/>
> -                                        <include name="offline-deployer-list"/>
> +                                        <include name="offline-deployer-config.xml"/>
> +                                        <include name="jsr88-configurer-config.xml"/>
>                                      </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=508724&r1=508723&r2=508724
> ==============================================================================
> --- 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 Sat Feb 17 00:01:26 2007
> @@ -67,6 +67,14 @@
>                  <include>org.apache.geronimo.configs:online-deployer</include>
>              </includes>
>          </dependencySet>
> +
> +        <dependencySet>
> +            <outputDirectory>lib</outputDirectory>
> +            <outputFileNameMapping>jsr88-deploymentfactory.jar</outputFileNameMapping>
> +            <includes>
> +                <include>org.apache.geronimo.configs:jsr88-deploymentfactory</include>
> +            </includes>
> +        </dependencySet>
>          
>          <dependencySet>
>              <outputDirectory>bin</outputDirectory>
> @@ -132,17 +140,11 @@
>          <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=508724&r1=508723&r2=508724
> ==============================================================================
> --- geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml (original)
> +++ geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml Sat Feb 17 00:01:26 2007
> @@ -89,9 +89,6 @@
>          </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=508724&r1=508723&r2=508724
> ==============================================================================
> --- geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml (original)
> +++ geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml Sat Feb 17 00:01:26 2007
> @@ -85,6 +85,4 @@
>          <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=508724&r1=508723&r2=508724
> ==============================================================================
> --- geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml (original)
> +++ geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml Sat Feb 17 00:01:26 2007
> @@ -142,8 +142,6 @@
>          <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=508724&r1=508723&r2=508724
> ==============================================================================
> --- geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml (original)
> +++ geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml Sat Feb 17 00:01:26 2007
> @@ -128,6 +128,4 @@
>          <attribute name="servletName">dummy</attribute>
>      </gbean>
>  
> -    <gbean name="Jetty6WARConfigurer" class="org.apache.geronimo.web.deployment.WARConfigurer"/>
> -
>  </module>
> 
> Modified: geronimo/server/trunk/configs/jsr88-cli/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jsr88-cli/pom.xml?view=diff&rev=508724&r1=508723&r2=508724
> ==============================================================================
> --- geronimo/server/trunk/configs/jsr88-cli/pom.xml (original)
> +++ geronimo/server/trunk/configs/jsr88-cli/pom.xml Sat Feb 17 00:01:26 2007
> @@ -40,7 +40,7 @@
>              <artifactId>geronimo-deploy-jsr88</artifactId>
>              <version>${version}</version>
>          </dependency>
> -    
> +
>          <dependency>
>              <groupId>org.apache.geronimo.modules</groupId>
>              <artifactId>geronimo-deploy-tool</artifactId>
> @@ -56,6 +56,16 @@
>          <dependency>
>              <groupId>org.apache.geronimo.specs</groupId>
>              <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
> +        </dependency>
> +
> +        <dependency>
> +            <groupId>commons-cli</groupId>
> +            <artifactId>commons-cli</artifactId>
> +        </dependency>
> +
> +        <dependency>
> +            <groupId>jline</groupId>
> +            <artifactId>jline</artifactId>
>          </dependency>
>  
>          <dependency>
> 
> Modified: geronimo/server/trunk/configs/jsr88-cli/src/plan/plan.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jsr88-cli/src/plan/plan.xml?view=diff&rev=508724&r1=508723&r2=508724
> ==============================================================================
> --- geronimo/server/trunk/configs/jsr88-cli/src/plan/plan.xml (original)
> +++ geronimo/server/trunk/configs/jsr88-cli/src/plan/plan.xml Sat Feb 17 00:01:26 2007
> @@ -20,7 +20,13 @@
>  
>  <module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
>  
> -    <gbean name="DeployTool" class="org.apache.geronimo.deployment.cli.DeployTool" />
> +    <gbean name="DeployTool" class="org.apache.geronimo.deployment.cli.DeployTool" >
> +        <reference name="DeploymentFactory">
> +            <name>DeploymentFactory</name>
> +        </reference>
> +    </gbean>
> +
> +    <gbean name="DeploymentFactory" class="org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryWithKernel" />
>  
>      <gbean name="ModuleConfigurerRegistry" class="org.apache.geronimo.deployment.plugin.jmx.RemoteDeploymentManager">
>          <references name="ModuleConfigurers">
> 
> Added: geronimo/server/trunk/configs/jsr88-deploymentfactory/LICENSE.txt
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jsr88-deploymentfactory/LICENSE.txt?view=auto&rev=508724
> ==============================================================================
> --- geronimo/server/trunk/configs/jsr88-deploymentfactory/LICENSE.txt (added)
> +++ geronimo/server/trunk/configs/jsr88-deploymentfactory/LICENSE.txt Sat Feb 17 00:01:26 2007
> @@ -0,0 +1,203 @@
> +
> +                                 Apache License
> +                           Version 2.0, January 2004
> +                        http://www.apache.org/licenses/
> +
> +   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
> +
> +   1. Definitions.
> +
> +      "License" shall mean the terms and conditions for use, reproduction,
> +      and distribution as defined by Sections 1 through 9 of this document.
> +
> +      "Licensor" shall mean the copyright owner or entity authorized by
> +      the copyright owner that is granting the License.
> +
> +      "Legal Entity" shall mean the union of the acting entity and all
> +      other entities that control, are controlled by, or are under common
> +      control with that entity. For the purposes of this definition,
> +      "control" means (i) the power, direct or indirect, to cause the
> +      direction or management of such entity, whether by contract or
> +      otherwise, or (ii) ownership of fifty percent (50%) or more of the
> +      outstanding shares, or (iii) beneficial ownership of such entity.
> +
> +      "You" (or "Your") shall mean an individual or Legal Entity
> +      exercising permissions granted by this License.
> +
> +      "Source" form shall mean the preferred form for making modifications,
> +      including but not limited to software source code, documentation
> +      source, and configuration files.
> +
> +      "Object" form shall mean any form resulting from mechanical
> +      transformation or translation of a Source form, including but
> +      not limited to compiled object code, generated documentation,
> +      and conversions to other media types.
> +
> +      "Work" shall mean the work of authorship, whether in Source or
> +      Object form, made available under the License, as indicated by a
> +      copyright notice that is included in or attached to the work
> +      (an example is provided in the Appendix below).
> +
> +      "Derivative Works" shall mean any work, whether in Source or Object
> +      form, that is based on (or derived from) the Work and for which the
> +      editorial revisions, annotations, elaborations, or other modifications
> +      represent, as a whole, an original work of authorship. For the purposes
> +      of this License, Derivative Works shall not include works that remain
> +      separable from, or merely link (or bind by name) to the interfaces of,
> +      the Work and Derivative Works thereof.
> +
> +      "Contribution" shall mean any work of authorship, including
> +      the original version of the Work and any modifications or additions
> +      to that Work or Derivative Works thereof, that is intentionally
> +      submitted to Licensor for inclusion in the Work by the copyright owner
> +      or by an individual or Legal Entity authorized to submit on behalf of
> +      the copyright owner. For the purposes of this definition, "submitted"
> +      means any form of electronic, verbal, or written communication sent
> +      to the Licensor or its representatives, including but not limited to
> +      communication on electronic mailing lists, source code control systems,
> +      and issue tracking systems that are managed by, or on behalf of, the
> +      Licensor for the purpose of discussing and improving the Work, but
> +      excluding communication that is conspicuously marked or otherwise
> +      designated in writing by the copyright owner as "Not a Contribution."
> +
> +      "Contributor" shall mean Licensor and any individual or Legal Entity
> +      on behalf of whom a Contribution has been received by Licensor and
> +      subsequently incorporated within the Work.
> +
> +   2. Grant of Copyright License. Subject to the terms and conditions of
> +      this License, each Contributor hereby grants to You a perpetual,
> +      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
> +      copyright license to reproduce, prepare Derivative Works of,
> +      publicly display, publicly perform, sublicense, and distribute the
> +      Work and such Derivative Works in Source or Object form.
> +
> +   3. Grant of Patent License. Subject to the terms and conditions of
> +      this License, each Contributor hereby grants to You a perpetual,
> +      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
> +      (except as stated in this section) patent license to make, have made,
> +      use, offer to sell, sell, import, and otherwise transfer the Work,
> +      where such license applies only to those patent claims licensable
> +      by such Contributor that are necessarily infringed by their
> +      Contribution(s) alone or by combination of their Contribution(s)
> +      with the Work to which such Contribution(s) was submitted. If You
> +      institute patent litigation against any entity (including a
> +      cross-claim or counterclaim in a lawsuit) alleging that the Work
> +      or a Contribution incorporated within the Work constitutes direct
> +      or contributory patent infringement, then any patent licenses
> +      granted to You under this License for that Work shall terminate
> +      as of the date such litigation is filed.
> +
> +   4. Redistribution. You may reproduce and distribute copies of the
> +      Work or Derivative Works thereof in any medium, with or without
> +      modifications, and in Source or Object form, provided that You
> +      meet the following conditions:
> +
> +      (a) You must give any other recipients of the Work or
> +          Derivative Works a copy of this License; and
> +
> +      (b) You must cause any modified files to carry prominent notices
> +          stating that You changed the files; and
> +
> +      (c) You must retain, in the Source form of any Derivative Works
> +          that You distribute, all copyright, patent, trademark, and
> +          attribution notices from the Source form of the Work,
> +          excluding those notices that do not pertain to any part of
> +          the Derivative Works; and
> +
> +      (d) If the Work includes a "NOTICE" text file as part of its
> +          distribution, then any Derivative Works that You distribute must
> +          include a readable copy of the attribution notices contained
> +          within such NOTICE file, excluding those notices that do not
> +          pertain to any part of the Derivative Works, in at least one
> +          of the following places: within a NOTICE text file distributed
> +          as part of the Derivative Works; within the Source form or
> +          documentation, if provided along with the Derivative Works; or,
> +          within a display generated by the Derivative Works, if and
> +          wherever such third-party notices normally appear. The contents
> +          of the NOTICE file are for informational purposes only and
> +          do not modify the License. You may add Your own attribution
> +          notices within Derivative Works that You distribute, alongside
> +          or as an addendum to the NOTICE text from the Work, provided
> +          that such additional attribution notices cannot be construed
> +          as modifying the License.
> +
> +      You may add Your own copyright statement to Your modifications and
> +      may provide additional or different license terms and conditions
> +      for use, reproduction, or distribution of Your modifications, or
> +      for any such Derivative Works as a whole, provided Your use,
> +      reproduction, and distribution of the Work otherwise complies with
> +      the conditions stated in this License.
> +
> +   5. Submission of Contributions. Unless You explicitly state otherwise,
> +      any Contribution intentionally submitted for inclusion in the Work
> +      by You to the Licensor shall be under the terms and conditions of
> +      this License, without any additional terms or conditions.
> +      Notwithstanding the above, nothing herein shall supersede or modify
> +      the terms of any separate license agreement you may have executed
> +      with Licensor regarding such Contributions.
> +
> +   6. Trademarks. This License does not grant permission to use the trade
> +      names, trademarks, service marks, or product names of the Licensor,
> +      except as required for reasonable and customary use in describing the
> +      origin of the Work and reproducing the content of the NOTICE file.
> +
> +   7. Disclaimer of Warranty. Unless required by applicable law or
> +      agreed to in writing, Licensor provides the Work (and each
> +      Contributor provides its Contributions) on an "AS IS" BASIS,
> +      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
> +      implied, including, without limitation, any warranties or conditions
> +      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
> +      PARTICULAR PURPOSE. You are solely responsible for determining the
> +      appropriateness of using or redistributing the Work and assume any
> +      risks associated with Your exercise of permissions under this License.
> +
> +   8. Limitation of Liability. In no event and under no legal theory,
> +      whether in tort (including negligence), contract, or otherwise,
> +      unless required by applicable law (such as deliberate and grossly
> +      negligent acts) or agreed to in writing, shall any Contributor be
> +      liable to You for damages, including any direct, indirect, special,
> +      incidental, or consequential damages of any character arising as a
> +      result of this License or out of the use or inability to use the
> +      Work (including but not limited to damages for loss of goodwill,
> +      work stoppage, computer failure or malfunction, or any and all
> +      other commercial damages or losses), even if such Contributor
> +      has been advised of the possibility of such damages.
> +
> +   9. Accepting Warranty or Additional Liability. While redistributing
> +      the Work or Derivative Works thereof, You may choose to offer,
> +      and charge a fee for, acceptance of support, warranty, indemnity,
> +      or other liability obligations and/or rights consistent with this
> +      License. However, in accepting such obligations, You may act only
> +      on Your own behalf and on Your sole responsibility, not on behalf
> +      of any other Contributor, and only if You agree to indemnify,
> +      defend, and hold each Contributor harmless for any liability
> +      incurred by, or claims asserted against, such Contributor by reason
> +      of your accepting any such warranty or additional liability.
> +
> +   END OF TERMS AND CONDITIONS
> +
> +   APPENDIX: How to apply the Apache License to your work.
> +
> +      To apply the Apache License to your work, attach the following
> +      boilerplate notice, with the fields enclosed by brackets "[]"
> +      replaced with your own identifying information. (Don't include
> +      the brackets!)  The text should be enclosed in the appropriate
> +      comment syntax for the file format. We also recommend that a
> +      file or class name and description of purpose be included on the
> +      same "printed page" as the copyright notice for easier
> +      identification within third-party archives.
> +
> +   Copyright [yyyy] [name of copyright owner]
> +
> +   Licensed 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.
> +
> 
> Added: geronimo/server/trunk/configs/jsr88-deploymentfactory/NOTICE.txt
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jsr88-deploymentfactory/NOTICE.txt?view=auto&rev=508724
> ==============================================================================
> --- geronimo/server/trunk/configs/jsr88-deploymentfactory/NOTICE.txt (added)
> +++ geronimo/server/trunk/configs/jsr88-deploymentfactory/NOTICE.txt Sat Feb 17 00:01:26 2007
> @@ -0,0 +1,6 @@
> +Apache Geronimo 
> +Copyright 2003-2006 The Apache Software Foundation
> +
> +This product includes software developed by
> +The Apache Software Foundation (http://www.apache.org/).
> +
> 
> Added: geronimo/server/trunk/configs/jsr88-deploymentfactory/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jsr88-deploymentfactory/pom.xml?view=auto&rev=508724
> ==============================================================================
> --- geronimo/server/trunk/configs/jsr88-deploymentfactory/pom.xml (added)
> +++ geronimo/server/trunk/configs/jsr88-deploymentfactory/pom.xml Sat Feb 17 00:01:26 2007
> @@ -0,0 +1,94 @@
> +<?xml version="1.0" encoding="ISO-8859-1"?>
> +<!--
> + 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.
> +-->
> +
> +<!-- $Rev: 483063 $ $Date: 2006-12-07 00:05:35 +1100 (Thu, 07 Dec 2006) $ -->
> +
> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
> +
> +    <modelVersion>4.0.0</modelVersion>
> +
> +    <parent>
> +        <groupId>org.apache.geronimo.configs</groupId>
> +        <artifactId>configs</artifactId>
> +        <version>2.0-SNAPSHOT</version>
> +        <relativePath>../pom.xml</relativePath>
> +    </parent>
> +
> +    <artifactId>jsr88-deploymentfactory</artifactId>
> +    <name>Geronimo Configs :: JSR88 DeploymentFactory</name>
> +    <packaging>car</packaging>
> +
> +    <build>
> +        <plugins>
> +            <plugin>
> +                <groupId>org.apache.geronimo.plugins</groupId>
> +                <artifactId>car-maven-plugin</artifactId>
> +                <configuration>
> +                    <archive>
> +                        <manifestEntries>
> +                            <J2EE-DeploymentFactory-Implementation-Class>org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryBootstrapper</J2EE-DeploymentFactory-Implementation-Class>
> +                        </manifestEntries>
> +                    </archive>
> +
> +                    <!--
> +                    NOTE: This list of dependencies is non-transitive.
> +                    -->
> +                    <classpath>
> +                        <element>
> +                            <groupId>org.apache.geronimo.modules</groupId>
> +                            <artifactId>geronimo-kernel</artifactId>
> +                            <version>${version}</version>
> +                        </element>
> +                        <element>
> +                            <groupId>org.apache.geronimo.modules</groupId>
> +                            <artifactId>geronimo-deploy-jsr88-bootstrapper</artifactId>
> +                            <version>${version}</version>
> +                        </element>                        
> +                        <element>
> +                            <groupId>mx4j</groupId>
> +                            <artifactId>mx4j</artifactId>
> +                        </element>
> +                        <element>
> +                            <groupId>commons-logging</groupId>
> +                            <artifactId>commons-logging</artifactId>
> +                        </element>
> +                        <element>
> +                            <groupId>cglib</groupId>
> +                            <artifactId>cglib-nodep</artifactId>
> +                        </element>
> +                        <element>
> +                            <groupId>log4j</groupId>
> +                            <artifactId>log4j</artifactId>
> +                        </element>
> +                        <element>
> +                            <groupId>xpp3</groupId>
> +                            <artifactId>xpp3</artifactId>
> +                        </element>
> +                        <element>
> +                            <groupId>xstream</groupId>
> +                            <artifactId>xstream</artifactId>
> +                        </element>
> +                    </classpath>
> +                    <classpathPrefix>../lib</classpathPrefix>
> +                </configuration>
> +            </plugin>
> +        </plugins>
> +    </build>
> +
> +</project>
> +
> 
> Added: geronimo/server/trunk/configs/jsr88-deploymentfactory/src/main/resources/META-INF/startup-jar
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jsr88-deploymentfactory/src/main/resources/META-INF/startup-jar?view=auto&rev=508724
> ==============================================================================
> --- geronimo/server/trunk/configs/jsr88-deploymentfactory/src/main/resources/META-INF/startup-jar (added)
> +++ geronimo/server/trunk/configs/jsr88-deploymentfactory/src/main/resources/META-INF/startup-jar Sat Feb 17 00:01:26 2007
> @@ -0,0 +1,18 @@
> +<!--
> +  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.
> +-->
> +This file tells the Geronimo bootstrap where to look for its installation
> +directory, which is ../ from wherever the jar containing this file lives.
> \ No newline at end of file
> 
> Added: geronimo/server/trunk/configs/jsr88-deploymentfactory/src/plan/plan.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jsr88-deploymentfactory/src/plan/plan.xml?view=auto&rev=508724
> ==============================================================================
> --- geronimo/server/trunk/configs/jsr88-deploymentfactory/src/plan/plan.xml (added)
> +++ geronimo/server/trunk/configs/jsr88-deploymentfactory/src/plan/plan.xml Sat Feb 17 00:01:26 2007
> @@ -0,0 +1,94 @@
> +<?xml version="1.0" encoding="UTF-8"?>
> +<!--
> +    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.
> +-->
> +
> +<!-- $Rev: 470743 $ $Date: 2006-11-03 21:05:22 +1100 (Fri, 03 Nov 2006) $ -->
> +
> +<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>
> +
> +    <!--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>AttributeManager</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>
> +
> +</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=508724&r1=508723&r2=508724
> ==============================================================================
> --- geronimo/server/trunk/configs/online-deployer/pom.xml (original)
> +++ geronimo/server/trunk/configs/online-deployer/pom.xml Sat Feb 17 00:01:26 2007
> @@ -45,7 +45,7 @@
>                              <Extension-Dirs>lib/ext</Extension-Dirs>
>                          </manifestEntries>
>                          <manifest>
> -                            <mainClass>org.apache.geronimo.deployment.cli.DeployTool</mainClass>
> +                            <mainClass>org.apache.geronimo.kernel.util.MainBootstrapper</mainClass>
>                          </manifest>
>                      </archive>
>  
> @@ -55,51 +55,14 @@
>                      <classpath>
>                          <element>
>                              <groupId>org.apache.geronimo.modules</groupId>
> -                            <artifactId>geronimo-common</artifactId>
> -                            <version>${version}</version>
> -                        </element>
> -                        <element>
> -                            <groupId>org.apache.geronimo.modules</groupId>
>                              <artifactId>geronimo-kernel</artifactId>
>                              <version>${version}</version>
>                          </element>
>                          <element>
> -                            <groupId>org.apache.geronimo.modules</groupId>
> -                            <artifactId>geronimo-system</artifactId>
> -                            <version>${version}</version>
> -                        </element>
> -                        <element>
> -                            <groupId>org.apache.geronimo.modules</groupId>
> -                            <artifactId>geronimo-util</artifactId>
> -                            <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>
> @@ -110,10 +73,6 @@
>                          <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=508724&r1=508723&r2=508724
> ==============================================================================
> --- geronimo/server/trunk/configs/online-deployer/src/plan/plan.xml (original)
> +++ geronimo/server/trunk/configs/online-deployer/src/plan/plan.xml Sat Feb 17 00:01:26 2007
> @@ -19,5 +19,84 @@
>  <!-- $Rev$ $Date$ -->
>  
>  <module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
> -    <environment/>
> +
> +    <!-- 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>
> +
>  </module>
> 
> Modified: geronimo/server/trunk/configs/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/pom.xml?view=diff&rev=508724&r1=508723&r2=508724
> ==============================================================================
> --- geronimo/server/trunk/configs/pom.xml (original)
> +++ geronimo/server/trunk/configs/pom.xml Sat Feb 17 00:01:26 2007
> @@ -129,9 +129,16 @@
>          <module>javamail</module>
>          <module>jsp-examples-jetty</module>
>          <module>jsp-examples-tomcat</module>
> +        <module>jsr88-cli</module>
> +        <module>jsr88-deploymentfactory</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-corba-deployer</module>
> 
> Modified: geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/pom.xml?view=diff&rev=508724&r1=508723&r2=508724
> ==============================================================================
> --- geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/pom.xml (original)
> +++ geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/pom.xml Sat Feb 17 00:01:26 2007
> @@ -43,6 +43,13 @@
>      <dependencies>
>  
>          <dependency>
> +            <groupId>org.apache.geronimo.configs</groupId>
> +            <artifactId>jsr88-deploymentfactory</artifactId>
> +            <version>${version}</version>
> +            <type>car</type>
> +        </dependency>
> +
> +        <dependency>
>              <groupId>org.apache.geronimo.modules</groupId>
>              <artifactId>geronimo-deploy-jsr88</artifactId>
>              <version>${version}</version>
> 
> 
> 

Mime
View raw message