You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dw...@apache.org on 2007/05/17 22:24:53 UTC
svn commit: r539104 - in /geronimo/server/trunk:
assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml
assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml
configs/connector-deployer/src/plan/plan.xml
Author: dwoods
Date: Thu May 17 13:24:52 2007
New Revision: 539104
URL: http://svn.apache.org/viewvc?view=rev&rev=539104
Log:
GERONIMO-3155 Minimal assemblies have doubled in size due to Yoko being included. Added the xml-attribute and resource back into the connector-deployer, but removed the included yoko depend, so the minimal assemblies don't need yoko (they still need the yoko specs for the ORB class.) Added the xml-attribute to the JEE5 server configs as an attribute with the Yoko depend.
Modified:
geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml
geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.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=539104&r1=539103&r2=539104
==============================================================================
--- 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 Thu May 17 13:24:52 2007
@@ -138,12 +138,38 @@
<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>
+ <attribute name="defaultEnvironment">
+ <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>j2ee-corba-yoko</artifactId>
+ <type>car</type>
+ </dependency>
+ </dependencies>
+ </environment>
+ </attribute>
</gbean>
<gbean name="AdminObjectRefBuilder">
<attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
</gbean>
</module>
+
+ <gbean name="ClientResourceRefBuilder">
+ <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
+ <attribute name="defaultEnvironment">
+ <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>client-corba-yoko</artifactId>
+ <type>car</type>
+ </dependency>
+ </dependencies>
+ </environment>
+ </attribute>
+ </gbean>
<module name="org.apache.geronimo.configs/persistence-jpa10-deployer/${version}/car"/>
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=539104&r1=539103&r2=539104
==============================================================================
--- 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 Thu May 17 13:24:52 2007
@@ -145,12 +145,38 @@
<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>
+ <attribute name="defaultEnvironment">
+ <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>j2ee-corba-yoko</artifactId>
+ <type>car</type>
+ </dependency>
+ </dependencies>
+ </environment>
+ </attribute>
</gbean>
<gbean name="AdminObjectRefBuilder">
<attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
</gbean>
</module>
+
+ <gbean name="ClientResourceRefBuilder">
+ <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
+ <attribute name="defaultEnvironment">
+ <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>client-corba-yoko</artifactId>
+ <type>car</type>
+ </dependency>
+ </dependencies>
+ </environment>
+ </attribute>
+ </gbean>
<module name="org.apache.geronimo.configs/persistence-jpa10-deployer/${version}/car"/>
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=539104&r1=539103&r2=539104
==============================================================================
--- geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml Thu May 17 13:24:52 2007
@@ -50,6 +50,12 @@
<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}"/>
+ </xml-attribute>
+ <reference name="CorbaGBeanNameSource">
+ <name>EARBuilder</name>
+ </reference>
</gbean>
<gbean name="AdminObjectRefBuilder" class="org.apache.geronimo.connector.deployment.AdminObjectRefBuilder">
@@ -81,6 +87,12 @@
<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}"/>
+ </xml-attribute>
+ <reference name="CorbaGBeanNameSource">
+ <name>AppClientBuilder</name>
+ </reference>
</gbean>
<gbean name="ClientAdminObjectRefBuilder" class="org.apache.geronimo.connector.deployment.AdminObjectRefBuilder">