geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r424130 - in /geronimo/sandbox/svkmerge/m2migration/modules/jetty/src: ./ test-resources/deployables/war1/WEB-INF/geronimo-web.xml test-resources/deployables/war3/WEB-INF/geronimo-web.xml
Date Thu, 20 Jul 2006 23:45:29 GMT
Author: jdillon
Date: Thu Jul 20 16:45:29 2006
New Revision: 424130

URL: http://svn.apache.org/viewvc?rev=424130&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/jetty/src/   (props changed)
    geronimo/sandbox/svkmerge/m2migration/modules/jetty/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml
    geronimo/sandbox/svkmerge/m2migration/modules/jetty/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml

Propchange: geronimo/sandbox/svkmerge/m2migration/modules/jetty/src/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Thu Jul 20 16:45:29 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/jetty/src:424119

Modified: geronimo/sandbox/svkmerge/m2migration/modules/jetty/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/jetty/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml?rev=424130&r1=424129&r2=424130&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/jetty/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml
(original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/jetty/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml
Thu Jul 20 16:45:29 2006
@@ -17,9 +17,20 @@
 -->
 
 <jetty:web-app
-    xmlns:jetty="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0"
-    configId="org/apache/geronimo/jetty/Test"
+    xmlns:jetty="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1"
     >
+    <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+      <dep:moduleId>
+        <dep:groupId>geronimo</dep:groupId>
+        <dep:artifactId>jetty-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>
+
     <jetty:context-root>/test</jetty:context-root>
     <jetty:context-priority-classloader>false</jetty:context-priority-classloader>
     <!--

Modified: geronimo/sandbox/svkmerge/m2migration/modules/jetty/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/jetty/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml?rev=424130&r1=424129&r2=424130&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/jetty/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml
(original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/jetty/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml
Thu Jul 20 16:45:29 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>jetty-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>



Mime
View raw message