geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gdam...@apache.org
Subject svn commit: r503370 [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 Sun, 04 Feb 2007 07:38:39 GMT
Author: gdamour
Date: Sat Feb  3 23:38:35 2007
New Revision: 503370

URL: http://svn.apache.org/viewvc?view=rev&rev=503370
Log:
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.

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
    geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/config/jsr88-configurer-config.xml
    geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/config/offline-deployer-config.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/jsr88-configurer-config.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/offline-deployer-config.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/var/config/jsr88-configurer-config.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/var/config/offline-deployer-config.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/jsr88-configurer-config.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/offline-deployer-config.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/var/config/jsr88-configurer-config.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/var/config/offline-deployer-config.xml
    geronimo/server/trunk/configs/jsr88-cli/
    geronimo/server/trunk/configs/jsr88-cli/LICENSE.txt
    geronimo/server/trunk/configs/jsr88-cli/NOTICE.txt
    geronimo/server/trunk/configs/jsr88-cli/pom.xml
    geronimo/server/trunk/configs/jsr88-cli/src/
    geronimo/server/trunk/configs/jsr88-cli/src/plan/
    geronimo/server/trunk/configs/jsr88-cli/src/plan/plan.xml
    geronimo/server/trunk/configs/jsr88-ear-configurer/
    geronimo/server/trunk/configs/jsr88-ear-configurer/LICENSE.txt
    geronimo/server/trunk/configs/jsr88-ear-configurer/NOTICE.txt
    geronimo/server/trunk/configs/jsr88-ear-configurer/pom.xml
    geronimo/server/trunk/configs/jsr88-ear-configurer/src/
    geronimo/server/trunk/configs/jsr88-ear-configurer/src/plan/
    geronimo/server/trunk/configs/jsr88-ear-configurer/src/plan/plan.xml
    geronimo/server/trunk/configs/jsr88-jar-configurer/
    geronimo/server/trunk/configs/jsr88-jar-configurer/LICENSE.txt
    geronimo/server/trunk/configs/jsr88-jar-configurer/NOTICE.txt
    geronimo/server/trunk/configs/jsr88-jar-configurer/pom.xml
    geronimo/server/trunk/configs/jsr88-jar-configurer/src/
    geronimo/server/trunk/configs/jsr88-jar-configurer/src/plan/
    geronimo/server/trunk/configs/jsr88-jar-configurer/src/plan/plan.xml
    geronimo/server/trunk/configs/jsr88-rar-configurer/
    geronimo/server/trunk/configs/jsr88-rar-configurer/LICENSE.txt
    geronimo/server/trunk/configs/jsr88-rar-configurer/NOTICE.txt
    geronimo/server/trunk/configs/jsr88-rar-configurer/pom.xml
    geronimo/server/trunk/configs/jsr88-rar-configurer/src/
    geronimo/server/trunk/configs/jsr88-rar-configurer/src/plan/
    geronimo/server/trunk/configs/jsr88-rar-configurer/src/plan/plan.xml
    geronimo/server/trunk/configs/jsr88-war-configurer/
    geronimo/server/trunk/configs/jsr88-war-configurer/LICENSE.txt
    geronimo/server/trunk/configs/jsr88-war-configurer/NOTICE.txt
    geronimo/server/trunk/configs/jsr88-war-configurer/pom.xml
    geronimo/server/trunk/configs/jsr88-war-configurer/src/
    geronimo/server/trunk/configs/jsr88-war-configurer/src/plan/
    geronimo/server/trunk/configs/jsr88-war-configurer/src/plan/plan.xml
    geronimo/server/trunk/configs/offline-deployer/
    geronimo/server/trunk/configs/offline-deployer/LICENSE.txt
    geronimo/server/trunk/configs/offline-deployer/NOTICE.txt
    geronimo/server/trunk/configs/offline-deployer/pom.xml
    geronimo/server/trunk/configs/offline-deployer/src/
    geronimo/server/trunk/configs/offline-deployer/src/plan/
    geronimo/server/trunk/configs/offline-deployer/src/plan/plan.xml
    geronimo/server/trunk/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/OfflineDeployerStarter.java
    geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/SwitchablePersistentConfigurationList.java
    geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/Main.java
    geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/MainBootstrapper.java
    geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/SwitchableLocalAttributeManager.java
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
Modified:
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/util/PortletManager.java
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml
    geronimo/server/trunk/assemblies/geronimo-framework/pom.xml
    geronimo/server/trunk/assemblies/geronimo-framework/src/main/assembly/bin.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/assembly/bin.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/assembly/bin.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/pom.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/assembly/bin.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/assembly/bin.xml
    geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml
    geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml
    geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml
    geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml
    geronimo/server/trunk/configs/online-deployer/pom.xml
    geronimo/server/trunk/configs/online-deployer/src/plan/plan.xml
    geronimo/server/trunk/configs/pom.xml
    geronimo/server/trunk/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/jsr88/ClientConfigurer.java
    geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/factories/DeploymentFactoryImpl.java
    geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java
    geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/LocalDeploymentManager.java
    geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/RemoteDeploymentManager.java
    geronimo/server/trunk/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/AbstractCommand.java
    geronimo/server/trunk/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/DeployTool.java
    geronimo/server/trunk/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/ServerConnection.java
    geronimo/server/trunk/modules/geronimo-hot-deploy/src/main/java/org/apache/geronimo/deployment/hot/DirectoryHotDeployer.java
    geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationUtil.java

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/util/PortletManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/util/PortletManager.java?view=diff&rev=503370&r1=503369&r2=503370
==============================================================================
--- 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  3 23:38:35 2007
@@ -77,6 +77,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 +93,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 DeploymentFactoryImpl(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=503370&r1=503369&r2=503370
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml Sat Feb  3 23:38:35 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,22 +90,8 @@
                                     <artifactId>ognl</artifactId>
                                 </artifactItem>
                                 <artifactItem>
-                                    <groupId>org.apache.geronimo.specs</groupId>
-                                    <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
-                                </artifactItem>
-                                <artifactItem>
                                     <groupId>org.apache.geronimo.modules</groupId>
                                     <artifactId>geronimo-common</artifactId>
-                                    <version>${version}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
-                                    <artifactId>geronimo-deploy-jsr88</artifactId>
-                                    <version>${version}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
-                                    <artifactId>geronimo-deploy-tool</artifactId>
                                     <version>${version}</version>
                                 </artifactItem>
                                 <artifactItem>

Added: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/log/deployer-log4j.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/log/deployer-log4j.properties?view=auto&rev=503370
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/log/deployer-log4j.properties (added)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/log/deployer-log4j.properties Sat Feb  3 23:38:35 2007
@@ -0,0 +1,67 @@
+##
+## 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: 497133 $ $Date: 2007-01-18 06:30:30 +1100 (Thu, 18 Jan 2007) $
+##
+
+log4j.rootLogger=INFO, CONSOLE, FILE
+
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.Threshold=${org.apache.geronimo.log.ConsoleLogLevel}
+log4j.appender.CONSOLE.Target=System.out
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n
+
+log4j.appender.FILE=org.apache.log4j.RollingFileAppender
+log4j.appender.FILE.threshold=INFO
+log4j.appender.FILE.layout=org.apache.log4j.PatternLayout
+log4j.appender.FILE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n
+
+#
+# Note, changing log4j.appender.FILE.append=false will result in logs being
+# overwritten without archiving the previous version of the log.
+#
+log4j.appender.FILE.append=true
+log4j.appender.FILE.file=${org.apache.geronimo.server.dir}/var/log/deployer.log
+log4j.appender.FILE.bufferedIO=false
+log4j.appender.FILE.maxBackupIndex=3
+log4j.appender.FILE.maxFileSize=10MB
+
+#
+# Example: enable trace logging from CONSOLE appender
+#
+#log4j.appender.CONSOLE.Threshold=TRACE#org.apache.geronimo.system.logging.log4j.XLevel
+
+#
+# Example: enable trace messages from foo.bar category
+#
+#log4j.logger.foo.bar=TRACE#org.apache.geronimo.system.logging.log4j.XLevel
+
+#### This will help find connection leak problems ####
+#log4j.logger.org.apache.geronimo.connector.outbound=TRACE#org.apache.geronimo.system.logging.log4j.XLevel
+
+#### Eliminate any INFO level output during normal operation -- except the really relevant stuff ####
+#    We can change the Geronimo code to avoid this, but we have to just adjust the log levels for
+#    any third-party libraries.
+log4j.logger.org.apache.commons.digester=ERROR
+log4j.logger.org.apache.jasper.compiler.SmapUtil=WARN
+
+# Prints the MBean Server ID
+log4j.logger.javax.management.MBeanServerFactory=WARN
+
+# Prints the RMI connection URL
+log4j.logger.javax.management.remote.rmi.RMIConnectorServer=WARN
+log4j.logger.javax.management.remote.JMXServiceURL=WARN

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=503370&r1=503369&r2=503370
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-framework/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-framework/pom.xml Sat Feb  3 23:38:35 2007
@@ -90,6 +90,20 @@
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>offline-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jsr88-cli</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+ 
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>unavailable-client-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -117,7 +131,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 +212,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=503370&r1=503369&r2=503370
==============================================================================
--- 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  3 23:38:35 2007
@@ -132,17 +132,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>

Added: geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/config/jsr88-configurer-config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/config/jsr88-configurer-config.xml?view=auto&rev=503370
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/config/jsr88-configurer-config.xml (added)
+++ geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/config/jsr88-configurer-config.xml Sat Feb  3 23:38:35 2007
@@ -0,0 +1,23 @@
+<?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: 502583 $ $Date: 2007-02-02 22:36:02 +1100 (Fri, 02 Feb 2007) $ -->
+
+<attributes xmlns="http://geronimo.apache.org/xml/ns/attributes-1.1">
+  <module name="org.apache.geronimo.configs/jsr88-cli/${version}/car"/>
+</attributes>

Added: geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/config/offline-deployer-config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/config/offline-deployer-config.xml?view=auto&rev=503370
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/config/offline-deployer-config.xml (added)
+++ geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/config/offline-deployer-config.xml Sat Feb  3 23:38:35 2007
@@ -0,0 +1,23 @@
+<?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: 502583 $ $Date: 2007-02-02 22:36:02 +1100 (Fri, 02 Feb 2007) $ -->
+
+<attributes xmlns="http://geronimo.apache.org/xml/ns/attributes-1.1">
+  <module name="org.apache.geronimo.configs/geronimo-gbean-deployer/${version}/car"/>
+</attributes>

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=503370&r1=503369&r2=503370
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml Sat Feb  3 23:38:35 2007
@@ -207,6 +207,27 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>online-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>offline-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jsr88-cli</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -324,12 +345,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>
+        <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>
@@ -357,14 +399,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 +482,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=503370&r1=503369&r2=503370
==============================================================================
--- 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  3 23:38:35 2007
@@ -145,17 +145,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>

Added: geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/jsr88-configurer-config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/jsr88-configurer-config.xml?view=auto&rev=503370
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/jsr88-configurer-config.xml (added)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/jsr88-configurer-config.xml Sat Feb  3 23:38:35 2007
@@ -0,0 +1,27 @@
+<?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: 502583 $ $Date: 2007-02-02 22:36:02 +1100 (Fri, 02 Feb 2007) $ -->
+
+<attributes xmlns="http://geronimo.apache.org/xml/ns/attributes-1.1">
+  <module name="org.apache.geronimo.configs/jsr88-cli/${version}/car"/>
+  <module name="org.apache.geronimo.configs/jsr88-jar-configurer/${version}/car"/>
+  <module name="org.apache.geronimo.configs/jsr88-rar-configurer/${version}/car"/>
+  <module name="org.apache.geronimo.configs/jsr88-war-configurer/${version}/car"/>
+  <module name="org.apache.geronimo.configs/jsr88-ear-configurer/${version}/car"/>
+</attributes>

Added: geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/offline-deployer-config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/offline-deployer-config.xml?view=auto&rev=503370
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/offline-deployer-config.xml (added)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/offline-deployer-config.xml Sat Feb  3 23:38:35 2007
@@ -0,0 +1,29 @@
+<?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: 502583 $ $Date: 2007-02-02 22:36:02 +1100 (Fri, 02 Feb 2007) $ -->
+
+<attributes xmlns="http://geronimo.apache.org/xml/ns/attributes-1.1">
+  <module name="org.apache.geronimo.configs/geronimo-gbean-deployer/${version}/car"/>
+  <module name="org.apache.geronimo.configs/j2ee-deployer/${version}/car"/>
+  <module name="org.apache.geronimo.configs/client-deployer/${version}/car"/>
+  <module name="org.apache.geronimo.configs/connector-deployer/${version}/car"/>
+  <module name="org.apache.geronimo.configs/jetty6-deployer/${version}/car"/>
+  <module name="org.apache.geronimo.configs/axis-deployer/${version}/car"/>
+  <module name="org.apache.geronimo.configs/openejb-deployer/${version}/car"/>
+</attributes>

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=503370&r1=503369&r2=503370
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml Sat Feb  3 23:38:35 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,41 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>offline-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jsr88-cli</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+ 
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jsr88-rar-configurer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jsr88-war-configurer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jsr88-ear-configurer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>unavailable-client-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -159,7 +194,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 +270,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=503370&r1=503369&r2=503370
==============================================================================
--- 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  3 23:38:35 2007
@@ -132,17 +132,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>

Added: geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/var/config/jsr88-configurer-config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/var/config/jsr88-configurer-config.xml?view=auto&rev=503370
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/var/config/jsr88-configurer-config.xml (added)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/var/config/jsr88-configurer-config.xml Sat Feb  3 23:38:35 2007
@@ -0,0 +1,26 @@
+<?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: 502583 $ $Date: 2007-02-02 22:36:02 +1100 (Fri, 02 Feb 2007) $ -->
+
+<attributes xmlns="http://geronimo.apache.org/xml/ns/attributes-1.1">
+  <module name="org.apache.geronimo.configs/jsr88-cli/${version}/car"/>
+  <module name="org.apache.geronimo.configs/jsr88-rar-configurer/${version}/car"/>
+  <module name="org.apache.geronimo.configs/jsr88-war-configurer/${version}/car"/>
+  <module name="org.apache.geronimo.configs/jsr88-ear-configurer/${version}/car"/>
+</attributes>

Added: geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/var/config/offline-deployer-config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/var/config/offline-deployer-config.xml?view=auto&rev=503370
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/var/config/offline-deployer-config.xml (added)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/var/config/offline-deployer-config.xml Sat Feb  3 23:38:35 2007
@@ -0,0 +1,31 @@
+<?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: 502583 $ $Date: 2007-02-02 22:36:02 +1100 (Fri, 02 Feb 2007) $ -->
+
+<attributes xmlns="http://geronimo.apache.org/xml/ns/attributes-1.1">
+  <module name="org.apache.geronimo.configs/geronimo-gbean-deployer/${version}/car"/>
+  <module name="org.apache.geronimo.configs/persistence-jpa10-deployer/${version}/car"/>
+  <module name="org.apache.geronimo.configs/j2ee-deployer/${version}/car"/>
+  <module name="org.apache.geronimo.configs/client-deployer/${version}/car"/>
+  <module name="org.apache.geronimo.configs/connector-deployer/${version}/car"/>
+  <module name="org.apache.geronimo.configs/unavailable-ejb-deployer/${version}/car"/>
+  <module name="org.apache.geronimo.configs/unavailable-webservices-deployer/${version}/car"/>
+  <module name="org.apache.geronimo.configs/unavailable-client-deployer/${version}/car"/>
+  <module name="org.apache.geronimo.configs/jetty6-deployer/${version}/car"/>
+</attributes>

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=503370&r1=503369&r2=503370
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/pom.xml Sat Feb  3 23:38:35 2007
@@ -322,7 +322,49 @@
             <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-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 +379,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 +455,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=503370&r1=503369&r2=503370
==============================================================================
--- 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  3 23:38:35 2007
@@ -145,17 +145,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>

Added: geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/jsr88-configurer-config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/jsr88-configurer-config.xml?view=auto&rev=503370
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/jsr88-configurer-config.xml (added)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/jsr88-configurer-config.xml Sat Feb  3 23:38:35 2007
@@ -0,0 +1,27 @@
+<?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: 502583 $ $Date: 2007-02-02 22:36:02 +1100 (Fri, 02 Feb 2007) $ -->
+
+<attributes xmlns="http://geronimo.apache.org/xml/ns/attributes-1.1">
+  <module name="org.apache.geronimo.configs/jsr88-cli/${version}/car"/>
+  <module name="org.apache.geronimo.configs/jsr88-jar-configurer/${version}/car"/>
+  <module name="org.apache.geronimo.configs/jsr88-rar-configurer/${version}/car"/>
+  <module name="org.apache.geronimo.configs/jsr88-war-configurer/${version}/car"/>
+  <module name="org.apache.geronimo.configs/jsr88-ear-configurer/${version}/car"/>
+</attributes>

Added: geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/offline-deployer-config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/offline-deployer-config.xml?view=auto&rev=503370
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/offline-deployer-config.xml (added)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/offline-deployer-config.xml Sat Feb  3 23:38:35 2007
@@ -0,0 +1,31 @@
+<?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: 502583 $ $Date: 2007-02-02 22:36:02 +1100 (Fri, 02 Feb 2007) $ -->
+
+<attributes xmlns="http://geronimo.apache.org/xml/ns/attributes-1.1">
+  <module name="org.apache.geronimo.configs/geronimo-gbean-deployer/${version}/car"/>
+  <module name="org.apache.geronimo.configs/j2ee-deployer/${version}/car"/>
+  <module name="org.apache.geronimo.configs/client-deployer/${version}/car"/>
+  <module name="org.apache.geronimo.configs/connector-deployer/${version}/car"/>
+  <module name="org.apache.geronimo.configs/tomcat6-deployer/${version}/car"/>
+  <module name="org.apache.geronimo.configs/openejb-deployer/${version}/car"/>
+  <module name="org.apache.geronimo.configs/openejb-corba-deployer/${version}/car"/>
+  <module name="org.apache.geronimo.configs/persistence-jpa10-deployer/${version}/car"/>
+  <module name="org.apache.geronimo.configs/axis-deployer/${version}/car"/>
+</attributes>

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=503370&r1=503369&r2=503370
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml Sat Feb  3 23:38:35 2007
@@ -122,6 +122,41 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>offline-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jsr88-cli</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jsr88-rar-configurer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jsr88-war-configurer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jsr88-ear-configurer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
@@ -159,7 +194,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 +270,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=503370&r1=503369&r2=503370
==============================================================================
--- 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  3 23:38:35 2007
@@ -132,17 +132,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>

Added: geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/var/config/jsr88-configurer-config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/var/config/jsr88-configurer-config.xml?view=auto&rev=503370
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/var/config/jsr88-configurer-config.xml (added)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/var/config/jsr88-configurer-config.xml Sat Feb  3 23:38:35 2007
@@ -0,0 +1,26 @@
+<?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: 502583 $ $Date: 2007-02-02 22:36:02 +1100 (Fri, 02 Feb 2007) $ -->
+
+<attributes xmlns="http://geronimo.apache.org/xml/ns/attributes-1.1">
+  <module name="org.apache.geronimo.configs/jsr88-cli/${version}/car"/>
+  <module name="org.apache.geronimo.configs/jsr88-rar-configurer/${version}/car"/>
+  <module name="org.apache.geronimo.configs/jsr88-war-configurer/${version}/car"/>
+  <module name="org.apache.geronimo.configs/jsr88-ear-configurer/${version}/car"/>
+</attributes>

Added: geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/var/config/offline-deployer-config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/var/config/offline-deployer-config.xml?view=auto&rev=503370
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/var/config/offline-deployer-config.xml (added)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/var/config/offline-deployer-config.xml Sat Feb  3 23:38:35 2007
@@ -0,0 +1,30 @@
+<?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: 502583 $ $Date: 2007-02-02 22:36:02 +1100 (Fri, 02 Feb 2007) $ -->
+
+<attributes xmlns="http://geronimo.apache.org/xml/ns/attributes-1.1">
+  <module name="org.apache.geronimo.configs/geronimo-gbean-deployer/${version}/car"/>
+  <module name="org.apache.geronimo.configs/j2ee-deployer/${version}/car"/>
+  <module name="org.apache.geronimo.configs/unavailable-client-deployer/${version}/car"/>
+  <module name="org.apache.geronimo.configs/connector-deployer/${version}/car"/>
+  <module name="org.apache.geronimo.configs/tomcat6-deployer/${version}/car"/>
+  <module name="org.apache.geronimo.configs/persistence-jpa10-deployer/${version}/car"/>
+  <module name="org.apache.geronimo.configs/unavailable-ejb-deployer/${version}/car"/>
+  <module name="org.apache.geronimo.configs/unavailable-webservices-deployer/${version}/car"/>
+</attributes>

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=503370&r1=503369&r2=503370
==============================================================================
--- geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml Sat Feb  3 23:38:35 2007
@@ -87,9 +87,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=503370&r1=503369&r2=503370
==============================================================================
--- geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml Sat Feb  3 23:38:35 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=503370&r1=503369&r2=503370
==============================================================================
--- geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml Sat Feb  3 23:38:35 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=503370&r1=503369&r2=503370
==============================================================================
--- geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml Sat Feb  3 23:38:35 2007
@@ -131,6 +131,4 @@
         <attribute name="servletName">dummy</attribute>
     </gbean>
 
-    <gbean name="Jetty6WARConfigurer" class="org.apache.geronimo.web.deployment.WARConfigurer"/>
-
 </module>

Added: geronimo/server/trunk/configs/jsr88-cli/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jsr88-cli/LICENSE.txt?view=auto&rev=503370
==============================================================================
--- geronimo/server/trunk/configs/jsr88-cli/LICENSE.txt (added)
+++ geronimo/server/trunk/configs/jsr88-cli/LICENSE.txt Sat Feb  3 23:38:35 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-cli/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jsr88-cli/NOTICE.txt?view=auto&rev=503370
==============================================================================
--- geronimo/server/trunk/configs/jsr88-cli/NOTICE.txt (added)
+++ geronimo/server/trunk/configs/jsr88-cli/NOTICE.txt Sat Feb  3 23:38:35 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-cli/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jsr88-cli/pom.xml?view=auto&rev=503370
==============================================================================
--- geronimo/server/trunk/configs/jsr88-cli/pom.xml (added)
+++ geronimo/server/trunk/configs/jsr88-cli/pom.xml Sat Feb  3 23:38:35 2007
@@ -0,0 +1,69 @@
+<?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-cli</artifactId>
+    <name>Geronimo Configs :: JSR88 CLI</name>
+    <packaging>car</packaging>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-deploy-jsr88</artifactId>
+            <version>${version}</version>
+        </dependency>
+    
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-deploy-tool</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-deploy-config</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>mx4j</groupId>
+            <artifactId>mx4j-remote</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>
+

Added: 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=auto&rev=503370
==============================================================================
--- geronimo/server/trunk/configs/jsr88-cli/src/plan/plan.xml (added)
+++ geronimo/server/trunk/configs/jsr88-cli/src/plan/plan.xml Sat Feb  3 23:38:35 2007
@@ -0,0 +1,42 @@
+<?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}">
+
+    <gbean name="DeployTool" class="org.apache.geronimo.deployment.cli.DeployTool" />
+
+    <gbean name="ModuleConfigurerRegistry" class="org.apache.geronimo.deployment.plugin.jmx.RemoteDeploymentManager">
+        <references name="ModuleConfigurers">
+            <pattern>
+                <name>ClientConfigurer</name>
+            </pattern>
+            <pattern>
+                <name>EARConfigurer</name>
+            </pattern>
+            <pattern>
+                <name>RARConfigurer</name>
+            </pattern>
+            <pattern>
+                <name>WARConfigurer</name>
+            </pattern>
+        </references>
+    </gbean>
+
+</module>



Mime
View raw message