geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r371766 [1/2] - in /geronimo/branches/lw_assemblies: ./ assemblies/activemq-derby-tomcat-server/ assemblies/j2ee-jetty-server/ assemblies/j2ee-jetty-server/src/var/config/ assemblies/j2ee-tomcat-server/ assemblies/j2ee-tomcat-server/src/var...
Date Tue, 24 Jan 2006 01:18:42 GMT
Author: djencks
Date: Mon Jan 23 17:18:06 2006
New Revision: 371766

URL: http://svn.apache.org/viewcvs?rev=371766&view=rev
Log:
rename some modules and make the assemblies work with more builders

Added:
    geronimo/branches/lw_assemblies/assemblies/web-jms-tomcat-server/
      - copied from r371109, geronimo/branches/lw_assemblies/assemblies/activemq-derby-tomcat-server/
    geronimo/branches/lw_assemblies/assemblies/web-jms-tomcat-server/LICENSE.txt
      - copied unchanged from r371765, geronimo/branches/lw_assemblies/assemblies/activemq-derby-tomcat-server/LICENSE.txt
    geronimo/branches/lw_assemblies/assemblies/web-jms-tomcat-server/NOTICE.txt
      - copied unchanged from r371765, geronimo/branches/lw_assemblies/assemblies/activemq-derby-tomcat-server/NOTICE.txt
    geronimo/branches/lw_assemblies/assemblies/web-jms-tomcat-server/maven.xml
      - copied unchanged from r371765, geronimo/branches/lw_assemblies/assemblies/activemq-derby-tomcat-server/maven.xml
    geronimo/branches/lw_assemblies/assemblies/web-jms-tomcat-server/project.properties
      - copied unchanged from r371765, geronimo/branches/lw_assemblies/assemblies/activemq-derby-tomcat-server/project.properties
    geronimo/branches/lw_assemblies/assemblies/web-jms-tomcat-server/project.xml
      - copied, changed from r371765, geronimo/branches/lw_assemblies/assemblies/activemq-derby-tomcat-server/project.xml
    geronimo/branches/lw_assemblies/assemblies/web-jms-tomcat-server/src/
      - copied from r371765, geronimo/branches/lw_assemblies/assemblies/activemq-derby-tomcat-server/src/
    geronimo/branches/lw_assemblies/configs/client-deployer/
      - copied from r371109, geronimo/branches/lw_assemblies/configs/appclient-deployer/
    geronimo/branches/lw_assemblies/configs/client-deployer/LICENSE.txt
      - copied unchanged from r371765, geronimo/branches/lw_assemblies/configs/appclient-deployer/LICENSE.txt
    geronimo/branches/lw_assemblies/configs/client-deployer/NOTICE.txt
      - copied unchanged from r371765, geronimo/branches/lw_assemblies/configs/appclient-deployer/NOTICE.txt
    geronimo/branches/lw_assemblies/configs/client-deployer/maven.xml
      - copied unchanged from r371765, geronimo/branches/lw_assemblies/configs/appclient-deployer/maven.xml
    geronimo/branches/lw_assemblies/configs/client-deployer/project.properties
      - copied unchanged from r371765, geronimo/branches/lw_assemblies/configs/appclient-deployer/project.properties
    geronimo/branches/lw_assemblies/configs/client-deployer/project.xml
      - copied, changed from r371765, geronimo/branches/lw_assemblies/configs/appclient-deployer/project.xml
    geronimo/branches/lw_assemblies/configs/client-deployer/src/
      - copied from r371765, geronimo/branches/lw_assemblies/configs/appclient-deployer/src/
    geronimo/branches/lw_assemblies/configs/unavailable-ejb-deployer/
      - copied from r371109, geronimo/branches/lw_assemblies/configs/unavailable-openejb-deployer/
    geronimo/branches/lw_assemblies/configs/unavailable-ejb-deployer/LICENSE.txt
      - copied unchanged from r371765, geronimo/branches/lw_assemblies/configs/unavailable-openejb-deployer/LICENSE.txt
    geronimo/branches/lw_assemblies/configs/unavailable-ejb-deployer/NOTICE.txt
      - copied unchanged from r371765, geronimo/branches/lw_assemblies/configs/unavailable-openejb-deployer/NOTICE.txt
    geronimo/branches/lw_assemblies/configs/unavailable-ejb-deployer/build.txt
      - copied unchanged from r371765, geronimo/branches/lw_assemblies/configs/unavailable-openejb-deployer/build.txt
    geronimo/branches/lw_assemblies/configs/unavailable-ejb-deployer/maven.xml
      - copied unchanged from r371765, geronimo/branches/lw_assemblies/configs/unavailable-openejb-deployer/maven.xml
    geronimo/branches/lw_assemblies/configs/unavailable-ejb-deployer/project.properties
      - copied unchanged from r371765, geronimo/branches/lw_assemblies/configs/unavailable-openejb-deployer/project.properties
    geronimo/branches/lw_assemblies/configs/unavailable-ejb-deployer/project.xml
      - copied, changed from r371765, geronimo/branches/lw_assemblies/configs/unavailable-openejb-deployer/project.xml
    geronimo/branches/lw_assemblies/configs/unavailable-ejb-deployer/src/
      - copied from r371765, geronimo/branches/lw_assemblies/configs/unavailable-openejb-deployer/src/
    geronimo/branches/lw_assemblies/configs/unavailable-webservices-deployer/
      - copied from r371109, geronimo/branches/lw_assemblies/configs/unavailable-axis-deployer/
    geronimo/branches/lw_assemblies/configs/unavailable-webservices-deployer/LICENSE.txt
      - copied unchanged from r371765, geronimo/branches/lw_assemblies/configs/unavailable-axis-deployer/LICENSE.txt
    geronimo/branches/lw_assemblies/configs/unavailable-webservices-deployer/NOTICE.txt
      - copied unchanged from r371765, geronimo/branches/lw_assemblies/configs/unavailable-axis-deployer/NOTICE.txt
    geronimo/branches/lw_assemblies/configs/unavailable-webservices-deployer/maven.xml
      - copied unchanged from r371765, geronimo/branches/lw_assemblies/configs/unavailable-axis-deployer/maven.xml
    geronimo/branches/lw_assemblies/configs/unavailable-webservices-deployer/project.properties
      - copied, changed from r371765, geronimo/branches/lw_assemblies/configs/unavailable-axis-deployer/project.properties
    geronimo/branches/lw_assemblies/configs/unavailable-webservices-deployer/project.xml
      - copied, changed from r371765, geronimo/branches/lw_assemblies/configs/unavailable-axis-deployer/project.xml
    geronimo/branches/lw_assemblies/configs/unavailable-webservices-deployer/src/
      - copied from r371765, geronimo/branches/lw_assemblies/configs/unavailable-axis-deployer/src/
Removed:
    geronimo/branches/lw_assemblies/assemblies/activemq-derby-tomcat-server/
    geronimo/branches/lw_assemblies/configs/appclient-deployer/
    geronimo/branches/lw_assemblies/configs/unavailable-axis-deployer/
    geronimo/branches/lw_assemblies/configs/unavailable-openejb-deployer/
    geronimo/branches/lw_assemblies/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnavailableAppClientModuleBuilder.java
    geronimo/branches/lw_assemblies/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnavailableAxisBuilder.java
Modified:
    geronimo/branches/lw_assemblies/assemblies/j2ee-jetty-server/project.xml
    geronimo/branches/lw_assemblies/assemblies/j2ee-jetty-server/src/var/config/config.xml
    geronimo/branches/lw_assemblies/assemblies/j2ee-tomcat-server/project.xml
    geronimo/branches/lw_assemblies/assemblies/j2ee-tomcat-server/src/var/config/config.xml
    geronimo/branches/lw_assemblies/assemblies/web-jms-tomcat-server/src/var/config/config.xml
    geronimo/branches/lw_assemblies/configs/axis-deployer/project.xml
    geronimo/branches/lw_assemblies/configs/client-deployer/src/plan/plan.xml
    geronimo/branches/lw_assemblies/configs/console-jetty/project.properties
    geronimo/branches/lw_assemblies/configs/console-jetty/project.xml
    geronimo/branches/lw_assemblies/configs/console-tomcat/project.properties
    geronimo/branches/lw_assemblies/configs/console-tomcat/project.xml
    geronimo/branches/lw_assemblies/configs/daytrader-jetty/project.properties
    geronimo/branches/lw_assemblies/configs/daytrader-jetty/project.xml
    geronimo/branches/lw_assemblies/configs/daytrader-tomcat/project.properties
    geronimo/branches/lw_assemblies/configs/daytrader-tomcat/project.xml
    geronimo/branches/lw_assemblies/configs/j2ee-deployer/src/plan/plan.xml
    geronimo/branches/lw_assemblies/configs/jetty-deployer/src/plan/plan.xml
    geronimo/branches/lw_assemblies/configs/jmxdebug-jetty/project.properties
    geronimo/branches/lw_assemblies/configs/jmxdebug-jetty/project.xml
    geronimo/branches/lw_assemblies/configs/jmxdebug-tomcat/project.properties
    geronimo/branches/lw_assemblies/configs/jmxdebug-tomcat/project.xml
    geronimo/branches/lw_assemblies/configs/jsp-examples-jetty/project.properties
    geronimo/branches/lw_assemblies/configs/jsp-examples-jetty/project.xml
    geronimo/branches/lw_assemblies/configs/jsp-examples-tomcat/project.properties
    geronimo/branches/lw_assemblies/configs/jsp-examples-tomcat/project.xml
    geronimo/branches/lw_assemblies/configs/ldap-demo-jetty/project.properties
    geronimo/branches/lw_assemblies/configs/ldap-demo-jetty/project.xml
    geronimo/branches/lw_assemblies/configs/ldap-demo-tomcat/project.properties
    geronimo/branches/lw_assemblies/configs/ldap-demo-tomcat/project.xml
    geronimo/branches/lw_assemblies/configs/openejb-deployer/src/plan/plan.xml
    geronimo/branches/lw_assemblies/configs/openejb/project.xml
    geronimo/branches/lw_assemblies/configs/remote-deploy-jetty/project.properties
    geronimo/branches/lw_assemblies/configs/remote-deploy-jetty/project.xml
    geronimo/branches/lw_assemblies/configs/remote-deploy-tomcat/project.properties
    geronimo/branches/lw_assemblies/configs/remote-deploy-tomcat/project.xml
    geronimo/branches/lw_assemblies/configs/servlets-examples-jetty/project.properties
    geronimo/branches/lw_assemblies/configs/servlets-examples-jetty/project.xml
    geronimo/branches/lw_assemblies/configs/servlets-examples-tomcat/project.properties
    geronimo/branches/lw_assemblies/configs/servlets-examples-tomcat/project.xml
    geronimo/branches/lw_assemblies/configs/system-database/project.properties
    geronimo/branches/lw_assemblies/configs/system-database/project.xml
    geronimo/branches/lw_assemblies/configs/tomcat-deployer/project.properties
    geronimo/branches/lw_assemblies/configs/tomcat-deployer/src/plan/plan.xml
    geronimo/branches/lw_assemblies/configs/uddi-jetty/project.xml
    geronimo/branches/lw_assemblies/configs/uddi-tomcat/project.properties
    geronimo/branches/lw_assemblies/configs/uddi-tomcat/project.xml
    geronimo/branches/lw_assemblies/configs/unavailable-appclient-deployer/project.xml
    geronimo/branches/lw_assemblies/configs/unavailable-appclient-deployer/src/plan/plan.xml
    geronimo/branches/lw_assemblies/configs/unavailable-ejb-deployer/src/plan/plan.xml
    geronimo/branches/lw_assemblies/configs/unavailable-webservices-deployer/src/plan/plan.xml
    geronimo/branches/lw_assemblies/configs/welcome-jetty/project.properties
    geronimo/branches/lw_assemblies/configs/welcome-jetty/project.xml
    geronimo/branches/lw_assemblies/configs/welcome-tomcat/project.properties
    geronimo/branches/lw_assemblies/configs/welcome-tomcat/project.xml
    geronimo/branches/lw_assemblies/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnavailableModuleBuilder.java
    geronimo/branches/lw_assemblies/project.properties

Modified: geronimo/branches/lw_assemblies/assemblies/j2ee-jetty-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/assemblies/j2ee-jetty-server/project.xml?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/assemblies/j2ee-jetty-server/project.xml (original)
+++ geronimo/branches/lw_assemblies/assemblies/j2ee-jetty-server/project.xml Mon Jan 23 17:18:06 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/branches/lw_assemblies/assemblies/j2ee-jetty-server/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/assemblies/j2ee-jetty-server/src/var/config/config.xml?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/assemblies/j2ee-jetty-server/src/var/config/config.xml (original)
+++ geronimo/branches/lw_assemblies/assemblies/j2ee-jetty-server/src/var/config/config.xml Mon Jan 23 17:18:06 2006
@@ -87,7 +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/appclient-deployer/${pom.currentVersion}/car"/>
+    <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/branches/lw_assemblies/assemblies/j2ee-tomcat-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/assemblies/j2ee-tomcat-server/project.xml?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/assemblies/j2ee-tomcat-server/project.xml (original)
+++ geronimo/branches/lw_assemblies/assemblies/j2ee-tomcat-server/project.xml Mon Jan 23 17:18:06 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/branches/lw_assemblies/assemblies/j2ee-tomcat-server/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/assemblies/j2ee-tomcat-server/src/var/config/config.xml?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/assemblies/j2ee-tomcat-server/src/var/config/config.xml (original)
+++ geronimo/branches/lw_assemblies/assemblies/j2ee-tomcat-server/src/var/config/config.xml Mon Jan 23 17:18:06 2006
@@ -83,7 +83,6 @@
         </gbean>
     </configuration>
     <configuration name="geronimo/geronimo-gbean-deployer/${pom.currentVersion}/car"/>
-    <configuration name="geronimo/appclient-deployer/${pom.currentVersion}/car"/>
     <configuration name="geronimo/j2ee-deployer/${pom.currentVersion}/car">
         <gbean name="WebBuilder">
             <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0</attribute>
@@ -95,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/branches/lw_assemblies/assemblies/web-jms-tomcat-server/project.xml (from r371765, geronimo/branches/lw_assemblies/assemblies/activemq-derby-tomcat-server/project.xml)
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/assemblies/web-jms-tomcat-server/project.xml?p2=geronimo/branches/lw_assemblies/assemblies/web-jms-tomcat-server/project.xml&p1=geronimo/branches/lw_assemblies/assemblies/activemq-derby-tomcat-server/project.xml&r1=371765&r2=371766&rev=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/assemblies/activemq-derby-tomcat-server/project.xml (original)
+++ geronimo/branches/lw_assemblies/assemblies/web-jms-tomcat-server/project.xml Mon Jan 23 17:18:06 2006
@@ -20,9 +20,9 @@
 <project>
     <pomVersion>3</pomVersion>
     <extend>../../etc/project.xml</extend>
-    <id>geronimo-tomcat-j2ee</id>
-    <name>Geronimo Assembly for a J2EE Server running Tomcat</name>
-    <description>An assembly of Geronimo into a J2EE Server using Tomcat for the web container</description>
+    <id>geronimo-tomcat-jms</id>
+    <name>Geronimo Assembly for a Web Server running Tomcat and JMS</name>
+    <description>An assembly of Geronimo into a Web Server using Tomcat for the web container and ActiveMQQ for JMS</description>
 
     <dependencies>
         <!-- plugin we use --> 
@@ -197,7 +197,7 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>unavailable-openejb-deployer</artifactId>
+            <artifactId>unavailable-ejb-deployer</artifactId>
             <type>car</type>
             <version>${pom.currentVersion}</version>
             <properties>
@@ -206,7 +206,16 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>unavailable-axis-deployer</artifactId>
+            <artifactId>unavailable-webservices-deployer</artifactId>
+            <type>car</type>
+            <version>${pom.currentVersion}</version>
+            <properties>
+                <geronimo.assemble>install</geronimo.assemble>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>unavailable-client-deployer</artifactId>
             <type>car</type>
             <version>${pom.currentVersion}</version>
             <properties>

Modified: geronimo/branches/lw_assemblies/assemblies/web-jms-tomcat-server/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/assemblies/web-jms-tomcat-server/src/var/config/config.xml?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/assemblies/web-jms-tomcat-server/src/var/config/config.xml (original)
+++ geronimo/branches/lw_assemblies/assemblies/web-jms-tomcat-server/src/var/config/config.xml Mon Jan 23 17:18:06 2006
@@ -27,10 +27,6 @@
         </gbean>
     </configuration>
 
-    <configuration name="geronimo/unavailable-openejb-deployer/${pom.currentVersion}/car"/>
-
-    <configuration name="geronimo/unavailable-axis-deployer/${pom.currentVersion}/car"/>
-
     <configuration name="geronimo/activemq-broker/${pom.currentVersion}/car">
         <gbean name="ActiveMQ.tcp.default">
             <attribute name="host">${PlanServerHostname}</attribute>
@@ -76,21 +72,13 @@
             <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0</attribute>
         </gbean>
     </configuration>
-    <!--
-    <configuration name="geronimo/openejb-deployer/${pom.currentVersion}/car">
-        <gbean name="EJBBuilder">
-            <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=geronimo/tomcat/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=GBean,name=TomcatWebContainer</attribute>
-        </gbean>
-    </configuration>
-    <configuration name="geronimo/axis-deployer/${pom.currentVersion}/car"/>
-    <configuration name="geronimo/javamail/${pom.currentVersion}/car" load="false">
-        <gbean name="SMTPTransport">
-            <attribute name="host">localhost</attribute>
-            <attribute name="port">25</attribute>
-        </gbean>
-    </configuration>
-    -->
+
     <configuration name="geronimo/tomcat-deployer/${pom.currentVersion}/car"/>
+    <configuration name="geronimo/unavailable-ejb-deployer/${pom.currentVersion}/car"/>
+
+    <configuration name="geronimo/unavailable-webservices-deployer/${pom.currentVersion}/car"/>
+    <configuration name="geronimo/unavailable-client-deployer/${pom.currentVersion}/car"/>
+
     <configuration name="geronimo/welcome-tomcat/${pom.currentVersion}/car"/>
     <!--
     <configuration name="geronimo/ldap-demo-tomcat/${pom.currentVersion}/car"/>

Modified: geronimo/branches/lw_assemblies/configs/axis-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/axis-deployer/project.xml?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/axis-deployer/project.xml (original)
+++ geronimo/branches/lw_assemblies/configs/axis-deployer/project.xml Mon Jan 23 17:18:06 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>
 

Copied: geronimo/branches/lw_assemblies/configs/client-deployer/project.xml (from r371765, geronimo/branches/lw_assemblies/configs/appclient-deployer/project.xml)
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/client-deployer/project.xml?p2=geronimo/branches/lw_assemblies/configs/client-deployer/project.xml&p1=geronimo/branches/lw_assemblies/configs/appclient-deployer/project.xml&r1=371765&r2=371766&rev=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/appclient-deployer/project.xml (original)
+++ geronimo/branches/lw_assemblies/configs/client-deployer/project.xml Mon Jan 23 17:18:06 2006
@@ -21,7 +21,7 @@
 <project>
     <pomVersion>3</pomVersion>
     <extend>../../etc/project.xml</extend>
-    <id>appclient-deployer</id>
+    <id>client-deployer</id>
     <name>Configuration for application client deployments</name>
 
     <dependencies>
@@ -38,19 +38,19 @@
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+            <!--<properties>-->
+                <!--<geronimo.import>true</geronimo.import>-->
+            <!--</properties>-->
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <type>car</type>
+            <artifactId>j2ee-deployer</artifactId>
+            <version>${pom.currentVersion}</version>
             <properties>
-                 <geronimo.import>true</geronimo.import>
-             </properties>
+                <geronimo.import>true</geronimo.import>
+            </properties>
         </dependency>
-    <dependency>
-        <groupId>geronimo</groupId>
-        <type>car</type>
-        <artifactId>j2ee-server</artifactId>
-        <version>${pom.currentVersion}</version>
-            <properties>
-                 <geronimo.import>true</geronimo.import>
-             </properties>
-    </dependency>
 
         <!-- dependencies from gbean-deployer needed as maven adds service builder to the maven.root classloader -->
         <dependency>
@@ -89,23 +89,23 @@
             <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 -->
@@ -114,48 +114,48 @@
             <artifactId>geronimo-j2ee_1.4_spec</artifactId>
             <version>${geronimo_spec_j2ee_version}</version>
             <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </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>
+                <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>
+                <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>
+                <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>
+                <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>
+                <geronimo.dependency>true</geronimo.dependency>
+            </properties>
         </dependency>
 
 
@@ -166,72 +166,72 @@
             <artifactId>geronimo-j2ee-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-client-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-naming-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-naming</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-security-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-security</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-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>
@@ -250,8 +250,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>
@@ -275,32 +275,32 @@
             <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 -->
@@ -309,16 +309,16 @@
             <artifactId>geronimo-connector-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-connector</artifactId>
             <version>${geronimo_version}</version>
             <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
+                <geronimo.dependency>true</geronimo.dependency>
+            </properties>
         </dependency>
 
     </dependencies>

Modified: geronimo/branches/lw_assemblies/configs/client-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/client-deployer/src/plan/plan.xml?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/client-deployer/src/plan/plan.xml (original)
+++ geronimo/branches/lw_assemblies/configs/client-deployer/src/plan/plan.xml Mon Jan 23 17:18:06 2006
@@ -31,19 +31,30 @@
             <name>ClientEJBReferenceBuilder</name>
         </reference>
         <reference name="ConnectorModuleBuilder">
+            <module>*</module>
             <name>ConnectorBuilder</name>
         </reference>
         <reference name="ResourceReferenceBuilder">
-            <name>ConnectorBuilder</name>
-        </reference>
-        <reference name="ServiceReferenceBuilder">
             <module>*</module>
-            <name>WebServiceBuilder</name>
+            <name>ConnectorBuilder</name>
         </reference>
+        <references name="ServiceReferenceBuilder">
+            <pattern>
+                <module>*</module>
+                <name>WebServiceBuilder</name>
+            </pattern>
+            <pattern>
+                <module>*</module>
+                <name>UnavailableServiceReferenceBuilder</name>
+            </pattern>
+        </references>
         <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>
+            <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>

Modified: geronimo/branches/lw_assemblies/configs/console-jetty/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/console-jetty/project.properties?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/console-jetty/project.properties (original)
+++ geronimo/branches/lw_assemblies/configs/console-jetty/project.properties Mon Jan 23 17:18:06 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/branches/lw_assemblies/configs/console-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/console-jetty/project.xml?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/console-jetty/project.xml (original)
+++ geronimo/branches/lw_assemblies/configs/console-jetty/project.xml Mon Jan 23 17:18:06 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/branches/lw_assemblies/configs/console-tomcat/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/console-tomcat/project.properties?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/console-tomcat/project.properties (original)
+++ geronimo/branches/lw_assemblies/configs/console-tomcat/project.properties Mon Jan 23 17:18:06 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/branches/lw_assemblies/configs/console-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/console-tomcat/project.xml?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/console-tomcat/project.xml (original)
+++ geronimo/branches/lw_assemblies/configs/console-tomcat/project.xml Mon Jan 23 17:18:06 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/branches/lw_assemblies/configs/daytrader-jetty/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/daytrader-jetty/project.properties?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/daytrader-jetty/project.properties (original)
+++ geronimo/branches/lw_assemblies/configs/daytrader-jetty/project.properties Mon Jan 23 17:18:06 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/branches/lw_assemblies/configs/daytrader-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/daytrader-jetty/project.xml?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/daytrader-jetty/project.xml (original)
+++ geronimo/branches/lw_assemblies/configs/daytrader-jetty/project.xml Mon Jan 23 17:18:06 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/branches/lw_assemblies/configs/daytrader-tomcat/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/daytrader-tomcat/project.properties?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/daytrader-tomcat/project.properties (original)
+++ geronimo/branches/lw_assemblies/configs/daytrader-tomcat/project.properties Mon Jan 23 17:18:06 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/branches/lw_assemblies/configs/daytrader-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/daytrader-tomcat/project.xml?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/daytrader-tomcat/project.xml (original)
+++ geronimo/branches/lw_assemblies/configs/daytrader-tomcat/project.xml Mon Jan 23 17:18:06 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/branches/lw_assemblies/configs/j2ee-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/j2ee-deployer/src/plan/plan.xml?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/j2ee-deployer/src/plan/plan.xml (original)
+++ geronimo/branches/lw_assemblies/configs/j2ee-deployer/src/plan/plan.xml Mon Jan 23 17:18:06 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,12 +95,15 @@
         </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="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>
+        <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>
@@ -96,22 +114,34 @@
         <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>
         <references name="Store">
-            <pattern><gbean-name>geronimo.maven:name=MavenConfigStore,j2eeType=ConfigurationStore</gbean-name></pattern>
-            <pattern><gbean-name>geronimo.server:j2eeType=ConfigurationStore,name=Local</gbean-name></pattern>
+            <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/branches/lw_assemblies/configs/jetty-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/jetty-deployer/src/plan/plan.xml?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/jetty-deployer/src/plan/plan.xml (original)
+++ geronimo/branches/lw_assemblies/configs/jetty-deployer/src/plan/plan.xml Mon Jan 23 17:18:06 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/branches/lw_assemblies/configs/jmxdebug-jetty/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/jmxdebug-jetty/project.properties?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/jmxdebug-jetty/project.properties (original)
+++ geronimo/branches/lw_assemblies/configs/jmxdebug-jetty/project.properties Mon Jan 23 17:18:06 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/branches/lw_assemblies/configs/jmxdebug-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/jmxdebug-jetty/project.xml?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/jmxdebug-jetty/project.xml (original)
+++ geronimo/branches/lw_assemblies/configs/jmxdebug-jetty/project.xml Mon Jan 23 17:18:06 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/branches/lw_assemblies/configs/jmxdebug-tomcat/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/jmxdebug-tomcat/project.properties?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/jmxdebug-tomcat/project.properties (original)
+++ geronimo/branches/lw_assemblies/configs/jmxdebug-tomcat/project.properties Mon Jan 23 17:18:06 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/branches/lw_assemblies/configs/jmxdebug-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/jmxdebug-tomcat/project.xml?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/jmxdebug-tomcat/project.xml (original)
+++ geronimo/branches/lw_assemblies/configs/jmxdebug-tomcat/project.xml Mon Jan 23 17:18:06 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/branches/lw_assemblies/configs/jsp-examples-jetty/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/jsp-examples-jetty/project.properties?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/jsp-examples-jetty/project.properties (original)
+++ geronimo/branches/lw_assemblies/configs/jsp-examples-jetty/project.properties Mon Jan 23 17:18:06 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/branches/lw_assemblies/configs/jsp-examples-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/jsp-examples-jetty/project.xml?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/jsp-examples-jetty/project.xml (original)
+++ geronimo/branches/lw_assemblies/configs/jsp-examples-jetty/project.xml Mon Jan 23 17:18:06 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/branches/lw_assemblies/configs/jsp-examples-tomcat/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/jsp-examples-tomcat/project.properties?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/jsp-examples-tomcat/project.properties (original)
+++ geronimo/branches/lw_assemblies/configs/jsp-examples-tomcat/project.properties Mon Jan 23 17:18:06 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/branches/lw_assemblies/configs/jsp-examples-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/jsp-examples-tomcat/project.xml?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/jsp-examples-tomcat/project.xml (original)
+++ geronimo/branches/lw_assemblies/configs/jsp-examples-tomcat/project.xml Mon Jan 23 17:18:06 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/branches/lw_assemblies/configs/ldap-demo-jetty/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/ldap-demo-jetty/project.properties?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/ldap-demo-jetty/project.properties (original)
+++ geronimo/branches/lw_assemblies/configs/ldap-demo-jetty/project.properties Mon Jan 23 17:18:06 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/branches/lw_assemblies/configs/ldap-demo-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/ldap-demo-jetty/project.xml?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/ldap-demo-jetty/project.xml (original)
+++ geronimo/branches/lw_assemblies/configs/ldap-demo-jetty/project.xml Mon Jan 23 17:18:06 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/branches/lw_assemblies/configs/ldap-demo-tomcat/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/ldap-demo-tomcat/project.properties?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/ldap-demo-tomcat/project.properties (original)
+++ geronimo/branches/lw_assemblies/configs/ldap-demo-tomcat/project.properties Mon Jan 23 17:18:06 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/branches/lw_assemblies/configs/ldap-demo-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/ldap-demo-tomcat/project.xml?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/ldap-demo-tomcat/project.xml (original)
+++ geronimo/branches/lw_assemblies/configs/ldap-demo-tomcat/project.xml Mon Jan 23 17:18:06 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/branches/lw_assemblies/configs/openejb-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/openejb-deployer/src/plan/plan.xml?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/openejb-deployer/src/plan/plan.xml (original)
+++ geronimo/branches/lw_assemblies/configs/openejb-deployer/src/plan/plan.xml Mon Jan 23 17:18:06 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/branches/lw_assemblies/configs/openejb/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/lw_assemblies/configs/openejb/project.xml?rev=371766&r1=371765&r2=371766&view=diff
==============================================================================
--- geronimo/branches/lw_assemblies/configs/openejb/project.xml (original)
+++ geronimo/branches/lw_assemblies/configs/openejb/project.xml Mon Jan 23 17:18:06 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>
@@ -110,8 +119,8 @@
             <artifactId>openejb-core</artifactId>
             <version>${openejb_version}</version>
             <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
+                <geronimo.dependency>true</geronimo.dependency>
+            </properties>
         </dependency>
         <!--
         <dependency>
@@ -192,33 +201,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>



Mime
View raw message