geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r395993 - in /geronimo/branches/1.1: ./ 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/src/var/config/...
Date Fri, 21 Apr 2006 20:16:58 GMT
Author: djencks
Date: Fri Apr 21 13:16:55 2006
New Revision: 395993

URL: http://svn.apache.org/viewcvs?rev=395993&view=rev
Log:
GERONIMO-1875 use client deployer and axis deployer.  Fix a small problem in unavailableEJBReferenceBuilder

Modified:
    geronimo/branches/1.1/assemblies/j2ee-jetty-server/project.xml
    geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/config/config.xml
    geronimo/branches/1.1/assemblies/j2ee-tomcat-server/project.xml
    geronimo/branches/1.1/assemblies/j2ee-tomcat-server/src/var/config/config.xml
    geronimo/branches/1.1/assemblies/minimal-tomcat-server/src/var/config/config.xml
    geronimo/branches/1.1/configs/axis-deployer/project.xml
    geronimo/branches/1.1/configs/client-deployer/project.xml
    geronimo/branches/1.1/configs/client-deployer/src/plan/plan.xml
    geronimo/branches/1.1/configs/console-jetty/project.xml
    geronimo/branches/1.1/configs/console-tomcat/project.xml
    geronimo/branches/1.1/configs/daytrader-jetty/project.xml
    geronimo/branches/1.1/configs/daytrader-tomcat/project.xml
    geronimo/branches/1.1/configs/j2ee-deployer/project.xml
    geronimo/branches/1.1/configs/j2ee-deployer/src/plan/plan.xml
    geronimo/branches/1.1/configs/j2ee-server/project.xml
    geronimo/branches/1.1/configs/j2ee-server/src/plan/plan.xml
    geronimo/branches/1.1/configs/jmxdebug-jetty/project.xml
    geronimo/branches/1.1/configs/jmxdebug-tomcat/project.xml
    geronimo/branches/1.1/configs/jsp-examples-jetty/project.xml
    geronimo/branches/1.1/configs/jsp-examples-tomcat/project.xml
    geronimo/branches/1.1/configs/ldap-demo-jetty/project.xml
    geronimo/branches/1.1/configs/ldap-demo-tomcat/project.xml
    geronimo/branches/1.1/configs/openejb-deployer/src/plan/plan.xml
    geronimo/branches/1.1/configs/remote-deploy-jetty/project.xml
    geronimo/branches/1.1/configs/remote-deploy-tomcat/project.xml
    geronimo/branches/1.1/configs/servlets-examples-jetty/project.xml
    geronimo/branches/1.1/configs/servlets-examples-tomcat/project.xml
    geronimo/branches/1.1/configs/system-database/project.xml
    geronimo/branches/1.1/configs/tomcat-deployer/src/plan/plan.xml
    geronimo/branches/1.1/configs/uddi-jetty/project.xml
    geronimo/branches/1.1/configs/uddi-tomcat/project.xml
    geronimo/branches/1.1/configs/welcome-jetty/project.xml
    geronimo/branches/1.1/configs/welcome-tomcat/project.xml
    geronimo/branches/1.1/maven.xml
    geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnavailableEJBReferenceBuilder.java

Modified: geronimo/branches/1.1/assemblies/j2ee-jetty-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/assemblies/j2ee-jetty-server/project.xml?rev=395993&r1=395992&r2=395993&view=diff
==============================================================================
--- geronimo/branches/1.1/assemblies/j2ee-jetty-server/project.xml (original)
+++ geronimo/branches/1.1/assemblies/j2ee-jetty-server/project.xml Fri Apr 21 13:16:55 2006
@@ -98,26 +98,15 @@
                 <geronimo.assemble>install</geronimo.assemble>
             </properties>
         </dependency>
-<!--
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>directory</artifactId>
-            <type>car</type>
-            <version>${pom.currentVersion}</version>
-            <properties>
-                <geronimo.assemble>install</geronimo.assemble>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>ldap-realm</artifactId>
+            <artifactId>axis</artifactId>
             <type>car</type>
             <version>${pom.currentVersion}</version>
             <properties>
                 <geronimo.assemble>install</geronimo.assemble>
             </properties>
         </dependency>
--->
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>system-database</artifactId>
@@ -222,7 +211,7 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>hot-deployer</artifactId>
+            <artifactId>axis-deployer</artifactId>
             <type>car</type>
             <version>${pom.currentVersion}</version>
             <properties>
@@ -231,7 +220,7 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>jetty-deployer</artifactId>
+            <artifactId>client-deployer</artifactId>
             <type>car</type>
             <version>${pom.currentVersion}</version>
             <properties>
@@ -240,54 +229,41 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>sharedlib</artifactId>
-            <type>car</type>
-            <version>${pom.currentVersion}</version>
-            <properties>
-                <geronimo.assemble>install</geronimo.assemble>
-            </properties>
-        </dependency>
-<!-- applications -->
-<!--
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>ldap-demo-jetty</artifactId>
+            <artifactId>hot-deployer</artifactId>
             <type>car</type>
             <version>${pom.currentVersion}</version>
             <properties>
                 <geronimo.assemble>install</geronimo.assemble>
             </properties>
         </dependency>
--->
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>welcome-jetty</artifactId>
+            <artifactId>jetty-deployer</artifactId>
             <type>car</type>
             <version>${pom.currentVersion}</version>
             <properties>
                 <geronimo.assemble>install</geronimo.assemble>
             </properties>
         </dependency>
-<!--
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>servlets-examples-jetty</artifactId>
+            <artifactId>sharedlib</artifactId>
             <type>car</type>
             <version>${pom.currentVersion}</version>
             <properties>
                 <geronimo.assemble>install</geronimo.assemble>
             </properties>
         </dependency>
+<!-- applications -->
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>jsp-examples-jetty</artifactId>
+            <artifactId>welcome-jetty</artifactId>
             <type>car</type>
             <version>${pom.currentVersion}</version>
             <properties>
                 <geronimo.assemble>install</geronimo.assemble>
             </properties>
         </dependency>
--->
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>webconsole-jetty</artifactId>
@@ -325,26 +301,6 @@
                 <geronimo.assemble>install</geronimo.assemble>
             </properties>
         </dependency>
-<!--
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>daytrader-derby-jetty</artifactId>
-            <type>car</type>
-            <version>${pom.currentVersion}</version>
-            <properties>
-                <geronimo.assemble>install</geronimo.assemble>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>daytrader-derby-jetty-streamer-client</artifactId>
-            <type>car</type>
-            <version>${daytrader_version}</version>
-            <properties>
-                <geronimo.assemble>install</geronimo.assemble>
-            </properties>
-        </dependency>
--->
         <!-- unpack --> 
         <dependency>
             <groupId>geronimo</groupId>
@@ -537,17 +493,6 @@
             </properties>
         </dependency>
 
-        <!-- duplicate dependency - commented out to avoid eclipse project errors
-        #<dependency>
-        #    <groupId>geronimo</groupId>
-        #    <artifactId>geronimo-deploy-tool</artifactId>
-        #    <version>${pom.currentVersion}</version>
-        #    <properties>
-        #        <geronimo.assemble>library</geronimo.assemble>
-        #    </properties>
-        #</dependency>
-        -->
-
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-util</artifactId>
@@ -685,16 +630,6 @@
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
-        <!-- duplicate dependency - commented out to avoid eclipse project errors
-        #<dependency>
-        #    <groupId>org.apache.geronimo.specs</groupId>
-        #    <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
-        #    <version>${geronimo_spec_j2ee_deployment_version}</version>
-        #    <properties>
-        #        <geronimo.assemble>repository</geronimo.assemble>
-        #    </properties>
-        #</dependency>
-        -->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
@@ -759,16 +694,6 @@
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
-        <!-- duplicate dependency - commented out to avoid eclipse project errors
-        #<dependency>
-        #    <groupId>org.apache.geronimo.specs</groupId>
-        #    <artifactId>geronimo-qname_1.1_spec</artifactId>
-        #    <version>${geronimo_spec_qname_version}</version>
-        #    <properties>
-        #        <geronimo.assemble>repository</geronimo.assemble>
-        #    </properties>
-        #</dependency>
-        -->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-saaj_1.1_spec</artifactId>
@@ -870,74 +795,6 @@
             <artifactId>concurrent</artifactId>
             <version>${concurrent_version}</version>
         </dependency>
-<!-- Remove all Apache Directory stuff
-        <dependency>
-            <groupId>directory</groupId>
-            <artifactId>apacheds-core</artifactId>
-            <version>${apacheds_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>directory</groupId>
-            <artifactId>apacheds-shared</artifactId>
-            <version>${apacheds_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>directory-asn1</groupId>
-            <artifactId>asn1-ber</artifactId>
-            <version>${asn1_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>directory-asn1</groupId>
-            <artifactId>asn1-codec</artifactId>
-            <version>${asn1_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>directory-asn1</groupId>
-            <artifactId>asn1-der</artifactId>
-            <version>${asn1_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>directory-network</groupId>
-            <artifactId>mina</artifactId>
-            <version>${mina_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>directory-protocols</groupId>
-            <artifactId>kerberos-protocol</artifactId>
-            <version>${kerberos_protocols_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>directory-protocols</groupId>
-            <artifactId>ldap-protocol</artifactId>
-            <version>${ldap_protocols_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>directory-shared</groupId>
-            <artifactId>apache-ldapber-provider</artifactId>
-            <version>${apacheds_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>directory-shared</groupId>
-            <artifactId>kerberos-common</artifactId>
-            <version>${kerberos_common_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>directory-shared</groupId>
-            <artifactId>ldap-common</artifactId>
-            <version>${apacheds_version}</version>
-        </dependency>
--->
-
 
         <dependency>
             <groupId>howl</groupId>
@@ -1193,46 +1050,6 @@
 
         <!-- Specification dependencies to preload into the repository -->
         
-        <!-- duplicate dependency - commented out to avoid eclipse project errors
-        #<dependency>
-        #    <groupId>org.apache.geronimo.specs</groupId>
-        #    <artifactId>geronimo-j2ee_1.4_spec</artifactId>
-        #    <version>${geronimo_spec_j2ee_version}</version>
-        #</dependency>
-        -->
-
-        <!-- duplicate dependency - commented out to avoid eclipse project errors
-        #<dependency>
-        #    <groupId>org.apache.geronimo.specs</groupId>
-        #    <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
-        #    <version>${geronimo_spec_j2ee_jacc_version}</version>
-        #</dependency>
-        -->
-
-        <!-- duplicate dependency - commented out to avoid eclipse project errors
-        #<dependency>
-        #    <groupId>org.apache.geronimo.specs</groupId>
-        #    <artifactId>geronimo-activation_1.0.2_spec</artifactId>
-        #    <version>${geronimo_spec_activation_version}</version>
-        #</dependency>
-        -->
-
-        <!-- duplicate dependency - commented out to avoid eclipse project errors
-        #<dependency>
-        #    <groupId>org.apache.geronimo.specs</groupId>
-        #    <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
-        #    <version>${geronimo_spec_javamail_version}</version>
-        #</dependency>
-        -->
-
-        <!-- duplicate dependency - commented out to avoid eclipse project errors
-        #<dependency>
-        #    <groupId>org.apache.geronimo.specs</groupId>
-        #    <artifactId>geronimo-corba_2.3_spec</artifactId>
-        #    <version>${geronimo_spec_corba_version}</version>
-        #</dependency>
-        -->
-
         <!-- Geronimo modules to preload into the repository -->
         <dependency>
             <groupId>geronimo</groupId>
@@ -1279,13 +1096,6 @@
             <artifactId>geronimo-derby</artifactId>
             <version>${pom.currentVersion}</version>
         </dependency>
-<!-- Should be installed when Directory is installed
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-directory</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
--->
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-j2ee</artifactId>
@@ -1367,13 +1177,6 @@
             <artifactId>geronimo-transaction</artifactId>
             <version>${pom.currentVersion}</version>
         </dependency>
-        <!-- duplicate dependency - commented out to avoid eclipse project errors
-        #<dependency>
-        #    <groupId>geronimo</groupId>
-        #    <artifactId>geronimo-util</artifactId>
-        #    <version>${pom.currentVersion}</version>
-        #</dependency>
-        -->
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-web-builder</artifactId>

Modified: geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/config/config.xml?rev=395993&r1=395992&r2=395993&view=diff
==============================================================================
--- geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/config/config.xml (original)
+++ geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/config/config.xml Fri Apr 21 13:16:55 2006
@@ -30,6 +30,7 @@
             <attribute name="urlPath">/jndi/rmi://${PlanServerHostname}:${PlanNamingPort}/JMXConnector</attribute>
         </gbean>
     </configuration>
+    <configuration name="geronimo/axis/${pom.currentVersion}/car"/>
     <configuration name="geronimo/openejb/${pom.currentVersion}/car">
         <gbean name="EJBNetworkService">
             <attribute name="host">${PlanServerHostname}</attribute>
@@ -96,6 +97,8 @@
             <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">
             <attribute name="host">localhost</attribute>

Modified: geronimo/branches/1.1/assemblies/j2ee-tomcat-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/assemblies/j2ee-tomcat-server/project.xml?rev=395993&r1=395992&r2=395993&view=diff
==============================================================================
--- geronimo/branches/1.1/assemblies/j2ee-tomcat-server/project.xml (original)
+++ geronimo/branches/1.1/assemblies/j2ee-tomcat-server/project.xml Fri Apr 21 13:16:55 2006
@@ -98,26 +98,15 @@
                 <geronimo.assemble>install</geronimo.assemble>
             </properties>
         </dependency>
-<!--
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>directory</artifactId>
-            <type>car</type>
-            <version>${pom.currentVersion}</version>
-            <properties>
-                <geronimo.assemble>install</geronimo.assemble>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>ldap-realm</artifactId>
+            <artifactId>axis</artifactId>
             <type>car</type>
             <version>${pom.currentVersion}</version>
             <properties>
                 <geronimo.assemble>install</geronimo.assemble>
             </properties>
         </dependency>
--->
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>system-database</artifactId>
@@ -222,16 +211,7 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>hot-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>
+            <artifactId>axis-deployer</artifactId>
             <type>car</type>
             <version>${pom.currentVersion}</version>
             <properties>
@@ -240,54 +220,50 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>sharedlib</artifactId>
+            <artifactId>client-deployer</artifactId>
             <type>car</type>
             <version>${pom.currentVersion}</version>
             <properties>
                 <geronimo.assemble>install</geronimo.assemble>
             </properties>
         </dependency>
-<!-- applications -->
-<!--
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>ldap-demo-tomcat</artifactId>
+            <artifactId>hot-deployer</artifactId>
             <type>car</type>
             <version>${pom.currentVersion}</version>
             <properties>
                 <geronimo.assemble>install</geronimo.assemble>
             </properties>
         </dependency>
--->
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>welcome-tomcat</artifactId>
+            <artifactId>tomcat-deployer</artifactId>
             <type>car</type>
             <version>${pom.currentVersion}</version>
             <properties>
                 <geronimo.assemble>install</geronimo.assemble>
             </properties>
         </dependency>
-<!--
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>servlets-examples-tomcat</artifactId>
+            <artifactId>sharedlib</artifactId>
             <type>car</type>
             <version>${pom.currentVersion}</version>
             <properties>
                 <geronimo.assemble>install</geronimo.assemble>
             </properties>
         </dependency>
+<!-- applications -->
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>jsp-examples-tomcat</artifactId>
+            <artifactId>welcome-tomcat</artifactId>
             <type>car</type>
             <version>${pom.currentVersion}</version>
             <properties>
                 <geronimo.assemble>install</geronimo.assemble>
             </properties>
         </dependency>
--->
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>webconsole-tomcat</artifactId>
@@ -325,26 +301,6 @@
                 <geronimo.assemble>install</geronimo.assemble>
             </properties>
         </dependency>
-<!--
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>daytrader-derby-tomcat</artifactId>
-            <type>car</type>
-            <version>${pom.currentVersion}</version>
-            <properties>
-                <geronimo.assemble>install</geronimo.assemble>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>daytrader-derby-tomcat-streamer-client</artifactId>
-            <type>car</type>
-            <version>${daytrader_version}</version>
-            <properties>
-                <geronimo.assemble>install</geronimo.assemble>
-            </properties>
-        </dependency>
--->
         <!-- unpack --> 
         <dependency>
             <groupId>geronimo</groupId>
@@ -537,17 +493,6 @@
             </properties>
         </dependency>
 
-        <!-- duplicate dependency - commented out to avoid eclipse project errors
-        #<dependency>
-        #    <groupId>geronimo</groupId>
-        #    <artifactId>geronimo-deploy-tool</artifactId>
-        #    <version>${pom.currentVersion}</version>
-        #    <properties>
-        #        <geronimo.assemble>library</geronimo.assemble>
-        #    </properties>
-        #</dependency>
-        -->
-
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-util</artifactId>
@@ -685,16 +630,6 @@
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
-        <!-- duplicate dependency - commented out to avoid eclipse project errors
-        #<dependency>
-        #    <groupId>org.apache.geronimo.specs</groupId>
-        #    <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
-        #    <version>${geronimo_spec_j2ee_deployment_version}</version>
-        #    <properties>
-        #        <geronimo.assemble>repository</geronimo.assemble>
-        #    </properties>
-        #</dependency>
-        -->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
@@ -759,16 +694,6 @@
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
-        <!-- duplicate dependency - commented out to avoid eclipse project errors
-        #<dependency>
-        #    <groupId>org.apache.geronimo.specs</groupId>
-        #    <artifactId>geronimo-qname_1.1_spec</artifactId>
-        #    <version>${geronimo_spec_qname_version}</version>
-        #    <properties>
-        #        <geronimo.assemble>repository</geronimo.assemble>
-        #    </properties>
-        #</dependency>
-        -->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-saaj_1.1_spec</artifactId>
@@ -871,73 +796,6 @@
             <artifactId>concurrent</artifactId>
             <version>${concurrent_version}</version>
         </dependency>
-<!-- Remove all Apache Directory stuff
-        <dependency>
-            <groupId>directory</groupId>
-            <artifactId>apacheds-core</artifactId>
-            <version>${apacheds_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>directory</groupId>
-            <artifactId>apacheds-shared</artifactId>
-            <version>${apacheds_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>directory-asn1</groupId>
-            <artifactId>asn1-ber</artifactId>
-            <version>${asn1_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>directory-asn1</groupId>
-            <artifactId>asn1-codec</artifactId>
-            <version>${asn1_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>directory-asn1</groupId>
-            <artifactId>asn1-der</artifactId>
-            <version>${asn1_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>directory-network</groupId>
-            <artifactId>mina</artifactId>
-            <version>${mina_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>directory-protocols</groupId>
-            <artifactId>kerberos-protocol</artifactId>
-            <version>${kerberos_protocols_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>directory-protocols</groupId>
-            <artifactId>ldap-protocol</artifactId>
-            <version>${ldap_protocols_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>directory-shared</groupId>
-            <artifactId>apache-ldapber-provider</artifactId>
-            <version>${apacheds_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>directory-shared</groupId>
-            <artifactId>kerberos-common</artifactId>
-            <version>${kerberos_common_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>directory-shared</groupId>
-            <artifactId>ldap-common</artifactId>
-            <version>${apacheds_version}</version>
-        </dependency>
--->
 
         <dependency>
             <groupId>howl</groupId>
@@ -1209,46 +1067,6 @@
 
         <!-- Specification dependencies to preload into the repository -->
         
-        <!-- duplicate dependency - commented out to avoid eclipse project errors
-        #<dependency>
-        #    <groupId>org.apache.geronimo.specs</groupId>
-        #    <artifactId>geronimo-j2ee_1.4_spec</artifactId>
-        #    <version>${geronimo_spec_j2ee_version}</version>
-        #</dependency>
-        -->
-
-        <!-- duplicate dependency - commented out to avoid eclipse project errors
-        #<dependency>
-        #    <groupId>org.apache.geronimo.specs</groupId>
-        #    <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
-        #    <version>${geronimo_spec_j2ee_jacc_version}</version>
-        #</dependency>
-        -->
-
-        <!-- duplicate dependency - commented out to avoid eclipse project errors
-        #<dependency>
-        #    <groupId>org.apache.geronimo.specs</groupId>
-        #    <artifactId>geronimo-activation_1.0.2_spec</artifactId>
-        #    <version>${geronimo_spec_activation_version}</version>
-        #</dependency>
-        -->
-
-        <!-- duplicate dependency - commented out to avoid eclipse project errors
-        #<dependency>
-        #    <groupId>org.apache.geronimo.specs</groupId>
-        #    <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
-        #    <version>${geronimo_spec_javamail_version}</version>
-        #</dependency>
-        -->
-
-        <!-- duplicate dependency - commented out to avoid eclipse project errors
-        #<dependency>
-        #    <groupId>org.apache.geronimo.specs</groupId>
-        #    <artifactId>geronimo-corba_2.3_spec</artifactId>
-        #    <version>${geronimo_spec_corba_version}</version>
-        #</dependency>
-        -->
-
         <!-- Geronimo modules to preload into the repository -->
         <dependency>
             <groupId>geronimo</groupId>
@@ -1295,13 +1113,6 @@
             <artifactId>geronimo-derby</artifactId>
             <version>${pom.currentVersion}</version>
         </dependency>
-<!-- Should be installed when Directory is installed
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-directory</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
--->
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-j2ee</artifactId>
@@ -1382,13 +1193,6 @@
             <artifactId>geronimo-transaction</artifactId>
             <version>${pom.currentVersion}</version>
         </dependency>
-        <!-- duplicate dependency - commented out to avoid eclipse project errors
-        #<dependency>
-        #    <groupId>geronimo</groupId>
-        #    <artifactId>geronimo-util</artifactId>
-        #    <version>${pom.currentVersion}</version>
-        #</dependency>
-        -->
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-web-builder</artifactId>

Modified: geronimo/branches/1.1/assemblies/j2ee-tomcat-server/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/assemblies/j2ee-tomcat-server/src/var/config/config.xml?rev=395993&r1=395992&r2=395993&view=diff
==============================================================================
--- geronimo/branches/1.1/assemblies/j2ee-tomcat-server/src/var/config/config.xml (original)
+++ geronimo/branches/1.1/assemblies/j2ee-tomcat-server/src/var/config/config.xml Fri Apr 21 13:16:55 2006
@@ -30,6 +30,7 @@
           <attribute name="urlPath">/jndi/rmi://${PlanServerHostname}:${PlanNamingPort}/JMXConnector</attribute>
         </gbean>
     </configuration>
+    <configuration name="geronimo/axis/${pom.currentVersion}/car"/>
     <configuration name="geronimo/openejb/${pom.currentVersion}/car">
         <gbean name="EJBNetworkService">
             <attribute name="host">${PlanServerHostname}</attribute>
@@ -98,6 +99,8 @@
             <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/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">
             <attribute name="host">localhost</attribute>

Modified: geronimo/branches/1.1/assemblies/minimal-tomcat-server/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/assemblies/minimal-tomcat-server/src/var/config/config.xml?rev=395993&r1=395992&r2=395993&view=diff
==============================================================================
--- geronimo/branches/1.1/assemblies/minimal-tomcat-server/src/var/config/config.xml (original)
+++ geronimo/branches/1.1/assemblies/minimal-tomcat-server/src/var/config/config.xml Fri Apr 21 13:16:55 2006
@@ -16,19 +16,17 @@
             <attribute name="namingProviderUrl">rmi://${PlanServerHostname}:${PlanNamingPort}</attribute>
         </gbean>
     </configuration>
-    <configuration name="geronimo/j2ee-server/${pom.currentVersion}/car">
-        <gbean name="geronimo:name=EJB,type=NetworkService">
-            <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanOpenEJBPort}</attribute>
-        </gbean>
-    </configuration>
+    <configuration name="geronimo/j2ee-server/${pom.currentVersion}/car"/>
     <configuration name="geronimo/j2ee-security/${pom.currentVersion}/car">
         <gbean name="geronimo.remoting:target=JaasLoginServiceRemotingServer">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanRemoteLoginPort}</attribute>
         </gbean>
         <gbean name="JMXService">
-            <attribute name="url">service:jmx:rmi://${PlanServerHostname}:${PlanJMXPort}/jndi/rmi://${PlanServerHostname}:${PlanNamingPort}/JMXConnector</attribute>
+            <attribute name="protocol">rmi</attribute>
+            <attribute name="host">${PlanServerHostname}</attribute>
+            <attribute name="port">${PlanJMXPort}</attribute>
+            <attribute name="urlPath">/jndi/rmi://${PlanServerHostname}:${PlanNamingPort}/JMXConnector</attribute>
         </gbean>
     </configuration>
 

Modified: geronimo/branches/1.1/configs/axis-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/axis-deployer/project.xml?rev=395993&r1=395992&r2=395993&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/axis-deployer/project.xml (original)
+++ geronimo/branches/1.1/configs/axis-deployer/project.xml Fri Apr 21 13:16:55 2006
@@ -56,7 +56,6 @@
             <type>car</type>
             <artifactId>axis</artifactId>
             <version>${pom.currentVersion}</version>
-<!--  @JAB replaced import with dependency below  -->
             <properties>
                 <geronimo.dependency>true</geronimo.dependency>
             </properties>
@@ -165,14 +164,6 @@
         </dependency>
 
         <!-- EJBs using OpenEJB -->
-        <dependency>
-            <groupId>openejb</groupId>
-            <artifactId>openejb-builder</artifactId>
-            <version>${openejb_version}</version>
-            <properties>
-                <geronimo.dependency>true</geronimo.dependency>
-            </properties>
-        </dependency>
         <dependency>
             <groupId>openejb</groupId>
             <artifactId>openejb-pkgen-builder</artifactId>

Modified: geronimo/branches/1.1/configs/client-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/client-deployer/project.xml?rev=395993&r1=395992&r2=395993&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/client-deployer/project.xml (original)
+++ geronimo/branches/1.1/configs/client-deployer/project.xml Fri Apr 21 13:16:55 2006
@@ -89,23 +89,6 @@
             <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 -->
@@ -117,16 +100,6 @@
                 <geronimo.dependency>true</geronimo.dependency>
             </properties>
         </dependency>
-<!--  @JAB removed
-        <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-corba</artifactId>
-            <version>${geronimo_spec_corba_version}</version>
-            <properties>
-                <geronimo.dependency>true</geronimo.dependency>
-            </properties>
-        </dependency>
--->
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-j2ee-schema</artifactId>
@@ -135,16 +108,6 @@
                 <geronimo.dependency>true</geronimo.dependency>
             </properties>
         </dependency>
-<!--  @JAB
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-interceptor</artifactId>
-            <version>${geronimo_version}</version>
-            <properties>
-                <geronimo.dependency>true</geronimo.dependency>
-             </properties>
-        </dependency>
--->
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-core</artifactId>
@@ -223,14 +186,6 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>geronimo-axis-builder</artifactId>
-            <version>${geronimo_version}</version>
-            <properties>
-                <geronimo.dependency>true</geronimo.dependency>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
             <artifactId>geronimo-axis</artifactId>
             <version>${geronimo_version}</version>
             <properties>
@@ -282,14 +237,6 @@
         </dependency>
 
         <!-- EJBs using OpenEJB -->
-        <dependency>
-            <groupId>openejb</groupId>
-            <artifactId>openejb-builder</artifactId>
-            <version>${openejb_version}</version>
-            <properties>
-                <geronimo.dependency>true</geronimo.dependency>
-            </properties>
-        </dependency>
         <dependency>
             <groupId>openejb</groupId>
             <artifactId>openejb-pkgen-builder</artifactId>

Modified: geronimo/branches/1.1/configs/client-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/client-deployer/src/plan/plan.xml?rev=395993&r1=395992&r2=395993&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/client-deployer/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/client-deployer/src/plan/plan.xml Fri Apr 21 13:16:55 2006
@@ -20,14 +20,18 @@
 
         >
 
-<!-- @JAB moved from j2ee-deployer plan -->
     <gbean name="AppClientBuilder" class="org.apache.geronimo.client.builder.AppClientModuleBuilder">
         <attribute name="transactionContextManagerObjectName">?name=TransactionContextManager</attribute>
         <attribute name="connectionTrackerObjectName">?name=ConnectionTracker</attribute>
         <attribute name="corbaGBeanObjectName">?name=Server</attribute>
-        <reference name="EJBReferenceBuilder">
-            <name>ClientEJBReferenceBuilder</name>
-        </reference>
+        <references name="EJBReferenceBuilder">
+            <pattern>
+                <name>ClientEJBReferenceBuilder</name>
+            </pattern>
+            <pattern>
+                <name>UnavailableClientEJBReferenceBuilder</name>
+            </pattern>
+        </references>
         <reference name="ConnectorModuleBuilder">
             <name>ConnectorBuilder</name>
         </reference>
@@ -39,7 +43,7 @@
                 <name>WebServiceBuilder</name>
             </pattern>
             <pattern>
-                <name>UnavailableServiceReferenceBuilder</name>
+                <name>UnavailableWebServiceBuilder</name>
             </pattern>
         </references>
         <xml-attribute name="defaultServerEnvironment">
@@ -67,30 +71,5 @@
             </environment>
         </xml-attribute>
     </gbean>
-
-<!--  @JAB version from trunk (modified) 
-    <gbean name="AppClientBuilder" class="org.apache.geronimo.client.builder.AppClientModuleBuilder">
-        <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">
-            <name>ClientEJBReferenceBuilder</name>
-        </reference>
-        <reference name="ConnectorModuleBuilder">
-            <name>ConnectorBuilder</name>
-        </reference>
-        <reference name="ResourceReferenceBuilder">
-            <name>ConnectorBuilder</name>
-        </reference>
-        <references name="ServiceReferenceBuilder">
-            <pattern>
-                <name>WebServiceBuilder</name>
-            </pattern>
-            <pattern>
-                <name>UnavailableServiceReferenceBuilder</name>
-            </pattern>
-        </references>
-    </gbean>
--->
 
 </configuration>

Modified: geronimo/branches/1.1/configs/console-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/console-jetty/project.xml?rev=395993&r1=395992&r2=395993&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/console-jetty/project.xml (original)
+++ geronimo/branches/1.1/configs/console-jetty/project.xml Fri Apr 21 13:16:55 2006
@@ -61,6 +61,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>
@@ -68,6 +74,24 @@
                 <packaging.config.order>4</packaging.config.order>
             </properties>
         </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>axis-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>5</packaging.config.order>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>client-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>6</packaging.config.order>
+            </properties>
+        </dependency>
 
         <!-- parent config -->
         <dependency>
@@ -249,13 +273,6 @@
             <groupId>geronimo</groupId>
             <artifactId>geronimo-system</artifactId>
             <version>${geronimo_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>jetty-deployer</artifactId>
-            <version>${geronimo_version}</version>
-            <type>car</type>
         </dependency>
 
         <dependency>

Modified: geronimo/branches/1.1/configs/console-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/console-tomcat/project.xml?rev=395993&r1=395992&r2=395993&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/console-tomcat/project.xml (original)
+++ geronimo/branches/1.1/configs/console-tomcat/project.xml Fri Apr 21 13:16:55 2006
@@ -41,42 +41,49 @@
                 <packaging.config.order>1</packaging.config.order>
             </properties>
         </dependency>
-<!-- should be in default env.
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>tomcat</artifactId>
+            <artifactId>j2ee-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
             <properties>
-                <geronimo.dependency>true</geronimo.dependency>
+                <packaging.config.order>2</packaging.config.order>
             </properties>
         </dependency>
--->
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>j2ee-deployer</artifactId>
+            <artifactId>tomcat-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
             <properties>
-                <packaging.config.order>2</packaging.config.order>
+                <packaging.config.order>3</packaging.config.order>
             </properties>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>tomcat-deployer</artifactId>
+            <artifactId>openejb-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
             <properties>
-                <packaging.config.order>3</packaging.config.order>
+                <packaging.config.order>4</packaging.config.order>
             </properties>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>openejb-deployer</artifactId>
+            <artifactId>axis-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
             <properties>
-                <packaging.config.order>4</packaging.config.order>
+                <packaging.config.order>5</packaging.config.order>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>client-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>6</packaging.config.order>
             </properties>
         </dependency>
 
@@ -260,13 +267,6 @@
             <groupId>geronimo</groupId>
             <artifactId>geronimo-system</artifactId>
             <version>${geronimo_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>jetty-deployer</artifactId>
-            <version>${geronimo_version}</version>
-            <type>car</type>
         </dependency>
 
         <dependency>

Modified: geronimo/branches/1.1/configs/daytrader-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/daytrader-jetty/project.xml?rev=395993&r1=395992&r2=395993&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/daytrader-jetty/project.xml (original)
+++ geronimo/branches/1.1/configs/daytrader-jetty/project.xml Fri Apr 21 13:16:55 2006
@@ -68,17 +68,24 @@
                 <packaging.config.order>4</packaging.config.order>
             </properties>
         </dependency>
-<!--
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>client-deployer</artifactId>
+            <artifactId>axis-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
             <properties>
                 <packaging.config.order>5</packaging.config.order>
             </properties>
         </dependency>
--->
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>client-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>6</packaging.config.order>
+            </properties>
+        </dependency>
          <!-- parent config -->
         <dependency>
             <groupId>geronimo</groupId>

Modified: geronimo/branches/1.1/configs/daytrader-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/daytrader-tomcat/project.xml?rev=395993&r1=395992&r2=395993&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/daytrader-tomcat/project.xml (original)
+++ geronimo/branches/1.1/configs/daytrader-tomcat/project.xml Fri Apr 21 13:16:55 2006
@@ -68,17 +68,24 @@
                 <packaging.config.order>4</packaging.config.order>
             </properties>
         </dependency>
-<!--
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>client-deployer</artifactId>
+            <artifactId>axis-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
             <properties>
                 <packaging.config.order>5</packaging.config.order>
             </properties>
         </dependency>
--->
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>client-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>6</packaging.config.order>
+            </properties>
+        </dependency>
          <!-- parent config -->
         <dependency>
             <groupId>geronimo</groupId>

Modified: geronimo/branches/1.1/configs/j2ee-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/j2ee-deployer/project.xml?rev=395993&r1=395992&r2=395993&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/j2ee-deployer/project.xml (original)
+++ geronimo/branches/1.1/configs/j2ee-deployer/project.xml Fri Apr 21 13:16:55 2006
@@ -229,14 +229,6 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>geronimo-axis-builder</artifactId>
-            <version>${geronimo_version}</version>
-            <properties>
-                <geronimo.dependency>true</geronimo.dependency>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
             <artifactId>geronimo-axis</artifactId>
             <version>${geronimo_version}</version>
             <properties>
@@ -288,14 +280,6 @@
         </dependency>
 
         <!-- EJBs using OpenEJB -->
-        <dependency>
-            <groupId>openejb</groupId>
-            <artifactId>openejb-builder</artifactId>
-            <version>${openejb_version}</version>
-            <properties>
-                <geronimo.dependency>true</geronimo.dependency>
-            </properties>
-        </dependency>
         <dependency>
             <groupId>openejb</groupId>
             <artifactId>openejb-pkgen-builder</artifactId>

Modified: geronimo/branches/1.1/configs/j2ee-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/j2ee-deployer/src/plan/plan.xml?rev=395993&r1=395992&r2=395993&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/j2ee-deployer/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/j2ee-deployer/src/plan/plan.xml Fri Apr 21 13:16:55 2006
@@ -45,21 +45,31 @@
         <reference name="ConnectorConfigBuilder">
             <name>ConnectorBuilder</name>
         </reference>
-        <reference name="AppClientConfigBuilder">
-            <name>AppClientBuilder</name>
-        </reference>
+        <references name="AppClientConfigBuilder">
+            <pattern>
+                <name>AppClientBuilder</name>
+            </pattern>
+            <pattern>
+                <name>UnavailableAppClientBuilder</name>
+            </pattern>
+        </references>
         <reference name="ResourceReferenceBuilder">
             <name>ConnectorBuilder</name>
         </reference>
-        <reference name="ServiceReferenceBuilder">
-            <name>WebServiceBuilder</name>
-        </reference>
+        <references name="ServiceReferenceBuilder">
+            <pattern>
+                <name>WebServiceBuilder</name>
+            </pattern>
+            <pattern>
+                <name>UnavailableWebServiceBuilder</name>
+            </pattern>
+        </references>
         <references name="EJBReferenceBuilder">
             <pattern>
                 <name>ServerEJBReferenceBuilder</name>
             </pattern>
             <pattern>
-                <name>UnavailableEJBReferenceBuilder</name>
+                <name>UnavailableServerEJBReferenceBuilder</name>
             </pattern>
         </references>
         <xml-attribute name="defaultEnvironment">
@@ -110,59 +120,11 @@
         </xml-attribute>
     </gbean>
 
-    <gbean name="AppClientBuilder" class="org.apache.geronimo.client.builder.AppClientModuleBuilder">
-        <attribute name="transactionContextManagerObjectName">?name=TransactionContextManager</attribute>
-        <attribute name="connectionTrackerObjectName">?name=ConnectionTracker</attribute>
-        <attribute name="corbaGBeanObjectName">?name=Server</attribute>
-        <references name="EJBReferenceBuilder">
-            <pattern>
-                <name>ClientEJBReferenceBuilder</name>
-            </pattern>
-            <pattern>
-                <name>UnavailableClientEJBReferenceBuilder</name>
-            </pattern>
-        </references>
-        <reference name="ConnectorModuleBuilder">
-            <name>ConnectorBuilder</name>
-        </reference>
-        <reference name="ResourceReferenceBuilder">
-            <name>ConnectorBuilder</name>
-        </reference>
-        <reference name="ServiceReferenceBuilder">
-            <name>WebServiceBuilder</name>
-        </reference>
-        <xml-attribute name="defaultServerEnvironment">
-            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
-                <dependencies>
-                    <dependency>
-                        <groupId>${pom.groupId}</groupId>
-                        <artifactId>j2ee-server</artifactId>
-                        <version>${pom.currentVersion}</version>
-                        <type>car</type>
-                    </dependency>
-                </dependencies>
-            </environment>
-        </xml-attribute>
-        <xml-attribute name="defaultClientEnvironment">
-            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
-                <dependencies>
-                    <dependency>
-                        <groupId>${pom.groupId}</groupId>
-                        <artifactId>client</artifactId>
-                        <version>${pom.currentVersion}</version>
-                        <type>car</type>
-                    </dependency>
-                </dependencies>
-            </environment>
-        </xml-attribute>
-    </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="policyProvider">org.apache.geronimo.security.jacc.GeronimoPolicy</attribute>
     </gbean>
-    <gbean name="WebServiceBuilder" class="org.apache.geronimo.axis.builder.AxisBuilder"/>
 
 </configuration>

Modified: geronimo/branches/1.1/configs/j2ee-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/j2ee-server/project.xml?rev=395993&r1=395992&r2=395993&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/j2ee-server/project.xml (original)
+++ geronimo/branches/1.1/configs/j2ee-server/project.xml Fri Apr 21 13:16:55 2006
@@ -245,16 +245,6 @@
             <artifactId>geronimo-activation</artifactId>
             <version>${geronimo_version}</version>
         </dependency>
-        <!--dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-management</artifactId>
-            <version>${geronimo_version}</version>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-j2ee</artifactId>
-            <version>${geronimo_version}</version>
-        </dependency-->
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-naming</artifactId>

Modified: geronimo/branches/1.1/configs/j2ee-server/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/j2ee-server/src/plan/plan.xml?rev=395993&r1=395992&r2=395993&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/j2ee-server/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/j2ee-server/src/plan/plan.xml Fri Apr 21 13:16:55 2006
@@ -121,6 +121,4 @@
 
     <gbean name="eis/JAXR" class="org.apache.geronimo.webservices.jaxr.JAXRGBean"/>
 
-    <gbean name="AxisCLWorkaround" class="org.apache.geronimo.axis.AxisDiscoveryCLWorkaroundGBean"/>
-
 </configuration>

Modified: geronimo/branches/1.1/configs/jmxdebug-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/jmxdebug-jetty/project.xml?rev=395993&r1=395992&r2=395993&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/jmxdebug-jetty/project.xml (original)
+++ geronimo/branches/1.1/configs/jmxdebug-jetty/project.xml Fri Apr 21 13:16:55 2006
@@ -68,6 +68,24 @@
                 <packaging.config.order>4</packaging.config.order>
             </properties>
         </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>axis-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>5</packaging.config.order>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>client-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>6</packaging.config.order>
+            </properties>
+        </dependency>
 
         <!-- parent config -->
         <dependency>

Modified: geronimo/branches/1.1/configs/jmxdebug-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/jmxdebug-tomcat/project.xml?rev=395993&r1=395992&r2=395993&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/jmxdebug-tomcat/project.xml (original)
+++ geronimo/branches/1.1/configs/jmxdebug-tomcat/project.xml Fri Apr 21 13:16:55 2006
@@ -68,6 +68,24 @@
                 <packaging.config.order>4</packaging.config.order>
             </properties>
         </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>axis-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>5</packaging.config.order>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>client-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>6</packaging.config.order>
+            </properties>
+        </dependency>
 
         <!-- parent config -->
         <dependency>

Modified: geronimo/branches/1.1/configs/jsp-examples-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/jsp-examples-jetty/project.xml?rev=395993&r1=395992&r2=395993&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/jsp-examples-jetty/project.xml (original)
+++ geronimo/branches/1.1/configs/jsp-examples-jetty/project.xml Fri Apr 21 13:16:55 2006
@@ -68,6 +68,24 @@
                 <packaging.config.order>4</packaging.config.order>
             </properties>
         </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>axis-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>5</packaging.config.order>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>client-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>6</packaging.config.order>
+            </properties>
+        </dependency>
 
         <!-- parent config -->
         <dependency>

Modified: geronimo/branches/1.1/configs/jsp-examples-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/jsp-examples-tomcat/project.xml?rev=395993&r1=395992&r2=395993&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/jsp-examples-tomcat/project.xml (original)
+++ geronimo/branches/1.1/configs/jsp-examples-tomcat/project.xml Fri Apr 21 13:16:55 2006
@@ -68,6 +68,24 @@
                 <packaging.config.order>4</packaging.config.order>
             </properties>
         </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>axis-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>5</packaging.config.order>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>client-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>6</packaging.config.order>
+            </properties>
+        </dependency>
 
         <!-- parent config -->
         <dependency>

Modified: geronimo/branches/1.1/configs/ldap-demo-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/ldap-demo-jetty/project.xml?rev=395993&r1=395992&r2=395993&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/ldap-demo-jetty/project.xml (original)
+++ geronimo/branches/1.1/configs/ldap-demo-jetty/project.xml Fri Apr 21 13:16:55 2006
@@ -68,6 +68,24 @@
                 <packaging.config.order>4</packaging.config.order>
             </properties>
         </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>axis-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>5</packaging.config.order>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>client-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>6</packaging.config.order>
+            </properties>
+        </dependency>
 
         <!-- parent config -->
         <dependency>

Modified: geronimo/branches/1.1/configs/ldap-demo-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/ldap-demo-tomcat/project.xml?rev=395993&r1=395992&r2=395993&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/ldap-demo-tomcat/project.xml (original)
+++ geronimo/branches/1.1/configs/ldap-demo-tomcat/project.xml Fri Apr 21 13:16:55 2006
@@ -68,6 +68,24 @@
                 <packaging.config.order>4</packaging.config.order>
             </properties>
         </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>axis-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>5</packaging.config.order>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>client-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>6</packaging.config.order>
+            </properties>
+        </dependency>
          
         <!-- parent config -->
         <dependency>

Modified: geronimo/branches/1.1/configs/openejb-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/openejb-deployer/src/plan/plan.xml?rev=395993&r1=395992&r2=395993&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/openejb-deployer/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/openejb-deployer/src/plan/plan.xml Fri Apr 21 13:16:55 2006
@@ -26,9 +26,14 @@
         <reference name="WebServiceLinkTemplate">
             <name>WebServiceEJBLinkTemplate</name>
         </reference>
-        <reference name="WebServiceBuilder">
-            <name>WebServiceBuilder</name>
-        </reference>
+        <references name="WebServiceBuilder">
+            <pattern>
+                <name>WebServiceBuilder</name>
+            </pattern>
+            <pattern>
+                <name>UnavailableWebServiceBuilder</name>
+            </pattern>
+        </references>
         <xml-attribute name="defaultEnvironment">
             <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <dependencies>

Modified: geronimo/branches/1.1/configs/remote-deploy-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/remote-deploy-jetty/project.xml?rev=395993&r1=395992&r2=395993&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/remote-deploy-jetty/project.xml (original)
+++ geronimo/branches/1.1/configs/remote-deploy-jetty/project.xml Fri Apr 21 13:16:55 2006
@@ -74,6 +74,24 @@
                 <packaging.config.order>4</packaging.config.order>
             </properties>
         </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>axis-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>5</packaging.config.order>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>client-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>6</packaging.config.order>
+            </properties>
+        </dependency>
 
 
         <dependency>

Modified: geronimo/branches/1.1/configs/remote-deploy-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/remote-deploy-tomcat/project.xml?rev=395993&r1=395992&r2=395993&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/remote-deploy-tomcat/project.xml (original)
+++ geronimo/branches/1.1/configs/remote-deploy-tomcat/project.xml Fri Apr 21 13:16:55 2006
@@ -74,6 +74,24 @@
                 <packaging.config.order>4</packaging.config.order>
             </properties>
         </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>axis-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>5</packaging.config.order>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>client-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>6</packaging.config.order>
+            </properties>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>

Modified: geronimo/branches/1.1/configs/servlets-examples-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/servlets-examples-jetty/project.xml?rev=395993&r1=395992&r2=395993&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/servlets-examples-jetty/project.xml (original)
+++ geronimo/branches/1.1/configs/servlets-examples-jetty/project.xml Fri Apr 21 13:16:55 2006
@@ -68,6 +68,24 @@
                 <packaging.config.order>4</packaging.config.order>
             </properties>
         </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>axis-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>5</packaging.config.order>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>client-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>6</packaging.config.order>
+            </properties>
+        </dependency>
 
         <!-- parent config -->
         <dependency>

Modified: geronimo/branches/1.1/configs/servlets-examples-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/servlets-examples-tomcat/project.xml?rev=395993&r1=395992&r2=395993&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/servlets-examples-tomcat/project.xml (original)
+++ geronimo/branches/1.1/configs/servlets-examples-tomcat/project.xml Fri Apr 21 13:16:55 2006
@@ -68,6 +68,24 @@
                 <packaging.config.order>4</packaging.config.order>
             </properties>
         </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>axis-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>5</packaging.config.order>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>client-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>6</packaging.config.order>
+            </properties>
+        </dependency>
 
         <!-- parent config -->
         <dependency>

Modified: geronimo/branches/1.1/configs/system-database/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/system-database/project.xml?rev=395993&r1=395992&r2=395993&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/system-database/project.xml (original)
+++ geronimo/branches/1.1/configs/system-database/project.xml Fri Apr 21 13:16:55 2006
@@ -50,6 +50,33 @@
                 <packaging.config.order>2</packaging.config.order>
             </properties>
         </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>client-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>3</packaging.config.order>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>openejb-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>4</packaging.config.order>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>axis-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>5</packaging.config.order>
+            </properties>
+        </dependency>
 
         <!-- parent config -->
         <dependency>
@@ -68,11 +95,6 @@
             <artifactId>tranql-connector-derby-embed-xa</artifactId>
             <version>${tranql_vendors_version}</version>
             <type>rar</type>
-<!--
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-            </properties>
--->
         </dependency>
 
         <!--TODO these are also in j2ee-server config.   why ?? -->

Modified: geronimo/branches/1.1/configs/tomcat-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/tomcat-deployer/src/plan/plan.xml?rev=395993&r1=395992&r2=395993&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/tomcat-deployer/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/tomcat-deployer/src/plan/plan.xml Fri Apr 21 13:16:55 2006
@@ -23,9 +23,14 @@
     <gbean name="TomcatWebBuilder" class="org.apache.geronimo.tomcat.deployment.TomcatModuleBuilder">
         <attribute name="defaultContextPriorityClassloader">false</attribute>
         <attribute name="tomcatContainerName">?name=TomcatWebContainer</attribute>
-        <reference name="WebServiceBuilder">
-            <name>WebServiceBuilder</name>
-        </reference>
+        <references name="WebServiceBuilder">
+            <pattern>
+                <name>WebServiceBuilder</name>
+            </pattern>
+            <pattern>
+                <name>UnavailableWebServiceBuilder</name>
+            </pattern>
+        </references>
         <xml-attribute name="defaultEnvironment">
             <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <dependencies>

Modified: geronimo/branches/1.1/configs/uddi-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/uddi-jetty/project.xml?rev=395993&r1=395992&r2=395993&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/uddi-jetty/project.xml (original)
+++ geronimo/branches/1.1/configs/uddi-jetty/project.xml Fri Apr 21 13:16:55 2006
@@ -68,6 +68,24 @@
                 <packaging.config.order>4</packaging.config.order>
             </properties>
         </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>axis-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>5</packaging.config.order>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>client-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>6</packaging.config.order>
+            </properties>
+        </dependency>
 
         <!-- parent config -->
         <dependency>

Modified: geronimo/branches/1.1/configs/uddi-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/uddi-tomcat/project.xml?rev=395993&r1=395992&r2=395993&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/uddi-tomcat/project.xml (original)
+++ geronimo/branches/1.1/configs/uddi-tomcat/project.xml Fri Apr 21 13:16:55 2006
@@ -68,6 +68,24 @@
                 <packaging.config.order>4</packaging.config.order>
             </properties>
         </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>axis-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>5</packaging.config.order>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>client-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>6</packaging.config.order>
+            </properties>
+        </dependency>
 
         <!-- parent config should be j2ee-server?-->
         <dependency>

Modified: geronimo/branches/1.1/configs/welcome-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/welcome-jetty/project.xml?rev=395993&r1=395992&r2=395993&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/welcome-jetty/project.xml (original)
+++ geronimo/branches/1.1/configs/welcome-jetty/project.xml Fri Apr 21 13:16:55 2006
@@ -68,6 +68,24 @@
                 <packaging.config.order>4</packaging.config.order>
             </properties>
         </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>axis-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>5</packaging.config.order>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>client-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>6</packaging.config.order>
+            </properties>
+        </dependency>
 
         <!-- parent config -->
         <dependency>

Modified: geronimo/branches/1.1/configs/welcome-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/welcome-tomcat/project.xml?rev=395993&r1=395992&r2=395993&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/welcome-tomcat/project.xml (original)
+++ geronimo/branches/1.1/configs/welcome-tomcat/project.xml Fri Apr 21 13:16:55 2006
@@ -68,6 +68,24 @@
                 <packaging.config.order>4</packaging.config.order>
             </properties>
         </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>axis-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>5</packaging.config.order>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>client-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+            <properties>
+                <packaging.config.order>6</packaging.config.order>
+            </properties>
+        </dependency>
 
         <!-- parent config -->
         <dependency>

Modified: geronimo/branches/1.1/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/maven.xml?rev=395993&r1=395992&r2=395993&view=diff
==============================================================================
--- geronimo/branches/1.1/maven.xml (original)
+++ geronimo/branches/1.1/maven.xml Fri Apr 21 13:16:55 2006
@@ -49,7 +49,7 @@
     </goal>
 
     <goal name="new3">
-        <maven:reactor basedir="${basedir}" includes="applications/*/project.xml,applications/daytrader/derby/project.xml"
+        <maven:reactor basedir="${basedir}" includes="applications/*/project.xml,applications/daytrader/*/project.xml"
             excludes="" goals="multiproject:install-callback" banner="applications" ignoreFailures="false" />
     </goal>
 

Modified: geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnavailableEJBReferenceBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnavailableEJBReferenceBuilder.java?rev=395993&r1=395992&r2=395993&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnavailableEJBReferenceBuilder.java (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnavailableEJBReferenceBuilder.java Fri Apr 21 13:16:55 2006
@@ -28,7 +28,7 @@
 import java.net.URI;
 
 /**
- * @version $Rev: 386000 $ $Date$
+ * @version $Rev:390932 $ $Date$
  */
 public class UnavailableEJBReferenceBuilder implements EJBReferenceBuilder {
 
@@ -37,7 +37,7 @@
     }
 
     public Object createHandleDelegateReference() throws DeploymentException {
-        throw new DeploymentException("EJB references are unavailable in this configuration");
+        return null;
     }
 
     public Reference createEJBRemoteRef(String refName, Configuration configuration, String name, String requiredModule, String optionalModule, Artifact targetConfigId, AbstractNameQuery query, boolean isSession, String home, String remote) throws DeploymentException {



Mime
View raw message