geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r371874 [1/2] - in /geronimo/trunk: assemblies/j2ee-jetty-server/ assemblies/j2ee-jetty-server/src/var/config/ assemblies/j2ee-tomcat-server/ assemblies/j2ee-tomcat-server/src/var/config/ assemblies/minimal-tomcat-server/ assemblies/minimal...
Date Tue, 24 Jan 2006 09:41:48 GMT
Author: djencks
Date: Tue Jan 24 01:40:34 2006
New Revision: 371874

URL: http://svn.apache.org/viewcvs?rev=371874&view=rev
Log:
GERONIMO-1427 Port lightweight geronimo work to trunk

Added:
    geronimo/trunk/assemblies/minimal-tomcat-server/
      - copied from r371794, geronimo/branches/lw_assemblies/assemblies/minimal-tomcat-server/
    geronimo/trunk/assemblies/minimal-tomcat-server/LICENSE.txt
      - copied unchanged from r371794, geronimo/branches/lw_assemblies/assemblies/minimal-tomcat-server/LICENSE.txt
    geronimo/trunk/assemblies/minimal-tomcat-server/NOTICE.txt
      - copied unchanged from r371794, geronimo/branches/lw_assemblies/assemblies/minimal-tomcat-server/NOTICE.txt
    geronimo/trunk/assemblies/minimal-tomcat-server/maven.xml
      - copied unchanged from r371794, geronimo/branches/lw_assemblies/assemblies/minimal-tomcat-server/maven.xml
    geronimo/trunk/assemblies/minimal-tomcat-server/project.properties
      - copied unchanged from r371794, geronimo/branches/lw_assemblies/assemblies/minimal-tomcat-server/project.properties
    geronimo/trunk/assemblies/minimal-tomcat-server/project.xml
      - copied, changed from r371794, geronimo/branches/lw_assemblies/assemblies/minimal-tomcat-server/project.xml
    geronimo/trunk/assemblies/minimal-tomcat-server/src/
      - copied from r371794, geronimo/branches/lw_assemblies/assemblies/minimal-tomcat-server/src/
    geronimo/trunk/assemblies/minimal-tomcat-server/src/var/
      - copied from r371794, geronimo/branches/lw_assemblies/assemblies/minimal-tomcat-server/src/var/
    geronimo/trunk/assemblies/minimal-tomcat-server/src/var/config/
      - copied from r371794, geronimo/branches/lw_assemblies/assemblies/minimal-tomcat-server/src/var/config/
    geronimo/trunk/assemblies/minimal-tomcat-server/src/var/config/README.txt
      - copied unchanged from r371794, geronimo/branches/lw_assemblies/assemblies/minimal-tomcat-server/src/var/config/README.txt
    geronimo/trunk/assemblies/minimal-tomcat-server/src/var/config/config.xml
      - copied unchanged from r371794, geronimo/branches/lw_assemblies/assemblies/minimal-tomcat-server/src/var/config/config.xml
    geronimo/trunk/assemblies/minimal-tomcat-server/src/var/log/
      - copied from r371794, geronimo/branches/lw_assemblies/assemblies/minimal-tomcat-server/src/var/log/
    geronimo/trunk/assemblies/minimal-tomcat-server/src/var/log/client-log4j.properties
      - copied unchanged from r371794, geronimo/branches/lw_assemblies/assemblies/minimal-tomcat-server/src/var/log/client-log4j.properties
    geronimo/trunk/assemblies/minimal-tomcat-server/src/var/log/deployer-log4j.properties
      - copied unchanged from r371794, geronimo/branches/lw_assemblies/assemblies/minimal-tomcat-server/src/var/log/deployer-log4j.properties
    geronimo/trunk/assemblies/minimal-tomcat-server/src/var/log/server-log4j.properties
      - copied unchanged from r371794, geronimo/branches/lw_assemblies/assemblies/minimal-tomcat-server/src/var/log/server-log4j.properties
    geronimo/trunk/assemblies/minimal-tomcat-server/src/var/security/
      - copied from r371794, geronimo/branches/lw_assemblies/assemblies/minimal-tomcat-server/src/var/security/
    geronimo/trunk/assemblies/minimal-tomcat-server/src/var/security/demo_groups.properties
      - copied unchanged from r371794, geronimo/branches/lw_assemblies/assemblies/minimal-tomcat-server/src/var/security/demo_groups.properties
    geronimo/trunk/assemblies/minimal-tomcat-server/src/var/security/demo_users.properties
      - copied unchanged from r371794, geronimo/branches/lw_assemblies/assemblies/minimal-tomcat-server/src/var/security/demo_users.properties
    geronimo/trunk/assemblies/minimal-tomcat-server/src/var/security/groups.properties
      - copied unchanged from r371794, geronimo/branches/lw_assemblies/assemblies/minimal-tomcat-server/src/var/security/groups.properties
    geronimo/trunk/assemblies/minimal-tomcat-server/src/var/security/keystore
      - copied unchanged from r371794, geronimo/branches/lw_assemblies/assemblies/minimal-tomcat-server/src/var/security/keystore
    geronimo/trunk/assemblies/minimal-tomcat-server/src/var/security/users.properties
      - copied unchanged from r371794, geronimo/branches/lw_assemblies/assemblies/minimal-tomcat-server/src/var/security/users.properties
    geronimo/trunk/assemblies/minimal-tomcat-server/src/var/temp/
      - copied from r371794, geronimo/branches/lw_assemblies/assemblies/minimal-tomcat-server/src/var/temp/
    geronimo/trunk/assemblies/minimal-tomcat-server/src/var/temp/README.txt
      - copied unchanged from r371794, geronimo/branches/lw_assemblies/assemblies/minimal-tomcat-server/src/var/temp/README.txt
    geronimo/trunk/assemblies/web-jms-tomcat-server/
      - copied from r371794, geronimo/branches/lw_assemblies/assemblies/web-jms-tomcat-server/
    geronimo/trunk/assemblies/web-jms-tomcat-server/LICENSE.txt
      - copied unchanged from r371794, geronimo/branches/lw_assemblies/assemblies/web-jms-tomcat-server/LICENSE.txt
    geronimo/trunk/assemblies/web-jms-tomcat-server/NOTICE.txt
      - copied unchanged from r371794, geronimo/branches/lw_assemblies/assemblies/web-jms-tomcat-server/NOTICE.txt
    geronimo/trunk/assemblies/web-jms-tomcat-server/maven.xml
      - copied unchanged from r371794, geronimo/branches/lw_assemblies/assemblies/web-jms-tomcat-server/maven.xml
    geronimo/trunk/assemblies/web-jms-tomcat-server/project.properties
      - copied unchanged from r371794, geronimo/branches/lw_assemblies/assemblies/web-jms-tomcat-server/project.properties
    geronimo/trunk/assemblies/web-jms-tomcat-server/project.xml
      - copied unchanged from r371794, geronimo/branches/lw_assemblies/assemblies/web-jms-tomcat-server/project.xml
    geronimo/trunk/assemblies/web-jms-tomcat-server/src/
      - copied from r371794, geronimo/branches/lw_assemblies/assemblies/web-jms-tomcat-server/src/
    geronimo/trunk/assemblies/web-jms-tomcat-server/src/var/
      - copied from r371794, geronimo/branches/lw_assemblies/assemblies/web-jms-tomcat-server/src/var/
    geronimo/trunk/assemblies/web-jms-tomcat-server/src/var/config/
      - copied from r371794, geronimo/branches/lw_assemblies/assemblies/web-jms-tomcat-server/src/var/config/
    geronimo/trunk/assemblies/web-jms-tomcat-server/src/var/config/README.txt
      - copied unchanged from r371794, geronimo/branches/lw_assemblies/assemblies/web-jms-tomcat-server/src/var/config/README.txt
    geronimo/trunk/assemblies/web-jms-tomcat-server/src/var/config/config.xml
      - copied unchanged from r371794, geronimo/branches/lw_assemblies/assemblies/web-jms-tomcat-server/src/var/config/config.xml
    geronimo/trunk/assemblies/web-jms-tomcat-server/src/var/log/
      - copied from r371794, geronimo/branches/lw_assemblies/assemblies/web-jms-tomcat-server/src/var/log/
    geronimo/trunk/assemblies/web-jms-tomcat-server/src/var/log/client-log4j.properties
      - copied unchanged from r371794, geronimo/branches/lw_assemblies/assemblies/web-jms-tomcat-server/src/var/log/client-log4j.properties
    geronimo/trunk/assemblies/web-jms-tomcat-server/src/var/log/deployer-log4j.properties
      - copied unchanged from r371794, geronimo/branches/lw_assemblies/assemblies/web-jms-tomcat-server/src/var/log/deployer-log4j.properties
    geronimo/trunk/assemblies/web-jms-tomcat-server/src/var/log/server-log4j.properties
      - copied unchanged from r371794, geronimo/branches/lw_assemblies/assemblies/web-jms-tomcat-server/src/var/log/server-log4j.properties
    geronimo/trunk/assemblies/web-jms-tomcat-server/src/var/security/
      - copied from r371794, geronimo/branches/lw_assemblies/assemblies/web-jms-tomcat-server/src/var/security/
    geronimo/trunk/assemblies/web-jms-tomcat-server/src/var/security/demo_groups.properties
      - copied unchanged from r371794, geronimo/branches/lw_assemblies/assemblies/web-jms-tomcat-server/src/var/security/demo_groups.properties
    geronimo/trunk/assemblies/web-jms-tomcat-server/src/var/security/demo_users.properties
      - copied unchanged from r371794, geronimo/branches/lw_assemblies/assemblies/web-jms-tomcat-server/src/var/security/demo_users.properties
    geronimo/trunk/assemblies/web-jms-tomcat-server/src/var/security/groups.properties
      - copied unchanged from r371794, geronimo/branches/lw_assemblies/assemblies/web-jms-tomcat-server/src/var/security/groups.properties
    geronimo/trunk/assemblies/web-jms-tomcat-server/src/var/security/keystore
      - copied unchanged from r371794, geronimo/branches/lw_assemblies/assemblies/web-jms-tomcat-server/src/var/security/keystore
    geronimo/trunk/assemblies/web-jms-tomcat-server/src/var/security/users.properties
      - copied unchanged from r371794, geronimo/branches/lw_assemblies/assemblies/web-jms-tomcat-server/src/var/security/users.properties
    geronimo/trunk/assemblies/web-jms-tomcat-server/src/var/temp/
      - copied from r371794, geronimo/branches/lw_assemblies/assemblies/web-jms-tomcat-server/src/var/temp/
    geronimo/trunk/assemblies/web-jms-tomcat-server/src/var/temp/README.txt
      - copied unchanged from r371794, geronimo/branches/lw_assemblies/assemblies/web-jms-tomcat-server/src/var/temp/README.txt
    geronimo/trunk/configs/client-deployer/
      - copied from r371794, geronimo/branches/lw_assemblies/configs/client-deployer/
    geronimo/trunk/configs/client-deployer/LICENSE.txt
      - copied unchanged from r371794, geronimo/branches/lw_assemblies/configs/client-deployer/LICENSE.txt
    geronimo/trunk/configs/client-deployer/NOTICE.txt
      - copied unchanged from r371794, geronimo/branches/lw_assemblies/configs/client-deployer/NOTICE.txt
    geronimo/trunk/configs/client-deployer/maven.xml
      - copied unchanged from r371794, geronimo/branches/lw_assemblies/configs/client-deployer/maven.xml
    geronimo/trunk/configs/client-deployer/project.properties
      - copied unchanged from r371794, geronimo/branches/lw_assemblies/configs/client-deployer/project.properties
    geronimo/trunk/configs/client-deployer/project.xml
      - copied unchanged from r371794, geronimo/branches/lw_assemblies/configs/client-deployer/project.xml
    geronimo/trunk/configs/client-deployer/src/
      - copied from r371794, geronimo/branches/lw_assemblies/configs/client-deployer/src/
    geronimo/trunk/configs/client-deployer/src/plan/
      - copied from r371794, geronimo/branches/lw_assemblies/configs/client-deployer/src/plan/
    geronimo/trunk/configs/client-deployer/src/plan/plan.xml
      - copied unchanged from r371794, geronimo/branches/lw_assemblies/configs/client-deployer/src/plan/plan.xml
    geronimo/trunk/configs/unavailable-ejb-deployer/
      - copied from r371794, geronimo/branches/lw_assemblies/configs/unavailable-ejb-deployer/
    geronimo/trunk/configs/unavailable-ejb-deployer/LICENSE.txt
      - copied unchanged from r371794, geronimo/branches/lw_assemblies/configs/unavailable-ejb-deployer/LICENSE.txt
    geronimo/trunk/configs/unavailable-ejb-deployer/NOTICE.txt
      - copied unchanged from r371794, geronimo/branches/lw_assemblies/configs/unavailable-ejb-deployer/NOTICE.txt
    geronimo/trunk/configs/unavailable-ejb-deployer/build.txt
      - copied unchanged from r371794, geronimo/branches/lw_assemblies/configs/unavailable-ejb-deployer/build.txt
    geronimo/trunk/configs/unavailable-ejb-deployer/maven.xml
      - copied unchanged from r371794, geronimo/branches/lw_assemblies/configs/unavailable-ejb-deployer/maven.xml
    geronimo/trunk/configs/unavailable-ejb-deployer/project.properties
      - copied unchanged from r371794, geronimo/branches/lw_assemblies/configs/unavailable-ejb-deployer/project.properties
    geronimo/trunk/configs/unavailable-ejb-deployer/project.xml
      - copied unchanged from r371794, geronimo/branches/lw_assemblies/configs/unavailable-ejb-deployer/project.xml
    geronimo/trunk/configs/unavailable-ejb-deployer/src/
      - copied from r371794, geronimo/branches/lw_assemblies/configs/unavailable-ejb-deployer/src/
    geronimo/trunk/configs/unavailable-ejb-deployer/src/plan/
      - copied from r371794, geronimo/branches/lw_assemblies/configs/unavailable-ejb-deployer/src/plan/
    geronimo/trunk/configs/unavailable-ejb-deployer/src/plan/plan.xml
      - copied unchanged from r371794, geronimo/branches/lw_assemblies/configs/unavailable-ejb-deployer/src/plan/plan.xml
    geronimo/trunk/configs/unavailable-webservices-deployer/
      - copied from r371794, geronimo/branches/lw_assemblies/configs/unavailable-webservices-deployer/
    geronimo/trunk/configs/unavailable-webservices-deployer/LICENSE.txt
      - copied unchanged from r371794, geronimo/branches/lw_assemblies/configs/unavailable-webservices-deployer/LICENSE.txt
    geronimo/trunk/configs/unavailable-webservices-deployer/NOTICE.txt
      - copied unchanged from r371794, geronimo/branches/lw_assemblies/configs/unavailable-webservices-deployer/NOTICE.txt
    geronimo/trunk/configs/unavailable-webservices-deployer/maven.xml
      - copied unchanged from r371794, geronimo/branches/lw_assemblies/configs/unavailable-webservices-deployer/maven.xml
    geronimo/trunk/configs/unavailable-webservices-deployer/project.properties
      - copied unchanged from r371794, geronimo/branches/lw_assemblies/configs/unavailable-webservices-deployer/project.properties
    geronimo/trunk/configs/unavailable-webservices-deployer/project.xml
      - copied unchanged from r371794, geronimo/branches/lw_assemblies/configs/unavailable-webservices-deployer/project.xml
    geronimo/trunk/configs/unavailable-webservices-deployer/src/
      - copied from r371794, geronimo/branches/lw_assemblies/configs/unavailable-webservices-deployer/src/
    geronimo/trunk/configs/unavailable-webservices-deployer/src/plan/
      - copied from r371794, geronimo/branches/lw_assemblies/configs/unavailable-webservices-deployer/src/plan/
    geronimo/trunk/configs/unavailable-webservices-deployer/src/plan/plan.xml
      - copied unchanged from r371794, geronimo/branches/lw_assemblies/configs/unavailable-webservices-deployer/src/plan/plan.xml
Modified:
    geronimo/trunk/assemblies/j2ee-jetty-server/project.xml
    geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml
    geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml
    geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml
    geronimo/trunk/configs/axis-deployer/project.xml
    geronimo/trunk/configs/console-jetty/project.properties
    geronimo/trunk/configs/console-jetty/project.xml
    geronimo/trunk/configs/console-tomcat/project.properties
    geronimo/trunk/configs/console-tomcat/project.xml
    geronimo/trunk/configs/daytrader-jetty/project.properties
    geronimo/trunk/configs/daytrader-jetty/project.xml
    geronimo/trunk/configs/daytrader-tomcat/project.properties
    geronimo/trunk/configs/daytrader-tomcat/project.xml
    geronimo/trunk/configs/j2ee-corba/project.properties
    geronimo/trunk/configs/j2ee-corba/project.xml
    geronimo/trunk/configs/j2ee-deployer/project.xml
    geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml
    geronimo/trunk/configs/jetty-deployer/src/plan/plan.xml
    geronimo/trunk/configs/jmxdebug-jetty/project.properties
    geronimo/trunk/configs/jmxdebug-jetty/project.xml
    geronimo/trunk/configs/jmxdebug-tomcat/project.properties
    geronimo/trunk/configs/jmxdebug-tomcat/project.xml
    geronimo/trunk/configs/jsp-examples-jetty/project.properties
    geronimo/trunk/configs/jsp-examples-jetty/project.xml
    geronimo/trunk/configs/jsp-examples-tomcat/project.properties
    geronimo/trunk/configs/jsp-examples-tomcat/project.xml
    geronimo/trunk/configs/ldap-demo-jetty/project.properties
    geronimo/trunk/configs/ldap-demo-jetty/project.xml
    geronimo/trunk/configs/ldap-demo-tomcat/project.properties
    geronimo/trunk/configs/ldap-demo-tomcat/project.xml
    geronimo/trunk/configs/openejb-deployer/src/plan/plan.xml
    geronimo/trunk/configs/openejb/project.xml
    geronimo/trunk/configs/remote-deploy-jetty/project.properties
    geronimo/trunk/configs/remote-deploy-jetty/project.xml
    geronimo/trunk/configs/remote-deploy-tomcat/project.properties
    geronimo/trunk/configs/remote-deploy-tomcat/project.xml
    geronimo/trunk/configs/servlets-examples-jetty/project.properties
    geronimo/trunk/configs/servlets-examples-jetty/project.xml
    geronimo/trunk/configs/servlets-examples-tomcat/project.properties
    geronimo/trunk/configs/servlets-examples-tomcat/project.xml
    geronimo/trunk/configs/system-database/project.properties
    geronimo/trunk/configs/system-database/project.xml
    geronimo/trunk/configs/tomcat-deployer/project.properties
    geronimo/trunk/configs/tomcat-deployer/src/plan/plan.xml
    geronimo/trunk/configs/uddi-jetty/project.xml
    geronimo/trunk/configs/uddi-tomcat/project.properties
    geronimo/trunk/configs/uddi-tomcat/project.xml
    geronimo/trunk/configs/welcome-jetty/project.properties
    geronimo/trunk/configs/welcome-jetty/project.xml
    geronimo/trunk/configs/welcome-tomcat/project.properties
    geronimo/trunk/configs/welcome-tomcat/project.xml
    geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnavailableModuleBuilder.java

Modified: geronimo/trunk/assemblies/j2ee-jetty-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-jetty-server/project.xml?rev=371874&r1=371873&r2=371874&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-jetty-server/project.xml (original)
+++ geronimo/trunk/assemblies/j2ee-jetty-server/project.xml Tue Jan 24 01:40:34 2006
@@ -238,6 +238,15 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
+            <artifactId>client-deployer</artifactId>
+            <type>car</type>
+            <version>${pom.currentVersion}</version>
+            <properties>
+                <geronimo.assemble>install</geronimo.assemble>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
             <artifactId>hot-deployer</artifactId>
             <type>car</type>
             <version>${pom.currentVersion}</version>

Modified: geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml?rev=371874&r1=371873&r2=371874&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml (original)
+++ geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml Tue Jan 24 01:40:34 2006
@@ -87,6 +87,7 @@
             <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=geronimo/jetty/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=GBean,name=JettyWebContainer</attribute>
         </gbean>
     </configuration>
+    <configuration name="geronimo/client-deployer/${pom.currentVersion}/car"/>
     <configuration name="geronimo/axis-deployer/${pom.currentVersion}/car"/>
     <configuration name="geronimo/javamail/${pom.currentVersion}/car" load="false">
         <gbean name="SMTPTransport">

Modified: geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml?rev=371874&r1=371873&r2=371874&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml (original)
+++ geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml Tue Jan 24 01:40:34 2006
@@ -247,6 +247,15 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
+            <artifactId>client-deployer</artifactId>
+            <type>car</type>
+            <version>${pom.currentVersion}</version>
+            <properties>
+                <geronimo.assemble>install</geronimo.assemble>
+            </properties>
+        </dependency>                                                                                                                              
+        <dependency>
+            <groupId>geronimo</groupId>
             <artifactId>tomcat-deployer</artifactId>
             <type>car</type>
             <version>${pom.currentVersion}</version>

Modified: geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml?rev=371874&r1=371873&r2=371874&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml (original)
+++ geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml Tue Jan 24 01:40:34 2006
@@ -94,6 +94,7 @@
         </gbean>
     </configuration>
     <configuration name="geronimo/axis-deployer/${pom.currentVersion}/car"/>
+    <configuration name="geronimo/client-deployer/${pom.currentVersion}/car"/>                                                                     
     <configuration name="geronimo/javamail/${pom.currentVersion}/car" load="false">
         <gbean name="SMTPTransport">
             <attribute name="host">localhost</attribute>

Copied: geronimo/trunk/assemblies/minimal-tomcat-server/project.xml (from r371794, geronimo/branches/lw_assemblies/assemblies/minimal-tomcat-server/project.xml)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/minimal-tomcat-server/project.xml?p2=geronimo/trunk/assemblies/minimal-tomcat-server/project.xml&p1=geronimo/branches/lw_assemblies/assemblies/minimal-tomcat-server/project.xml&r1=371794&r2=371874&rev=371874&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/assemblies/minimal-tomcat-server/project.xml (original)
+++ geronimo/trunk/assemblies/minimal-tomcat-server/project.xml Tue Jan 24 01:40:34 2006
@@ -20,7 +20,7 @@
 <project>
     <pomVersion>3</pomVersion>
     <extend>../../etc/project.xml</extend>
-    <id>geronimo-tomcat</id>
+    <id>geronimo-tomcat-minimal</id>
     <name>Geronimo Assembly for a Web Server running Tomcat</name>
     <description>An assembly of Geronimo into a Web Server using Tomcat for the web container</description>
 

Modified: geronimo/trunk/configs/axis-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/axis-deployer/project.xml?rev=371874&r1=371873&r2=371874&view=diff
==============================================================================
--- geronimo/trunk/configs/axis-deployer/project.xml (original)
+++ geronimo/trunk/configs/axis-deployer/project.xml Tue Jan 24 01:40:34 2006
@@ -38,28 +38,28 @@
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
-            <properties>
-                 <geronimo.import>true</geronimo.import>
-             </properties>
+            <!--<properties>-->
+                <!--<geronimo.import>true</geronimo.import>-->
+            <!--</properties>-->
         </dependency>
-    <dependency>
-        <groupId>geronimo</groupId>
-        <type>car</type>
-        <artifactId>j2ee-deployer</artifactId>
-        <version>${pom.currentVersion}</version>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <type>car</type>
+            <artifactId>j2ee-deployer</artifactId>
+            <version>${pom.currentVersion}</version>
             <properties>
-                 <geronimo.import>true</geronimo.import>
-             </properties>
-    </dependency>
-    <dependency>
-        <groupId>geronimo</groupId>
-        <type>car</type>
-        <artifactId>axis</artifactId>
-        <version>${pom.currentVersion}</version>
+                <geronimo.import>true</geronimo.import>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <type>car</type>
+            <artifactId>axis</artifactId>
+            <version>${pom.currentVersion}</version>
             <properties>
-                 <geronimo.import>true</geronimo.import>
-             </properties>
-    </dependency>
+                <geronimo.import>true</geronimo.import>
+            </properties>
+        </dependency>
 
         <dependency>
             <groupId>geronimo</groupId>
@@ -97,149 +97,150 @@
             <version>${stax_api_version}</version>
         </dependency>
 
-<!--        <dependency>
-            <groupId>concurrent</groupId>
-            <artifactId>concurrent</artifactId>
-            <version>${concurrent_version}</version>
-        </dependency>
-        <dependency>
-            <groupId>howl</groupId>
-            <artifactId>howl-logger</artifactId>
-            <version>${howl_version}</version>
-            <url>http://forge.objectweb.org/projects/howl</url>
-        </dependency>
-        <dependency>
-            <groupId>activeio</groupId>
-            <artifactId>activeio</artifactId>
-            <version>${activeio_version}</version>
-        </dependency>
--->
+        <!--        <dependency>
+                    <groupId>concurrent</groupId>
+                    <artifactId>concurrent</artifactId>
+                    <version>${concurrent_version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>howl</groupId>
+                    <artifactId>howl-logger</artifactId>
+                    <version>${howl_version}</version>
+                    <url>http://forge.objectweb.org/projects/howl</url>
+                </dependency>
+                <dependency>
+                    <groupId>activeio</groupId>
+                    <artifactId>activeio</artifactId>
+                    <version>${activeio_version}</version>
+                </dependency>
+        -->
         <!-- dependencies from plan -->
 
         <!-- common libraries used by all builders -->
-<!--        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
-            <version>${geronimo_spec_j2ee_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-corba_2.3_spec</artifactId>
-            <version>${geronimo_spec_corba_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-j2ee-schema</artifactId>
-            <version>${geronimo_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-core</artifactId>
-            <version>${geronimo_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-management</artifactId>
-            <version>${geronimo_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-transaction</artifactId>
-            <version>${geronimo_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
-        </dependency>
--->
+        <!--        <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-j2ee_1.4_spec</artifactId>
+                    <version>${geronimo_spec_j2ee_version}</version>
+                    <properties>
+                         <geronimo.dependency>true</geronimo.dependency>
+                     </properties>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-corba_2.3_spec</artifactId>
+                    <version>${geronimo_spec_corba_version}</version>
+                    <properties>
+                         <geronimo.dependency>true</geronimo.dependency>
+                     </properties>
+                </dependency>
+                <dependency>
+                    <groupId>geronimo</groupId>
+                    <artifactId>geronimo-j2ee-schema</artifactId>
+                    <version>${geronimo_version}</version>
+                    <properties>
+                         <geronimo.dependency>true</geronimo.dependency>
+                     </properties>
+                </dependency>
+                <dependency>
+                    <groupId>geronimo</groupId>
+                    <artifactId>geronimo-core</artifactId>
+                    <version>${geronimo_version}</version>
+                    <properties>
+                         <geronimo.dependency>true</geronimo.dependency>
+                     </properties>
+                </dependency>
+                <dependency>
+                    <groupId>geronimo</groupId>
+                    <artifactId>geronimo-management</artifactId>
+                    <version>${geronimo_version}</version>
+                    <properties>
+                         <geronimo.dependency>true</geronimo.dependency>
+                     </properties>
+                </dependency>
+                <dependency>
+                    <groupId>geronimo</groupId>
+                    <artifactId>geronimo-transaction</artifactId>
+                    <version>${geronimo_version}</version>
+                    <properties>
+                         <geronimo.dependency>true</geronimo.dependency>
+                     </properties>
+                </dependency>
+        -->
 
         <!-- todo builder implementations - can we move these to sub-plans? -->
         <!-- EAR, application-clients and other J2EE artifacts -->
-<!--        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-j2ee-builder</artifactId>
-            <version>${geronimo_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-client-builder</artifactId>
-            <version>${geronimo_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-naming-builder</artifactId>
-            <version>${geronimo_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-naming</artifactId>
-            <version>${geronimo_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
-        </dependency>
+        <!--        <dependency>
+                    <groupId>geronimo</groupId>
+                    <artifactId>geronimo-j2ee-builder</artifactId>
+                    <version>${geronimo_version}</version>
+                    <properties>
+                         <geronimo.dependency>true</geronimo.dependency>
+                     </properties>
+                </dependency>
+                <dependency>
+                    <groupId>geronimo</groupId>
+                    <artifactId>geronimo-client-builder</artifactId>
+                    <version>${geronimo_version}</version>
+                    <properties>
+                         <geronimo.dependency>true</geronimo.dependency>
+                     </properties>
+                </dependency>
+                <dependency>
+                    <groupId>geronimo</groupId>
+                    <artifactId>geronimo-naming-builder</artifactId>
+                    <version>${geronimo_version}</version>
+                    <properties>
+                         <geronimo.dependency>true</geronimo.dependency>
+                     </properties>
+                </dependency>
+                <dependency>
+                    <groupId>geronimo</groupId>
+                    <artifactId>geronimo-naming</artifactId>
+                    <version>${geronimo_version}</version>
+                    <properties>
+                         <geronimo.dependency>true</geronimo.dependency>
+                     </properties>
+                </dependency>
+                <dependency>
+                    <groupId>geronimo</groupId>
+                    <artifactId>geronimo-security-builder</artifactId>
+                    <version>${geronimo_version}</version>
+                    <properties>
+                         <geronimo.dependency>true</geronimo.dependency>
+                     </properties>
+                </dependency>
+                <dependency>
+                    <groupId>geronimo</groupId>
+                    <artifactId>geronimo-security</artifactId>
+                    <version>${geronimo_version}</version>
+                    <properties>
+                         <geronimo.dependency>true</geronimo.dependency>
+                     </properties>
+                </dependency>
+        -->
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>geronimo-security-builder</artifactId>
-            <version>${geronimo_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-security</artifactId>
-            <version>${geronimo_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
-        </dependency>
--->        <dependency>
-            <groupId>geronimo</groupId>
             <artifactId>geronimo-axis-builder</artifactId>
             <version>${geronimo_version}</version>
             <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
+                <geronimo.dependency>true</geronimo.dependency>
+            </properties>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-axis</artifactId>
             <version>${geronimo_version}</version>
             <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
+                <geronimo.dependency>true</geronimo.dependency>
+            </properties>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-webservices</artifactId>
             <version>${geronimo_version}</version>
             <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
+                <geronimo.dependency>true</geronimo.dependency>
+            </properties>
         </dependency>
         <dependency>
             <groupId>axis</groupId>
@@ -258,8 +259,8 @@
             <artifactId>geronimo-web-builder</artifactId>
             <version>${geronimo_version}</version>
             <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
+                <geronimo.dependency>true</geronimo.dependency>
+            </properties>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
@@ -283,52 +284,52 @@
             <artifactId>openejb-builder</artifactId>
             <version>${openejb_version}</version>
             <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
+                <geronimo.dependency>true</geronimo.dependency>
+            </properties>
         </dependency>
         <dependency>
             <groupId>openejb</groupId>
             <artifactId>openejb-pkgen-builder</artifactId>
             <version>${openejb_version}</version>
             <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
+                <geronimo.dependency>true</geronimo.dependency>
+            </properties>
         </dependency>
         <dependency>
             <groupId>openejb</groupId>
             <artifactId>openejb-core</artifactId>
             <version>${openejb_version}</version>
             <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
+                <geronimo.dependency>true</geronimo.dependency>
+            </properties>
         </dependency>
         <dependency>
             <groupId>tranql</groupId>
             <artifactId>tranql</artifactId>
             <version>${tranql_version}</version>
             <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
+                <geronimo.dependency>true</geronimo.dependency>
+            </properties>
         </dependency>
 
         <!-- RARs using Geronimo Connector implementation -->
-<!--        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-connector-builder</artifactId>
-            <version>${geronimo_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-connector</artifactId>
-            <version>${geronimo_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
-        </dependency>
--->
+        <!--        <dependency>
+                    <groupId>geronimo</groupId>
+                    <artifactId>geronimo-connector-builder</artifactId>
+                    <version>${geronimo_version}</version>
+                    <properties>
+                         <geronimo.dependency>true</geronimo.dependency>
+                     </properties>
+                </dependency>
+                <dependency>
+                    <groupId>geronimo</groupId>
+                    <artifactId>geronimo-connector</artifactId>
+                    <version>${geronimo_version}</version>
+                    <properties>
+                         <geronimo.dependency>true</geronimo.dependency>
+                     </properties>
+                </dependency>
+        -->
     </dependencies>
 </project>
 

Modified: geronimo/trunk/configs/console-jetty/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/console-jetty/project.properties?rev=371874&r1=371873&r2=371874&view=diff
==============================================================================
--- geronimo/trunk/configs/console-jetty/project.properties (original)
+++ geronimo/trunk/configs/console-jetty/project.properties Tue Jan 24 01:40:34 2006
@@ -21,7 +21,7 @@
 
 maven.multiproject.type=car
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/jetty-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/jetty-deployer/${geronimo_version}/car,geronimo/client-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
 
 geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/ears/geronimo-console-${geronimo_version}.ear
 

Modified: geronimo/trunk/configs/console-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/console-jetty/project.xml?rev=371874&r1=371873&r2=371874&view=diff
==============================================================================
--- geronimo/trunk/configs/console-jetty/project.xml (original)
+++ geronimo/trunk/configs/console-jetty/project.xml Tue Jan 24 01:40:34 2006
@@ -52,6 +52,12 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
+            <artifactId>client-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
             <artifactId>openejb-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>

Modified: geronimo/trunk/configs/console-tomcat/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/console-tomcat/project.properties?rev=371874&r1=371873&r2=371874&view=diff
==============================================================================
--- geronimo/trunk/configs/console-tomcat/project.properties (original)
+++ geronimo/trunk/configs/console-tomcat/project.properties Tue Jan 24 01:40:34 2006
@@ -21,7 +21,7 @@
 
 maven.multiproject.type=car
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/tomcat-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/tomcat-deployer/${geronimo_version}/car,geronimo/client-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
 
 geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/ears/geronimo-console-${geronimo_version}.ear
 

Modified: geronimo/trunk/configs/console-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/console-tomcat/project.xml?rev=371874&r1=371873&r2=371874&view=diff
==============================================================================
--- geronimo/trunk/configs/console-tomcat/project.xml (original)
+++ geronimo/trunk/configs/console-tomcat/project.xml Tue Jan 24 01:40:34 2006
@@ -52,6 +52,12 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
+            <artifactId>client-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
             <artifactId>openejb-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>

Modified: geronimo/trunk/configs/daytrader-jetty/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/daytrader-jetty/project.properties?rev=371874&r1=371873&r2=371874&view=diff
==============================================================================
--- geronimo/trunk/configs/daytrader-jetty/project.properties (original)
+++ geronimo/trunk/configs/daytrader-jetty/project.properties Tue Jan 24 01:40:34 2006
@@ -21,7 +21,7 @@
 
 maven.multiproject.type=car
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/jetty-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/jetty-deployer/${geronimo_version}/car,geronimo/client-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
 
 geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/ears/daytrader-ear-${pom.currentVersion}.ear
 

Modified: geronimo/trunk/configs/daytrader-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/daytrader-jetty/project.xml?rev=371874&r1=371873&r2=371874&view=diff
==============================================================================
--- geronimo/trunk/configs/daytrader-jetty/project.xml (original)
+++ geronimo/trunk/configs/daytrader-jetty/project.xml Tue Jan 24 01:40:34 2006
@@ -52,6 +52,12 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
+            <artifactId>client-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
             <artifactId>openejb-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>

Modified: geronimo/trunk/configs/daytrader-tomcat/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/daytrader-tomcat/project.properties?rev=371874&r1=371873&r2=371874&view=diff
==============================================================================
--- geronimo/trunk/configs/daytrader-tomcat/project.properties (original)
+++ geronimo/trunk/configs/daytrader-tomcat/project.properties Tue Jan 24 01:40:34 2006
@@ -21,7 +21,7 @@
 
 maven.multiproject.type=car
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/tomcat-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/tomcat-deployer/${geronimo_version}/car,geronimo/client-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
 
 geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/ears/daytrader-ear-${pom.currentVersion}.ear
 

Modified: geronimo/trunk/configs/daytrader-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/daytrader-tomcat/project.xml?rev=371874&r1=371873&r2=371874&view=diff
==============================================================================
--- geronimo/trunk/configs/daytrader-tomcat/project.xml (original)
+++ geronimo/trunk/configs/daytrader-tomcat/project.xml Tue Jan 24 01:40:34 2006
@@ -52,6 +52,12 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
+            <artifactId>client-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
             <artifactId>openejb-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>

Modified: geronimo/trunk/configs/j2ee-corba/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-corba/project.properties?rev=371874&r1=371873&r2=371874&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-corba/project.properties (original)
+++ geronimo/trunk/configs/j2ee-corba/project.properties Tue Jan 24 01:40:34 2006
@@ -28,7 +28,7 @@
 PlanORBSSLPort=2001
 
 #j2ee-deployer needed for login config xml-reference builder
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car
 
 PlanHTTPPort=8080
 PlanHTTPSPort=8443

Modified: geronimo/trunk/configs/j2ee-corba/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-corba/project.xml?rev=371874&r1=371873&r2=371874&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-corba/project.xml (original)
+++ geronimo/trunk/configs/j2ee-corba/project.xml Tue Jan 24 01:40:34 2006
@@ -41,7 +41,7 @@
         <!-- parent config -->
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>j2ee-server</artifactId>
+            <artifactId>openejb</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
             <properties>

Modified: geronimo/trunk/configs/j2ee-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-deployer/project.xml?rev=371874&r1=371873&r2=371874&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-deployer/project.xml (original)
+++ geronimo/trunk/configs/j2ee-deployer/project.xml Tue Jan 24 01:40:34 2006
@@ -53,7 +53,7 @@
     </dependency>
 
         <!-- dependencies from gbean-deployer needed as maven adds service builder to the maven.root classloader -->
-        <dependency>
+<!--        <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-system</artifactId>
             <version>${geronimo_version}</version>
@@ -88,28 +88,11 @@
             <artifactId>stax-api</artifactId>
             <version>${stax_api_version}</version>
         </dependency>
-
-<!--        <dependency>
-            <groupId>concurrent</groupId>
-            <artifactId>concurrent</artifactId>
-            <version>${concurrent_version}</version>
-        </dependency>
-        <dependency>
-            <groupId>howl</groupId>
-            <artifactId>howl-logger</artifactId>
-            <version>${howl_version}</version>
-            <url>http://forge.objectweb.org/projects/howl</url>
-        </dependency>
-        <dependency>
-            <groupId>activeio</groupId>
-            <artifactId>activeio</artifactId>
-            <version>${activeio_version}</version>
-        </dependency>
 -->
         <!-- dependencies from plan -->
 
         <!-- common libraries used by all builders -->
-        <dependency>
+<!--        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee_1.4_spec</artifactId>
             <version>${geronimo_spec_j2ee_version}</version>
@@ -125,6 +108,7 @@
                  <geronimo.dependency>true</geronimo.dependency>
              </properties>
         </dependency>
+-->
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-j2ee-schema</artifactId>
@@ -177,7 +161,7 @@
                  <geronimo.dependency>true</geronimo.dependency>
              </properties>
         </dependency>
-        <dependency>
+       <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-naming-builder</artifactId>
             <version>${geronimo_version}</version>
@@ -209,6 +193,7 @@
                  <geronimo.dependency>true</geronimo.dependency>
              </properties>
         </dependency>
+<!--
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-axis-builder</artifactId>
@@ -225,6 +210,8 @@
                  <geronimo.dependency>true</geronimo.dependency>
              </properties>
         </dependency>
+    
+-->
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-webservices</artifactId>
@@ -233,6 +220,7 @@
                  <geronimo.dependency>true</geronimo.dependency>
              </properties>
         </dependency>
+<!--
         <dependency>
             <groupId>axis</groupId>
             <artifactId>axis</artifactId>
@@ -243,7 +231,7 @@
             <artifactId>wsdl4j</artifactId>
             <version>${wsdl4j_version}</version>
         </dependency>
-
+-->
         <!-- WARs using Jetty -->
         <dependency>
             <groupId>geronimo</groupId>
@@ -253,6 +241,7 @@
                  <geronimo.dependency>true</geronimo.dependency>
              </properties>
         </dependency>
+<!--
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-jetty-builder</artifactId>
@@ -268,8 +257,9 @@
             <artifactId>org.mortbay.jetty</artifactId>
             <version>${jetty_version}</version>
         </dependency>
-
+-->
         <!-- EJBs using OpenEJB -->
+<!--
         <dependency>
             <groupId>openejb</groupId>
             <artifactId>openejb-builder</artifactId>
@@ -302,7 +292,7 @@
                  <geronimo.dependency>true</geronimo.dependency>
              </properties>
         </dependency>
-
+-->
         <!-- RARs using Geronimo Connector implementation -->
         <dependency>
             <groupId>geronimo</groupId>

Modified: geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml?rev=371874&r1=371873&r2=371874&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml Tue Jan 24 01:40:34 2006
@@ -27,8 +27,10 @@
         <attribute name="transactionContextManagerObjectName">*:name=TransactionContextManager,*</attribute>
         <attribute name="connectionTrackerObjectName">*:name=ConnectionTracker,*</attribute>
         <attribute name="transactionalTimerObjectName">geronimo.server:name=TransactionalThreadPooledTimer,*</attribute>
-        <attribute name="nonTransactionalTimerObjectName">geronimo.server:name=NonTransactionalThreadPooledTimer,*</attribute>
-        <attribute name="corbaGBeanObjectName">geronimo.server:J2EEApplication=null,J2EEModule=geronimo/server-corba/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=CORBABean,name=Server</attribute>
+        <attribute name="nonTransactionalTimerObjectName">
+            geronimo.server:name=NonTransactionalThreadPooledTimer,*</attribute>
+        <attribute name="corbaGBeanObjectName">
+            geronimo.server:J2EEApplication=null,J2EEModule=geronimo/server-corba/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=CORBABean,name=Server</attribute>
         <reference name="Repository">
             <gbean-name>*:name=Repository,*</gbean-name>
         </reference>
@@ -43,15 +45,22 @@
             <name>ConnectorBuilder</name>
         </reference>
         <reference name="AppClientConfigBuilder">
+            <module>*</module>
             <name>AppClientBuilder</name>
         </reference>
         <reference name="ResourceReferenceBuilder">
             <name>ConnectorBuilder</name>
         </reference>
-        <reference name="ServiceReferenceBuilder">
-            <module>*</module>
-            <name>WebServiceBuilder</name>
-        </reference>
+        <references name="ServiceReferenceBuilder">
+            <pattern>
+                <module>*</module>
+                <name>WebServiceBuilder</name>
+            </pattern>
+            <pattern>
+                <module>*</module>
+                <name>UnavailableServiceReferenceBuilder</name>
+            </pattern>
+        </references>
         <reference name="EJBReferenceBuilder">
             <module>*</module>
             <name>ServerEJBReferenceBuilder</name>
@@ -62,10 +71,16 @@
     <gbean name="WebBuilder" class="org.apache.geronimo.j2ee.deployment.SwitchingModuleBuilder">
         <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0</attribute>
         <references name="ModuleBuilders">
-            <pattern><gbean-name>geronimo.maven:J2EEApplication=null,J2EEModule=${pom.groupId}/jetty-deployer/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=ModuleBuilder,name=JettyWebBuilder</gbean-name></pattern>
-            <pattern><gbean-name>geronimo.maven:J2EEApplication=null,J2EEModule=${pom.groupId}/tomcat-deployer/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=ModuleBuilder,name=TomcatWebBuilder</gbean-name></pattern>
+            <pattern>
+                <gbean-name>
+                    geronimo.maven:J2EEApplication=null,J2EEModule=${pom.groupId}/jetty-deployer/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=ModuleBuilder,name=JettyWebBuilder</gbean-name>
+            </pattern>
+            <pattern>
+                <gbean-name>
+                    geronimo.maven:J2EEApplication=null,J2EEModule=${pom.groupId}/tomcat-deployer/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=ModuleBuilder,name=TomcatWebBuilder</gbean-name>
+            </pattern>
         </references>
-     </gbean>
+    </gbean>
 
     <gbean name="ConnectorBuilder" class="org.apache.geronimo.connector.deployment.ConnectorModuleBuilder">
         <attribute name="defaultParentId">${pom.groupId}/j2ee-server/${pom.currentVersion}/car</attribute>
@@ -80,39 +95,10 @@
         </reference>
     </gbean>
 
-    <gbean name="AppClientBuilder" class="org.apache.geronimo.client.builder.AppClientModuleBuilder">
-        <attribute name="defaultClientParentId">${pom.groupId}/client/${pom.currentVersion}/car</attribute>
-        <attribute name="defaultServerParentId">${pom.groupId}/j2ee-server/${pom.currentVersion}/car</attribute>
-        <attribute name="transactionContextManagerObjectName">geronimo.client:name=TransactionContextManager,*</attribute>
-        <attribute name="connectionTrackerObjectName">geronimo.client:name=ConnectionTracker,*</attribute>
-        <attribute name="corbaGBeanObjectName">geronimo.client:J2EEApplication=null,J2EEModule=geronimo/client-corba/${pom.currentVersion}/car,J2EEServer=client,j2eeType=CORBABean,name=Server</attribute>
-        <reference name="EJBReferenceBuilder">
-            <module>*</module>
-            <name>ClientEJBReferenceBuilder</name>
-        </reference>
-        <reference name="ConnectorModuleBuilder">
-            <name>ConnectorBuilder</name>
-        </reference>
-        <reference name="ResourceReferenceBuilder">
-            <name>ConnectorBuilder</name>
-        </reference>
-        <reference name="ServiceReferenceBuilder">
-            <module>*</module>
-            <name>WebServiceBuilder</name>
-        </reference>
-        <references name="Store">
-            <!-- todo replace with a store the Client Builder can write to -->
-            <pattern><gbean-name>geronimo.maven:name=MavenConfigStore,j2eeType=ConfigurationStore</gbean-name></pattern>
-            <pattern><gbean-name>geronimo.server:j2eeType=ConfigurationStore,name=Local</gbean-name></pattern>
-        </references>
-        <reference name="Repository">
-            <gbean-name>*:name=Repository,*</gbean-name>
-        </reference>
-    </gbean>
-
     <gbean name="LoginConfigurationBuilder" class="org.apache.geronimo.security.deployment.LoginConfigBuilder"/>
     <gbean name="SecurityService" class="org.apache.geronimo.security.SecurityServiceImpl">
-        <attribute name="policyConfigurationFactory">org.apache.geronimo.security.jacc.GeronimoPolicyConfigurationFactory</attribute>
+        <attribute name="policyConfigurationFactory">
+            org.apache.geronimo.security.jacc.GeronimoPolicyConfigurationFactory</attribute>
         <attribute name="policyProvider">org.apache.geronimo.security.jacc.GeronimoPolicy</attribute>
     </gbean>
 

Modified: geronimo/trunk/configs/jetty-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/jetty-deployer/src/plan/plan.xml?rev=371874&r1=371873&r2=371874&view=diff
==============================================================================
--- geronimo/trunk/configs/jetty-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/jetty-deployer/src/plan/plan.xml Tue Jan 24 01:40:34 2006
@@ -36,10 +36,16 @@
         <reference name="PojoWebServiceTemplate">
             <name>POJOTemplate</name>
         </reference>
-        <reference name="WebServiceBuilder">
-            <module>*</module>
-            <name>WebServiceBuilder</name>
-        </reference>
+        <references name="WebServiceBuilder">
+            <pattern>
+                <module>*</module>
+                <name>WebServiceBuilder</name>
+            </pattern>
+            <pattern>
+                <module>*</module>
+                <name>UnavailableWebServiceBuilder</name>
+            </pattern>
+        </references>
         <reference name="Repository">
             <gbean-name>*:name=Repository,*</gbean-name>
         </reference>

Modified: geronimo/trunk/configs/jmxdebug-jetty/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/jmxdebug-jetty/project.properties?rev=371874&r1=371873&r2=371874&view=diff
==============================================================================
--- geronimo/trunk/configs/jmxdebug-jetty/project.properties (original)
+++ geronimo/trunk/configs/jmxdebug-jetty/project.properties Tue Jan 24 01:40:34 2006
@@ -21,7 +21,7 @@
 
 maven.multiproject.type=car
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/jetty-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/jetty-deployer/${geronimo_version}/car,geronimo/client-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
 
 geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/wars/geronimo-jmxdebug-${geronimo_version}.war
 

Modified: geronimo/trunk/configs/jmxdebug-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/jmxdebug-jetty/project.xml?rev=371874&r1=371873&r2=371874&view=diff
==============================================================================
--- geronimo/trunk/configs/jmxdebug-jetty/project.xml (original)
+++ geronimo/trunk/configs/jmxdebug-jetty/project.xml Tue Jan 24 01:40:34 2006
@@ -52,6 +52,12 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
+            <artifactId>client-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
             <artifactId>openejb-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>

Modified: geronimo/trunk/configs/jmxdebug-tomcat/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/jmxdebug-tomcat/project.properties?rev=371874&r1=371873&r2=371874&view=diff
==============================================================================
--- geronimo/trunk/configs/jmxdebug-tomcat/project.properties (original)
+++ geronimo/trunk/configs/jmxdebug-tomcat/project.properties Tue Jan 24 01:40:34 2006
@@ -21,7 +21,7 @@
 
 maven.multiproject.type=car
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/tomcat-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/tomcat-deployer/${geronimo_version}/car,geronimo/client-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
 
 geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/wars/geronimo-jmxdebug-${geronimo_version}.war
 

Modified: geronimo/trunk/configs/jmxdebug-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/jmxdebug-tomcat/project.xml?rev=371874&r1=371873&r2=371874&view=diff
==============================================================================
--- geronimo/trunk/configs/jmxdebug-tomcat/project.xml (original)
+++ geronimo/trunk/configs/jmxdebug-tomcat/project.xml Tue Jan 24 01:40:34 2006
@@ -52,6 +52,12 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
+            <artifactId>client-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
             <artifactId>openejb-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>

Modified: geronimo/trunk/configs/jsp-examples-jetty/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/jsp-examples-jetty/project.properties?rev=371874&r1=371873&r2=371874&view=diff
==============================================================================
--- geronimo/trunk/configs/jsp-examples-jetty/project.properties (original)
+++ geronimo/trunk/configs/jsp-examples-jetty/project.properties Tue Jan 24 01:40:34 2006
@@ -21,7 +21,7 @@
 
 maven.multiproject.type=car
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/jetty-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/jetty-deployer/${geronimo_version}/car,geronimo/client-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
 
 geronimo.packaging.moduleFile=${maven.repo.local}/geronimo-samples/wars/geronimo-jsp-examples-tomcat-${tomcat_examples_version}.war
 

Modified: geronimo/trunk/configs/jsp-examples-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/jsp-examples-jetty/project.xml?rev=371874&r1=371873&r2=371874&view=diff
==============================================================================
--- geronimo/trunk/configs/jsp-examples-jetty/project.xml (original)
+++ geronimo/trunk/configs/jsp-examples-jetty/project.xml Tue Jan 24 01:40:34 2006
@@ -52,6 +52,12 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
+            <artifactId>client-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
             <artifactId>openejb-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>

Modified: geronimo/trunk/configs/jsp-examples-tomcat/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/jsp-examples-tomcat/project.properties?rev=371874&r1=371873&r2=371874&view=diff
==============================================================================
--- geronimo/trunk/configs/jsp-examples-tomcat/project.properties (original)
+++ geronimo/trunk/configs/jsp-examples-tomcat/project.properties Tue Jan 24 01:40:34 2006
@@ -21,7 +21,7 @@
 
 maven.multiproject.type=car
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/tomcat-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/tomcat-deployer/${geronimo_version}/car,geronimo/client-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
 
 geronimo.packaging.moduleFile=${maven.repo.local}/geronimo-samples/wars/geronimo-jsp-examples-tomcat-${tomcat_examples_version}.war
 

Modified: geronimo/trunk/configs/jsp-examples-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/jsp-examples-tomcat/project.xml?rev=371874&r1=371873&r2=371874&view=diff
==============================================================================
--- geronimo/trunk/configs/jsp-examples-tomcat/project.xml (original)
+++ geronimo/trunk/configs/jsp-examples-tomcat/project.xml Tue Jan 24 01:40:34 2006
@@ -52,6 +52,12 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
+            <artifactId>client-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
             <artifactId>openejb-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>

Modified: geronimo/trunk/configs/ldap-demo-jetty/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/ldap-demo-jetty/project.properties?rev=371874&r1=371873&r2=371874&view=diff
==============================================================================
--- geronimo/trunk/configs/ldap-demo-jetty/project.properties (original)
+++ geronimo/trunk/configs/ldap-demo-jetty/project.properties Tue Jan 24 01:40:34 2006
@@ -21,7 +21,7 @@
 
 maven.multiproject.type=car
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/jetty-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/jetty-deployer/${geronimo_version}/car,geronimo/client-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
 
 geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/wars/geronimo-ldap-demo-${geronimo_version}.war
 

Modified: geronimo/trunk/configs/ldap-demo-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/ldap-demo-jetty/project.xml?rev=371874&r1=371873&r2=371874&view=diff
==============================================================================
--- geronimo/trunk/configs/ldap-demo-jetty/project.xml (original)
+++ geronimo/trunk/configs/ldap-demo-jetty/project.xml Tue Jan 24 01:40:34 2006
@@ -52,6 +52,12 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
+            <artifactId>client-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
             <artifactId>openejb-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>

Modified: geronimo/trunk/configs/ldap-demo-tomcat/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/ldap-demo-tomcat/project.properties?rev=371874&r1=371873&r2=371874&view=diff
==============================================================================
--- geronimo/trunk/configs/ldap-demo-tomcat/project.properties (original)
+++ geronimo/trunk/configs/ldap-demo-tomcat/project.properties Tue Jan 24 01:40:34 2006
@@ -21,7 +21,7 @@
 
 maven.multiproject.type=car
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/tomcat-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/tomcat-deployer/${geronimo_version}/car,geronimo/client-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
 
 geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/wars/geronimo-ldap-demo-${geronimo_version}.war
 

Modified: geronimo/trunk/configs/ldap-demo-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/ldap-demo-tomcat/project.xml?rev=371874&r1=371873&r2=371874&view=diff
==============================================================================
--- geronimo/trunk/configs/ldap-demo-tomcat/project.xml (original)
+++ geronimo/trunk/configs/ldap-demo-tomcat/project.xml Tue Jan 24 01:40:34 2006
@@ -52,6 +52,12 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
+            <artifactId>client-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
             <artifactId>openejb-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>

Modified: geronimo/trunk/configs/openejb-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/openejb-deployer/src/plan/plan.xml?rev=371874&r1=371873&r2=371874&view=diff
==============================================================================
--- geronimo/trunk/configs/openejb-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/openejb-deployer/src/plan/plan.xml Tue Jan 24 01:40:34 2006
@@ -27,10 +27,16 @@
         <reference name="WebServiceLinkTemplate">
             <name>WebServiceEJBLinkTemplate</name>
         </reference>
-        <reference name="WebServiceBuilder">
-            <module>*</module>
-            <name>WebServiceBuilder</name>
-        </reference>
+        <references name="WebServiceBuilder">
+            <pattern>
+                <module>*</module>
+                <name>WebServiceBuilder</name>
+            </pattern>
+            <pattern>
+                <module>*</module>
+                <name>UnavailableWebServiceBuilder</name>
+            </pattern>
+        </references>
         <reference name="Repository">
             <gbean-name>*:name=Repository,*</gbean-name>
         </reference>

Modified: geronimo/trunk/configs/openejb/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/openejb/project.xml?rev=371874&r1=371873&r2=371874&view=diff
==============================================================================
--- geronimo/trunk/configs/openejb/project.xml (original)
+++ geronimo/trunk/configs/openejb/project.xml Tue Jan 24 01:40:34 2006
@@ -45,10 +45,19 @@
             <version>${geronimo_version}</version>
             <type>car</type>
             <properties>
-                 <geronimo.import>true</geronimo.import>
-             </properties>
+                <geronimo.import>true</geronimo.import>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>axis</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <geronimo.import>true</geronimo.import>
+            </properties>
         </dependency>
-<!--        <dependency>
+        <!--        <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-core</artifactId>
             <version>${geronimo_version}</version>
@@ -109,8 +118,8 @@
             <artifactId>openejb-core</artifactId>
             <version>${openejb_version}</version>
             <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
+                <geronimo.dependency>true</geronimo.dependency>
+            </properties>
         </dependency>
         <dependency>
             <groupId>xstream</groupId>
@@ -190,33 +199,33 @@
 -->
 
         <!-- TODO why are these here rather than in system-database??? -->
-<!--        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-derby</artifactId>
-            <version>${pom.currentVersion}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derby</artifactId>
-            <version>${derby_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derbynet</artifactId>
-            <version>${derby_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-            </properties>
-        </dependency>
--->
+        <!--        <dependency>
+                    <groupId>geronimo</groupId>
+                    <artifactId>geronimo-derby</artifactId>
+                    <version>${pom.currentVersion}</version>
+                    <properties>
+                         <geronimo.dependency>true</geronimo.dependency>
+                    </properties>
+                </dependency>
+
+                <dependency>
+                    <groupId>org.apache.derby</groupId>
+                    <artifactId>derby</artifactId>
+                    <version>${derby_version}</version>
+                    <properties>
+                         <geronimo.dependency>true</geronimo.dependency>
+                    </properties>
+                </dependency>
+
+                <dependency>
+                    <groupId>org.apache.derby</groupId>
+                    <artifactId>derbynet</artifactId>
+                    <version>${derby_version}</version>
+                    <properties>
+                         <geronimo.dependency>true</geronimo.dependency>
+                    </properties>
+                </dependency>
+        -->
 
         <dependency>
             <groupId>geronimo</groupId>

Modified: geronimo/trunk/configs/remote-deploy-jetty/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/remote-deploy-jetty/project.properties?rev=371874&r1=371873&r2=371874&view=diff
==============================================================================
--- geronimo/trunk/configs/remote-deploy-jetty/project.properties (original)
+++ geronimo/trunk/configs/remote-deploy-jetty/project.properties Tue Jan 24 01:40:34 2006
@@ -21,7 +21,7 @@
 
 maven.multiproject.type=car
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/jetty-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/jetty-deployer/${geronimo_version}/car,geronimo/client-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
 
 geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/wars/geronimo-remote-deploy-${geronimo_version}.war
 

Modified: geronimo/trunk/configs/remote-deploy-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/remote-deploy-jetty/project.xml?rev=371874&r1=371873&r2=371874&view=diff
==============================================================================
--- geronimo/trunk/configs/remote-deploy-jetty/project.xml (original)
+++ geronimo/trunk/configs/remote-deploy-jetty/project.xml Tue Jan 24 01:40:34 2006
@@ -58,6 +58,12 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
+            <artifactId>client-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
             <artifactId>openejb-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>

Modified: geronimo/trunk/configs/remote-deploy-tomcat/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/remote-deploy-tomcat/project.properties?rev=371874&r1=371873&r2=371874&view=diff
==============================================================================
--- geronimo/trunk/configs/remote-deploy-tomcat/project.properties (original)
+++ geronimo/trunk/configs/remote-deploy-tomcat/project.properties Tue Jan 24 01:40:34 2006
@@ -21,7 +21,7 @@
 
 maven.multiproject.type=car
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/tomcat-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/tomcat-deployer/${geronimo_version}/car,geronimo/client-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
 
 geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/wars/geronimo-remote-deploy-${geronimo_version}.war
 

Modified: geronimo/trunk/configs/remote-deploy-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/remote-deploy-tomcat/project.xml?rev=371874&r1=371873&r2=371874&view=diff
==============================================================================
--- geronimo/trunk/configs/remote-deploy-tomcat/project.xml (original)
+++ geronimo/trunk/configs/remote-deploy-tomcat/project.xml Tue Jan 24 01:40:34 2006
@@ -58,6 +58,12 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
+            <artifactId>client-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
             <artifactId>openejb-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>

Modified: geronimo/trunk/configs/servlets-examples-jetty/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/servlets-examples-jetty/project.properties?rev=371874&r1=371873&r2=371874&view=diff
==============================================================================
--- geronimo/trunk/configs/servlets-examples-jetty/project.properties (original)
+++ geronimo/trunk/configs/servlets-examples-jetty/project.properties Tue Jan 24 01:40:34 2006
@@ -21,7 +21,7 @@
 
 maven.multiproject.type=car
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/jetty-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/jetty-deployer/${geronimo_version}/car,geronimo/client-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
 
 geronimo.packaging.moduleFile=${maven.repo.local}/geronimo-samples/wars/geronimo-servlet-examples-tomcat-${tomcat_examples_version}.war
 

Modified: geronimo/trunk/configs/servlets-examples-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/servlets-examples-jetty/project.xml?rev=371874&r1=371873&r2=371874&view=diff
==============================================================================
--- geronimo/trunk/configs/servlets-examples-jetty/project.xml (original)
+++ geronimo/trunk/configs/servlets-examples-jetty/project.xml Tue Jan 24 01:40:34 2006
@@ -52,6 +52,12 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
+            <artifactId>client-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
             <artifactId>openejb-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>

Modified: geronimo/trunk/configs/servlets-examples-tomcat/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/servlets-examples-tomcat/project.properties?rev=371874&r1=371873&r2=371874&view=diff
==============================================================================
--- geronimo/trunk/configs/servlets-examples-tomcat/project.properties (original)
+++ geronimo/trunk/configs/servlets-examples-tomcat/project.properties Tue Jan 24 01:40:34 2006
@@ -21,7 +21,7 @@
 
 maven.multiproject.type=car
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/tomcat-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/tomcat-deployer/${geronimo_version}/car,geronimo/client-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
 
 geronimo.packaging.moduleFile=${maven.repo.local}/geronimo-samples/wars/geronimo-servlet-examples-tomcat-${tomcat_examples_version}.war
 

Modified: geronimo/trunk/configs/servlets-examples-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/servlets-examples-tomcat/project.xml?rev=371874&r1=371873&r2=371874&view=diff
==============================================================================
--- geronimo/trunk/configs/servlets-examples-tomcat/project.xml (original)
+++ geronimo/trunk/configs/servlets-examples-tomcat/project.xml Tue Jan 24 01:40:34 2006
@@ -52,6 +52,12 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
+            <artifactId>client-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
             <artifactId>openejb-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>

Modified: geronimo/trunk/configs/system-database/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/system-database/project.properties?rev=371874&r1=371873&r2=371874&view=diff
==============================================================================
--- geronimo/trunk/configs/system-database/project.properties (original)
+++ geronimo/trunk/configs/system-database/project.properties Tue Jan 24 01:40:34 2006
@@ -21,7 +21,7 @@
 
 maven.multiproject.type=car
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/client-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
 
 geronimo.packaging.moduleFile=${maven.repo.local}/tranql/rars/tranql-connector-derby-embed-xa-${tranql_connector_version}.rar
 



Mime
View raw message