You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2009/03/04 18:23:26 UTC
svn commit: r750081 - in /geronimo/server/branches/2.1:
plugins/jetty/jetty6-deployer/src/main/plan/ plugins/jetty/jetty6/
plugins/jetty/jetty6/src/main/plan/
plugins/tomcat/tomcat6-deployer/src/main/plan/ plugins/tomcat/tomcat6/
plugins/tomcat/tomcat6...
Author: djencks
Date: Wed Mar 4 17:23:23 2009
New Revision: 750081
URL: http://svn.apache.org/viewvc?rev=750081&view=rev
Log:
GERONIMO-4554 revert failed solution attempt
Modified:
geronimo/server/branches/2.1/plugins/jetty/jetty6-deployer/src/main/plan/plan.xml
geronimo/server/branches/2.1/plugins/jetty/jetty6/pom.xml
geronimo/server/branches/2.1/plugins/jetty/jetty6/src/main/plan/plan.xml
geronimo/server/branches/2.1/plugins/tomcat/tomcat6-deployer/src/main/plan/plan.xml
geronimo/server/branches/2.1/plugins/tomcat/tomcat6/pom.xml
geronimo/server/branches/2.1/plugins/tomcat/tomcat6/src/main/plan/plan.xml
geronimo/server/branches/2.1/testsuite/web-testsuite/test-jetty/src/main/webapp/WEB-INF/geronimo-web.xml
geronimo/server/branches/2.1/testsuite/web-testsuite/test-tomcat/src/main/webapp/WEB-INF/geronimo-web.xml
Modified: geronimo/server/branches/2.1/plugins/jetty/jetty6-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/jetty/jetty6-deployer/src/main/plan/plan.xml?rev=750081&r1=750080&r2=750081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/jetty/jetty6-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.1/plugins/jetty/jetty6-deployer/src/main/plan/plan.xml Wed Mar 4 17:23:23 2009
@@ -23,7 +23,7 @@
<gbean name="JettyWebBuilder" class="org.apache.geronimo.jetty6.deployment.JettyModuleBuilder">
<attribute name="defaultSessionTimeoutSeconds">1800</attribute>
<attribute name="defaultWelcomeFiles">index.html,index.htm,index.jsp</attribute>
- <attribute name="jettyContainerObjectName">?name=WebContainer</attribute>
+ <attribute name="jettyContainerObjectName">?name=JettyWebContainer</attribute>
<attribute name="defaultLocaleEncodingMappings">
ar=ISO-8859-6
be=ISO-8859-5
Modified: geronimo/server/branches/2.1/plugins/jetty/jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/jetty/jetty6/pom.xml?rev=750081&r1=750080&r2=750081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/jetty/jetty6/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/jetty/jetty6/pom.xml Wed Mar 4 17:23:23 2009
@@ -178,7 +178,7 @@
<config-substitution key="AJPPort">8009</config-substitution>
<config-substitution key="HTTPSPort">8443</config-substitution>
<config-substitution key="ServerHostname">0.0.0.0</config-substitution>
- <config-substitution key="webcontainer">WebContainer</config-substitution>
+ <config-substitution key="webcontainer">JettyWebContainer</config-substitution>
<config-substitution key="webcontainerName">jetty6</config-substitution>
</plugin-artifact>
</instance>
Modified: geronimo/server/branches/2.1/plugins/jetty/jetty6/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/jetty/jetty6/src/main/plan/plan.xml?rev=750081&r1=750080&r2=750081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/jetty/jetty6/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.1/plugins/jetty/jetty6/src/main/plan/plan.xml Wed Mar 4 17:23:23 2009
@@ -39,7 +39,7 @@
</gbean>
<!-- default WAR container using Jetty -->
- <gbean name="WebContainer" class="org.apache.geronimo.jetty6.JettyContainerImpl">
+ <gbean name="JettyWebContainer" class="org.apache.geronimo.jetty6.JettyContainerImpl">
<attribute name="jettyHome">var/jetty</attribute>
<reference name="WebManager">
<name>JettyWebManager</name>
@@ -51,7 +51,7 @@
<gbean name="JettyRequestLog" class="org.apache.geronimo.jetty6.requestlog.NCSARequestLog">
<reference name="JettyContainer">
- <name>WebContainer</name>
+ <name>JettyWebContainer</name>
</reference>
<reference name="ServerInfo">
<name>ServerInfo</name>
@@ -66,7 +66,7 @@
<attribute name="port">${PlanHTTPPort}</attribute>
<attribute name="headerBufferSizeBytes">8192</attribute>
<reference name="JettyContainer">
- <name>WebContainer</name>
+ <name>JettyWebContainer</name>
</reference>
<reference name="ThreadPool">
<name>DefaultThreadPool</name>
@@ -78,7 +78,7 @@
<attribute name="host">${PlanServerHostname}</attribute>
<attribute name="port">${PlanAJPPort}</attribute>
<reference name="JettyContainer">
- <name>WebContainer</name>
+ <name>JettyWebContainer</name>
</reference>
<reference name="ThreadPool">
<name>DefaultThreadPool</name>
@@ -99,7 +99,7 @@
<attribute name="secureProtocol">TLS</attribute>
<attribute name="maxThreads">50</attribute>
<reference name="JettyContainer">
- <name>WebContainer</name>
+ <name>JettyWebContainer</name>
</reference>
<reference name="ThreadPool">
<name>DefaultThreadPool</name>
@@ -122,7 +122,7 @@
<attribute name="secureProtocol">TLS</attribute>
<attribute name="maxThreads">50</attribute>
<reference name="JettyContainer">
- <name>WebContainer</name>
+ <name>JettyWebContainer</name>
</reference>
<reference name="ThreadPool">
<name>DefaultThreadPool</name>
Modified: geronimo/server/branches/2.1/plugins/tomcat/tomcat6-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/tomcat/tomcat6-deployer/src/main/plan/plan.xml?rev=750081&r1=750080&r2=750081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/tomcat/tomcat6-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.1/plugins/tomcat/tomcat6-deployer/src/main/plan/plan.xml Wed Mar 4 17:23:23 2009
@@ -21,7 +21,7 @@
<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
<gbean name="TomcatWebBuilder" class="org.apache.geronimo.tomcat.deployment.TomcatModuleBuilder">
- <attribute name="tomcatContainerName">?name=WebContainer</attribute>
+ <attribute name="tomcatContainerName">?name=TomcatWebContainer</attribute>
<reference name="SecurityBuilders">
<name>SecurityBuilder</name>
</reference>
Modified: geronimo/server/branches/2.1/plugins/tomcat/tomcat6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/tomcat/tomcat6/pom.xml?rev=750081&r1=750080&r2=750081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/tomcat/tomcat6/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/tomcat/tomcat6/pom.xml Wed Mar 4 17:23:23 2009
@@ -196,7 +196,7 @@
<config-substitution key="HTTPSPort">8443</config-substitution>
<config-substitution key="ServerHostname">0.0.0.0</config-substitution>
<config-substitution key="WebConnectorConTimeout">20000</config-substitution>
- <config-substitution key="webcontainer">WebContainer</config-substitution>
+ <config-substitution key="webcontainer">TomcatWebContainer</config-substitution>
<config-substitution key="webcontainerName">tomcat6</config-substitution>
</plugin-artifact>
</instance>
Modified: geronimo/server/branches/2.1/plugins/tomcat/tomcat6/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/tomcat/tomcat6/src/main/plan/plan.xml?rev=750081&r1=750080&r2=750081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/tomcat/tomcat6/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.1/plugins/tomcat/tomcat6/src/main/plan/plan.xml Wed Mar 4 17:23:23 2009
@@ -34,7 +34,7 @@
<!-- The following is the equivalent of the server.xml file, but done with GBeans -->
<!-- The TomcatContainer/Service -->
- <gbean name="WebContainer" class="org.apache.geronimo.tomcat.TomcatContainer">
+ <gbean name="TomcatWebContainer" class="org.apache.geronimo.tomcat.TomcatContainer">
<attribute name="catalinaHome">var/catalina</attribute>
<!--<attribute name="applicationListeners">org.apache.myfaces.webapp.StartupServletContextListener</attribute>-->
<reference name="EngineGBean">
@@ -69,7 +69,7 @@
<attribute name="connectionTimeout">20000</attribute>
<attribute name="disableUploadTimeout">true</attribute>
<reference name="TomcatContainer">
- <name>WebContainer</name>
+ <name>TomcatWebContainer</name>
</reference>
<reference name="ServerInfo">
<name>ServerInfo</name>
@@ -85,7 +85,7 @@
<attribute name="enableLookups">false</attribute>
<attribute name="redirectPort">${PlanHTTPSPort}</attribute>
<reference name="TomcatContainer">
- <name>WebContainer</name>
+ <name>TomcatWebContainer</name>
</reference>
<reference name="ServerInfo">
<name>ServerInfo</name>
@@ -113,7 +113,7 @@
<attribute name="keystorePass">secret</attribute>
<attribute name="keystoreType">JKS</attribute>
<reference name="TomcatContainer">
- <name>WebContainer</name>
+ <name>TomcatWebContainer</name>
</reference>
<reference name="ServerInfo">
<name>ServerInfo</name>
Modified: geronimo/server/branches/2.1/testsuite/web-testsuite/test-jetty/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/web-testsuite/test-jetty/src/main/webapp/WEB-INF/geronimo-web.xml?rev=750081&r1=750080&r2=750081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/web-testsuite/test-jetty/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/server/branches/2.1/testsuite/web-testsuite/test-jetty/src/main/webapp/WEB-INF/geronimo-web.xml Wed Mar 4 17:23:23 2009
@@ -28,11 +28,11 @@
</sys:environment>
<context-root>/JettyWeb</context-root>
<web-container>
- <gbean-link>WebContainer</gbean-link>
+ <gbean-link>JettyWebContainer</gbean-link>
</web-container>
<container-config>
<jetty xmlns="http://geronimo.apache.org/xml/ns/web/jetty/config-1.0">
<virtual-host>testhost.com</virtual-host>
</jetty>
</container-config>
-</web-app>
+</web-app>
\ No newline at end of file
Modified: geronimo/server/branches/2.1/testsuite/web-testsuite/test-tomcat/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/web-testsuite/test-tomcat/src/main/webapp/WEB-INF/geronimo-web.xml?rev=750081&r1=750080&r2=750081&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/web-testsuite/test-tomcat/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/server/branches/2.1/testsuite/web-testsuite/test-tomcat/src/main/webapp/WEB-INF/geronimo-web.xml Wed Mar 4 17:23:23 2009
@@ -31,7 +31,7 @@
</sys:environment>
<context-root>/TomcatWeb</context-root>
<web-container>
- <gbean-link>WebContainer</gbean-link>
+ <gbean-link>TomcatWebContainer</gbean-link>
</web-container>
<container-config>
<tomcat xmlns="http://geronimo.apache.org/xml/ns/web/tomcat/config-1.0">
@@ -79,4 +79,4 @@
roleClassNames=org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal
</attribute>
</gbean>
-</web-app>
+</web-app>
\ No newline at end of file