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:04 UTC
svn commit: r424125 - in
/geronimo/sandbox/svkmerge/m2migration/modules/web-builder/src: ./
test-resources/deployables/war1/WEB-INF/ test-resources/plans/
Author: jdillon
Date: Thu Jul 20 16:43:03 2006
New Revision: 424125
URL: http://svn.apache.org/viewvc?rev=424125&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/web-builder/src/ (props changed)
geronimo/sandbox/svkmerge/m2migration/modules/web-builder/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml
geronimo/sandbox/svkmerge/m2migration/modules/web-builder/src/test-resources/plans/tomcat-post.xml
geronimo/sandbox/svkmerge/m2migration/modules/web-builder/src/test-resources/plans/tomcat-pre.xml
geronimo/sandbox/svkmerge/m2migration/modules/web-builder/src/test-resources/plans/tomcat-pre2.xml
geronimo/sandbox/svkmerge/m2migration/modules/web-builder/src/test-resources/plans/tomcat-pre3.xml
Propchange: geronimo/sandbox/svkmerge/m2migration/modules/web-builder/src/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Thu Jul 20 16:43:03 2006
@@ -1 +1 @@
-13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/web-builder/src:421368
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/web-builder/src:424119
Modified: geronimo/sandbox/svkmerge/m2migration/modules/web-builder/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/web-builder/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml?rev=424125&r1=424124&r2=424125&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/web-builder/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/web-builder/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml Thu Jul 20 16:43:03 2006
@@ -17,9 +17,20 @@
-->
<tomcat:web-app
- xmlns:tomcat="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0"
- configId="org/apache/geronimo/tomcat/Test"
+ 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/web-builder/src/test-resources/plans/tomcat-post.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/web-builder/src/test-resources/plans/tomcat-post.xml?rev=424125&r1=424124&r2=424125&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/web-builder/src/test-resources/plans/tomcat-post.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/web-builder/src/test-resources/plans/tomcat-post.xml Thu Jul 20 16:43:03 2006
@@ -7,7 +7,12 @@
<dep:artifactId>testclient</dep:artifactId>
<dep:version>1</dep:version>
</dep:moduleId>
-
+ <dep:dependencies>
+ <dep:dependency>
+ <dep:groupId>geronimo</dep:groupId>
+ <dep:artifactId>j2ee-system</dep:artifactId>
+ </dep:dependency>
+ </dep:dependencies>
</dep:environment>
<tom:context-priority-classloader>false</tom:context-priority-classloader>
<tom:cross-context/>
@@ -38,7 +43,6 @@
</lc:login-config>
</dep:xml-reference>
<dep:reference name="ServerInfo">
- <dep:module>org/apache/geronimo/System</dep:module>
<dep:name>ServerInfo</dep:name>
</dep:reference>
<dep:reference name="LoginService">
Modified: geronimo/sandbox/svkmerge/m2migration/modules/web-builder/src/test-resources/plans/tomcat-pre.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/web-builder/src/test-resources/plans/tomcat-pre.xml?rev=424125&r1=424124&r2=424125&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/web-builder/src/test-resources/plans/tomcat-pre.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/web-builder/src/test-resources/plans/tomcat-pre.xml Thu Jul 20 16:43:03 2006
@@ -7,7 +7,12 @@
<dep:artifactId>testclient</dep:artifactId>
<dep:version>1</dep:version>
</dep:moduleId>
-
+ <dep:dependencies>
+ <dep:dependency>
+ <dep:groupId>geronimo</dep:groupId>
+ <dep:artifactId>j2ee-system</dep:artifactId>
+ </dep:dependency>
+ </dep:dependencies>
</dep:environment>
<context-priority-classloader>false</context-priority-classloader>
<container-config>
@@ -42,7 +47,6 @@
</lc:login-config>
</xml-reference>
<reference name="ServerInfo">
- <module>org/apache/geronimo/System</module>
<name>ServerInfo</name>
</reference>
<reference name="LoginService">
Modified: geronimo/sandbox/svkmerge/m2migration/modules/web-builder/src/test-resources/plans/tomcat-pre2.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/web-builder/src/test-resources/plans/tomcat-pre2.xml?rev=424125&r1=424124&r2=424125&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/web-builder/src/test-resources/plans/tomcat-pre2.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/web-builder/src/test-resources/plans/tomcat-pre2.xml Thu Jul 20 16:43:03 2006
@@ -7,6 +7,12 @@
<dep:artifactId>testclient</dep:artifactId>
<dep:version>1</dep:version>
</dep:moduleId>
+ <dep:dependencies>
+ <dep:dependency>
+ <dep:groupId>geronimo</dep:groupId>
+ <dep:artifactId>j2ee-system</dep:artifactId>
+ </dep:dependency>
+ </dep:dependencies>
</dep:environment>
<context-priority-classloader>false</context-priority-classloader>
<container-config>
@@ -41,7 +47,6 @@
</lc:login-config>
</xml-reference>
<reference name="ServerInfo">
- <module>org/apache/geronimo/System</module>
<name>ServerInfo</name>
</reference>
<reference name="LoginService">
Modified: geronimo/sandbox/svkmerge/m2migration/modules/web-builder/src/test-resources/plans/tomcat-pre3.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/web-builder/src/test-resources/plans/tomcat-pre3.xml?rev=424125&r1=424124&r2=424125&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/web-builder/src/test-resources/plans/tomcat-pre3.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/web-builder/src/test-resources/plans/tomcat-pre3.xml Thu Jul 20 16:43:03 2006
@@ -7,6 +7,12 @@
<dep:artifactId>testclient</dep:artifactId>
<dep:version>1</dep:version>
</dep:moduleId>
+ <dep:dependencies>
+ <dep:dependency>
+ <dep:groupId>geronimo</dep:groupId>
+ <dep:artifactId>j2ee-system</dep:artifactId>
+ </dep:dependency>
+ </dep:dependencies>
</dep:environment>
<context-priority-classloader>false</context-priority-classloader>
<container-config>
@@ -41,7 +47,6 @@
</lc:login-config>
</xml-reference>
<reference name="ServerInfo">
- <module>org/apache/geronimo/System</module>
<name>ServerInfo</name>
</reference>
<reference name="LoginService">