You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/07/21 01:43:41 UTC
svn commit: r424126 - in
/geronimo/sandbox/svkmerge/m2migration/modules/tomcat/src: ./
test-resources/deployables/war1/WEB-INF/geronimo-web.xml
test-resources/deployables/war3/WEB-INF/geronimo-web.xml
Author: jdillon
Date: Thu Jul 20 16:43:40 2006
New Revision: 424126
URL: http://svn.apache.org/viewvc?rev=424126&view=rev
Log:
r493@Bliss (orig r424119): jdillon | 2006-07-20 16:40:58 -0700
r473@Bliss (orig r424015): sppatel | 2006-07-20 11:23:38 -0700
GERONIMO-1492
Modified:
geronimo/sandbox/svkmerge/m2migration/modules/tomcat/src/ (props changed)
geronimo/sandbox/svkmerge/m2migration/modules/tomcat/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml
geronimo/sandbox/svkmerge/m2migration/modules/tomcat/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml
Propchange: geronimo/sandbox/svkmerge/m2migration/modules/tomcat/src/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Thu Jul 20 16:43:40 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/tomcat/src:424119
Modified: geronimo/sandbox/svkmerge/m2migration/modules/tomcat/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/tomcat/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml?rev=424126&r1=424125&r2=424126&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/tomcat/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/tomcat/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml Thu Jul 20 16:43:40 2006
@@ -16,10 +16,18 @@
limitations under the License.
-->
-<tomcat:web-app
- xmlns:tomcat="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0"
- configId="org/apache/geronimo/tomcat/Test"
- >
+<tomcat:web-app xmlns:tomcat="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1">
+ <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+ <dep:moduleId>
+ <dep:groupId>geronimo</dep:groupId>
+ <dep:artifactId>tomcat-test</dep:artifactId>
+ <dep:version>1.0</dep:version>
+ <dep:type>war</dep:type>
+ </dep:moduleId>
+ <dep:dependencies/>
+ <dep:hidden-classes/>
+ <dep:non-overridable-classes/>
+ </dep:environment>
<tomcat:context-root>/test</tomcat:context-root>
<tomcat:context-priority-classloader>false</tomcat:context-priority-classloader>
<!--
Modified: geronimo/sandbox/svkmerge/m2migration/modules/tomcat/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/tomcat/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml?rev=424126&r1=424125&r2=424126&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/tomcat/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/tomcat/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml Thu Jul 20 16:43:40 2006
@@ -17,9 +17,19 @@
-->
<web-app
- xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0"
- xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1"
- configId="org/apache/geronimo/test">
+ xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1"
+ xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1">
+ <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+ <dep:moduleId>
+ <dep:groupId>geronimo</dep:groupId>
+ <dep:artifactId>tomcat-test</dep:artifactId>
+ <dep:version>1.0</dep:version>
+ <dep:type>war</dep:type>
+ </dep:moduleId>
+ <dep:dependencies/>
+ <dep:hidden-classes/>
+ <dep:non-overridable-classes/>
+ </dep:environment>
<context-root>/test</context-root>
<context-priority-classloader>false</context-priority-classloader>