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 2007/06/13 06:52:08 UTC
svn commit: r546735 - in /geronimo/sandbox/portals:
pluto-portal/src/main/webapp/WEB-INF/geronimo-web.xml
pluto-testsuite/src/main/webapp/WEB-INF/geronimo-web.xml
Author: pmcmahan
Date: Tue Jun 12 21:52:07 2007
New Revision: 546735
URL: http://svn.apache.org/viewvc?view=rev&rev=546735
Log:
make pluto-portal and pluto-testsuite deployment plans compatible with both jetty and tomcat
Modified:
geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/geronimo-web.xml
geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/WEB-INF/geronimo-web.xml
Modified: geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/geronimo-web.xml?view=diff&rev=546735&r1=546734&r2=546735
==============================================================================
--- geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/geronimo-web.xml Tue Jun 12 21:52:07 2007
@@ -17,7 +17,7 @@
<!-- $Rev: 525563 $ $Date: 2007-04-04 13:37:08 -0400 (Wed, 04 Apr 2007) $ -->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2"
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2"
xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
<dep:environment>
@@ -49,6 +49,11 @@
</dep:environment>
<context-root>/pluto</context-root>
- <cross-context/>
+
+ <container-config>
+ <tomcat xmlns="http://geronimo.apache.org/xml/ns/web/tomcat/config-1.0">
+ <cross-context/>
+ </tomcat>
+ </container-config>
</web-app>
Modified: geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/WEB-INF/geronimo-web.xml?view=diff&rev=546735&r1=546734&r2=546735
==============================================================================
--- geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/WEB-INF/geronimo-web.xml Tue Jun 12 21:52:07 2007
@@ -17,7 +17,7 @@
<!-- $Rev: 525563 $ $Date: 2007-04-04 13:37:08 -0400 (Wed, 04 Apr 2007) $ -->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2"
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2"
xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
<dep:environment>
@@ -42,6 +42,11 @@
</dep:environment>
<context-root>/testsuite</context-root>
- <cross-context/>
+
+ <container-config>
+ <tomcat xmlns="http://geronimo.apache.org/xml/ns/web/tomcat/config-1.0">
+ <cross-context/>
+ </tomcat>
+ </container-config>
</web-app>