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/16 21:45:11 UTC
svn commit: r538697 - in /geronimo/server/trunk/assemblies:
geronimo-jetty6-jee5/src/main/resources/var/config/config.xml
geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml
Author: dwoods
Date: Wed May 16 12:45:10 2007
New Revision: 538697
URL: http://svn.apache.org/viewvc?view=rev&rev=538697
Log:
GERONIMO-3155 Apply more of the geronimo-3138-fixbuild.patch. Still need to setup the defaultEnvironment some how...
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
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=538697&r1=538696&r2=538697
==============================================================================
--- 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 12:45:10 2007
@@ -138,44 +138,11 @@
<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>
<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=538697&r1=538696&r2=538697
==============================================================================
--- 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 12:45:10 2007
@@ -145,44 +145,11 @@
<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>
<module name="org.apache.geronimo.configs/persistence-jpa10-deployer/${version}/car"/>