Return-Path: 
 <scm-return-19711-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 74291 invoked from network); 16 May 2007 14:29:09 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 16 May 2007 14:29:09 -0000
Received: (qmail 95183 invoked by uid 500); 16 May 2007 14:29:10 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 95109 invoked by uid 500); 16 May 2007 14:29:10 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 95087 invoked by uid 99); 16 May 2007 14:29:09 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 May 2007 07:29:09 -0700
X-ASF-Spam-Status: No, hits=-99.5 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 May 2007 07:29:02 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id B27F51A9838; Wed, 16 May 2007 07:28:42 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r538613 - in /geronimo/server/trunk:
 assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/
 assemblies/geronimo-jetty6-minimal/
 assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/
 assemblies/geronimo-tomcat6-minimal/ con...
Date: Wed, 16 May 2007 14:28:42 -0000
To: scm@geronimo.apache.org
From: dwoods@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070516142842.B27F51A9838@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: dwoods
Date: Wed May 16 07:28:41 2007
New Revision: 538613

URL: http://svn.apache.org/viewvc?view=rev&rev=538613
Log:
GERONIMO-3155 The geronimo-tomcat6-minimal assembly has doubled in size, due to the j2ee-corba-yoko CAR being pulled in.  I verified the minimal Tomcat assembly starts and the Servlet-Examples deploy and work.

Modified:
    geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml
    geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml?view=diff&rev=538613&r1=538612&r2=538613
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml Wed May 16 07:28:41 2007
@@ -138,10 +138,42 @@
     <module name="org.apache.geronimo.configs/connector-deployer/${version}/car">
         <gbean name="ResourceRefBuilder">
             <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
+            <xml-attribute name="defaultEnvironment">
+                <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.apache.geronimo.configs</groupId>
+                            <artifactId>j2ee-corba-yoko</artifactId>
+                            <type>car</type>
+                        </dependency>
+                    </dependencies>
+                </environment>
+            </xml-attribute>
+            <reference name="CorbaGBeanNameSource">
+                <name>EARBuilder</name>
+            </reference>
         </gbean>
 
         <gbean name="AdminObjectRefBuilder">
             <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
+        </gbean>
+
+        <gbean name="ClientResourceRefBuilder">
+            <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
+            <xml-attribute name="defaultEnvironment">
+                <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.apache.geronimo.configs</groupId>
+                            <artifactId>client-corba-yoko</artifactId>
+                            <type>car</type>
+                        </dependency>
+                    </dependencies>
+                </environment>
+            </xml-attribute>
+            <reference name="CorbaGBeanNameSource">
+                <name>AppClientBuilder</name>
+            </reference>
         </gbean>
 
     </module>

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml?view=diff&rev=538613&r1=538612&r2=538613
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml Wed May 16 07:28:41 2007
@@ -104,13 +104,6 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-corba-yoko</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jetty6-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml?view=diff&rev=538613&r1=538612&r2=538613
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml Wed May 16 07:28:41 2007
@@ -145,10 +145,42 @@
     <module name="org.apache.geronimo.configs/connector-deployer/${version}/car">
         <gbean name="ResourceRefBuilder">
             <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
+            <xml-attribute name="defaultEnvironment">
+                <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.apache.geronimo.configs</groupId>
+                            <artifactId>j2ee-corba-yoko</artifactId>
+                            <type>car</type>
+                        </dependency>
+                    </dependencies>
+                </environment>
+            </xml-attribute>
+            <reference name="CorbaGBeanNameSource">
+                <name>EARBuilder</name>
+            </reference>
         </gbean>
 
         <gbean name="AdminObjectRefBuilder">
             <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
+        </gbean>
+
+        <gbean name="ClientResourceRefBuilder">
+            <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
+            <xml-attribute name="defaultEnvironment">
+                <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.apache.geronimo.configs</groupId>
+                            <artifactId>client-corba-yoko</artifactId>
+                            <type>car</type>
+                        </dependency>
+                    </dependencies>
+                </environment>
+            </xml-attribute>
+            <reference name="CorbaGBeanNameSource">
+                <name>AppClientBuilder</name>
+            </reference>
         </gbean>
 
     </module>

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml?view=diff&rev=538613&r1=538612&r2=538613
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml Wed May 16 07:28:41 2007
@@ -110,13 +110,6 @@
         </dependency>
 
         <dependency>
-             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-corba-yoko</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>remote-deploy-tomcat</artifactId>
             <version>${version}</version>

Modified: geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml?view=diff&rev=538613&r1=538612&r2=538613
==============================================================================
--- geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml Wed May 16 07:28:41 2007
@@ -50,21 +50,8 @@
 
     <gbean name="ResourceRefBuilder" class="org.apache.geronimo.connector.deployment.ResourceRefBuilder">
         <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
-        <xml-attribute name="defaultEnvironment">
-            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.geronimo.configs</groupId>
-                        <artifactId>j2ee-corba-yoko</artifactId>
-                        <type>car</type>
-                    </dependency>
-                </dependencies>
-            </environment>
-        </xml-attribute>
-        <reference name="CorbaGBeanNameSource">
-            <name>EARBuilder</name>
-        </reference>
     </gbean>
+
     <gbean name="AdminObjectRefBuilder" class="org.apache.geronimo.connector.deployment.AdminObjectRefBuilder">
         <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
     </gbean>
@@ -94,21 +81,8 @@
 
     <gbean name="ClientResourceRefBuilder" class="org.apache.geronimo.connector.deployment.ResourceRefBuilder">
         <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
-        <xml-attribute name="defaultEnvironment">
-            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.geronimo.configs</groupId>
-                        <artifactId>client-corba-yoko</artifactId>
-                        <type>car</type>
-                    </dependency>
-                </dependencies>
-            </environment>
-        </xml-attribute>
-        <reference name="CorbaGBeanNameSource">
-            <name>AppClientBuilder</name>
-        </reference>
     </gbean>
+
     <gbean name="ClientAdminObjectRefBuilder" class="org.apache.geronimo.connector.deployment.AdminObjectRefBuilder">
         <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
     </gbean>