You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by pm...@apache.org on 2006/12/06 21:16:40 UTC
svn commit: r483208 -
/geronimo/server/trunk/assemblies/geronimo-tomcat-jee5/src/main/var/config/config.xml
Author: pmcmahan
Date: Wed Dec 6 12:16:39 2006
New Revision: 483208
URL: http://svn.apache.org/viewvc?view=rev&rev=483208
Log:
GERONIMO-2628 upgrade tomcat to 6.0.2 beta
synching config.xml from tomcat-jee assembly with config.xml from jetty6-jee assembly.
second part of checkin
Modified:
geronimo/server/trunk/assemblies/geronimo-tomcat-jee5/src/main/var/config/config.xml
Modified: geronimo/server/trunk/assemblies/geronimo-tomcat-jee5/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat-jee5/src/main/var/config/config.xml?view=diff&rev=483208&r1=483207&r2=483208
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat-jee5/src/main/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat-jee5/src/main/var/config/config.xml Wed Dec 6 12:16:39 2006
@@ -16,6 +16,8 @@
limitations under the License.
-->
+<!-- $Rev$ $Date$ -->
+
<!-- ======================================================== -->
<!-- Warning - This XML file is re-generated by Geronimo when -->
<!-- changes are made to Geronimo's configuration, therefore -->
@@ -48,14 +50,15 @@
<attribute name="port">${PlanRemoteLoginPort}</attribute>
</gbean>
<gbean name="JMXService">
- <attribute name="protocol">rmi</attribute>
- <attribute name="host">${PlanServerHostname}</attribute>
- <attribute name="port">${PlanJMXPort}</attribute>
- <attribute name="urlPath">/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>
</module>
<module name="org.apache.geronimo.configs/axis/${version}/car"/>
+ <module name="org.apache.geronimo.configs/cxf/${version}/car" load="false"/>
<module name="org.apache.geronimo.configs/openejb/${version}/car">
<gbean name="EJBNetworkService">
@@ -101,7 +104,6 @@
</gbean>
<gbean name="FirstValve" load="false"></gbean>
-->
-
<gbean name="TomcatResources"/>
<gbean name="TomcatWebConnector">
<attribute name="host">${PlanServerHostname}</attribute>
@@ -129,11 +131,23 @@
<gbean name="WebBuilder">
<attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2</attribute>
</gbean>
+ <gbean name="EnvironmentEntryBuilder">
+ <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
+ </gbean>
</module>
- <module name="org.apache.geronimo.configs/connector-deployer/${version}/car"/>
+ <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>
+ </gbean>
- <module name="org.apache.geronimo.configs/persistence-jpa10-deployer/${version}/car" condition="java.is1_5"/>
+ <gbean name="AdminObjectRefBuilder">
+ <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
+ </gbean>
+
+ </module>
+
+ <module name="org.apache.geronimo.configs/persistence-jpa10-deployer/${version}/car"/>
<module name="org.apache.geronimo.configs/openejb-deployer/${version}/car">
<gbean name="EJBBuilder">
@@ -146,16 +160,44 @@
<name>PersistenceUnitBuilder</name>
</pattern>
</reference>
- </gbean>
- </module>
+ <reference name="WebServiceBuilder">
+ <pattern>
+ <name>CXFBuilder</name>
+ </pattern>
+ <pattern>
+ <name>WebServiceBuilder</name>
+ </pattern>
+ </reference>
+ </gbean>
+ <gbean name="OpenEjbRemoteRefBuilder">
+ <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
+ </gbean>
- <module name="org.apache.geronimo.configs/openejb-corba-deployer/${version}/car" load="false"/>
+ <gbean name="OpenEjbClientRemoteRefBuilder">
+ <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
+ </gbean>
- <module name="org.apache.geronimo.configs/client-deployer/${version}/car"/>
+ <gbean name="OpenEjbLocalRefBuilder">
+ <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
+ </gbean>
- <module name="org.apache.geronimo.configs/axis-deployer/${version}/car"/>
+ </module>
+
+ <module name="org.apache.geronimo.configs/client-deployer/${version}/car">
+ </module>
+
+ <module name="org.apache.geronimo.configs/cxf-deployer/${version}/car" load="false">
+ <!--<gbean name="CXFServiceRefBuilder">-->
+ <!--<attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>-->
+ <!--</gbean>-->
+ </module>
+ <module name="org.apache.geronimo.configs/axis-deployer/${version}/car">
+ <gbean name="AxisServiceRefBuilder">
+ <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
+ </gbean>
+ </module>
- <module name="org.apache.geronimo.configs/javamail/${version}/car" load="false">
+ <module name="org.apache.geronimo.configs/javamail/${version}/car">
<gbean name="SMTPTransport">
<attribute name="host">localhost</attribute>
<attribute name="port">25</attribute>