You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by js...@apache.org on 2005/07/25 13:29:35 UTC
svn commit: r224712 - in /geronimo/branches/v1_0_M4-QA: applications/demo/src/webapp/WEB-INF/ applications/jmxdebug/src/webapp/WEB-INF/ modules/console-web/src/webapp/WEB-INF/

Author: jsisson
Date: Mon Jul 25 04:29:07 2005
New Revision: 224712

URL: http://svn.apache.org/viewcvs?rev=224712&view=rev
Log:
GERONIMO-809 Fix remaining web applications that use geronimo-jetty.xml to use geronimo-web.xml, as it caused problems with Tomcat (since the geronimo-jetty file was never read, therefore web apps were being loaded with the wrong configIds etc.).

Added:
    geronimo/branches/v1_0_M4-QA/applications/demo/src/webapp/WEB-INF/geronimo-web.xml
      - copied, changed from r224696, geronimo/branches/v1_0_M4-QA/applications/demo/src/webapp/WEB-INF/geronimo-jetty.xml
    geronimo/branches/v1_0_M4-QA/applications/jmxdebug/src/webapp/WEB-INF/geronimo-web.xml
      - copied, changed from r224696, geronimo/branches/v1_0_M4-QA/applications/jmxdebug/src/webapp/WEB-INF/geronimo-jetty.xml
    geronimo/branches/v1_0_M4-QA/modules/console-web/src/webapp/WEB-INF/geronimo-web.xml
      - copied, changed from r224696, geronimo/branches/v1_0_M4-QA/modules/console-web/src/webapp/WEB-INF/geronimo-jetty.xml
Removed:
    geronimo/branches/v1_0_M4-QA/applications/demo/src/webapp/WEB-INF/geronimo-jetty.xml
    geronimo/branches/v1_0_M4-QA/applications/jmxdebug/src/webapp/WEB-INF/geronimo-jetty.xml
    geronimo/branches/v1_0_M4-QA/applications/jmxdebug/src/webapp/WEB-INF/geronimo-tomcat.xml
    geronimo/branches/v1_0_M4-QA/modules/console-web/src/webapp/WEB-INF/geronimo-jetty.xml

Copied: geronimo/branches/v1_0_M4-QA/applications/demo/src/webapp/WEB-INF/geronimo-web.xml (from r224696, geronimo/branches/v1_0_M4-QA/applications/demo/src/webapp/WEB-INF/geronimo-jetty.xml)
URL: http://svn.apache.org/viewcvs/geronimo/branches/v1_0_M4-QA/applications/demo/src/webapp/WEB-INF/geronimo-web.xml?p2=geronimo/branches/v1_0_M4-QA/applications/demo/src/webapp/WEB-INF/geronimo-web.xml&p1=geronimo/branches/v1_0_M4-QA/applications/demo/src/webapp/WEB-INF/geronimo-jetty.xml&r1=224696&r2=224712&rev=224712&view=diff
==============================================================================
--- geronimo/branches/v1_0_M4-QA/applications/demo/src/webapp/WEB-INF/geronimo-jetty.xml (original)
+++ geronimo/branches/v1_0_M4-QA/applications/demo/src/webapp/WEB-INF/geronimo-web.xml Mon Jul 25 04:29:07 2005
@@ -17,7 +17,7 @@
 -->
 
 <web-app
-    xmlns="http://geronimo.apache.org/xml/ns/web/jetty"
+    xmlns="http://geronimo.apache.org/xml/ns/web"
     xmlns:sec="http://geronimo.apache.org/xml/ns/security"
     configId="org/apache/geronimo/Demo"
     parentId="org/apache/geronimo/Secure">

Copied: geronimo/branches/v1_0_M4-QA/applications/jmxdebug/src/webapp/WEB-INF/geronimo-web.xml (from r224696, geronimo/branches/v1_0_M4-QA/applications/jmxdebug/src/webapp/WEB-INF/geronimo-jetty.xml)
URL: http://svn.apache.org/viewcvs/geronimo/branches/v1_0_M4-QA/applications/jmxdebug/src/webapp/WEB-INF/geronimo-web.xml?p2=geronimo/branches/v1_0_M4-QA/applications/jmxdebug/src/webapp/WEB-INF/geronimo-web.xml&p1=geronimo/branches/v1_0_M4-QA/applications/jmxdebug/src/webapp/WEB-INF/geronimo-jetty.xml&r1=224696&r2=224712&rev=224712&view=diff
==============================================================================
--- geronimo/branches/v1_0_M4-QA/applications/jmxdebug/src/webapp/WEB-INF/geronimo-jetty.xml (original)
+++ geronimo/branches/v1_0_M4-QA/applications/jmxdebug/src/webapp/WEB-INF/geronimo-web.xml Mon Jul 25 04:29:07 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app
-    xmlns="http://geronimo.apache.org/xml/ns/web/jetty"
+    xmlns="http://geronimo.apache.org/xml/ns/web"
     configId="org/apache/geronimo/DebugConsole"
     parentId="org/apache/geronimo/Server"
     >

Copied: geronimo/branches/v1_0_M4-QA/modules/console-web/src/webapp/WEB-INF/geronimo-web.xml (from r224696, geronimo/branches/v1_0_M4-QA/modules/console-web/src/webapp/WEB-INF/geronimo-jetty.xml)
URL: http://svn.apache.org/viewcvs/geronimo/branches/v1_0_M4-QA/modules/console-web/src/webapp/WEB-INF/geronimo-web.xml?p2=geronimo/branches/v1_0_M4-QA/modules/console-web/src/webapp/WEB-INF/geronimo-web.xml&p1=geronimo/branches/v1_0_M4-QA/modules/console-web/src/webapp/WEB-INF/geronimo-jetty.xml&r1=224696&r2=224712&rev=224712&view=diff
==============================================================================
--- geronimo/branches/v1_0_M4-QA/modules/console-web/src/webapp/WEB-INF/geronimo-jetty.xml (original)
+++ geronimo/branches/v1_0_M4-QA/modules/console-web/src/webapp/WEB-INF/geronimo-web.xml Mon Jul 25 04:29:07 2005
@@ -17,7 +17,7 @@
 -->
   
 <web-app
-    xmlns="http://geronimo.apache.org/xml/ns/web/jetty"
+    xmlns="http://geronimo.apache.org/xml/ns/web"
     configId="org/apache/geronimo/DebugConsole"
     parentId="org/apache/geronimo/Server"
     >