geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jsis...@apache.org
Subject svn commit: r225194 - in /geronimo/trunk: applications/demo/src/webapp/WEB-INF/ applications/jmxdebug/src/webapp/WEB-INF/ modules/console-web/src/webapp/WEB-INF/
Date Mon, 25 Jul 2005 22:43:15 GMT
Author: jsisson
Date: Mon Jul 25 15:43:00 2005
New Revision: 225194

URL: http://svn.apache.org/viewcvs?rev=225194&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/trunk/applications/demo/src/webapp/WEB-INF/geronimo-web.xml
      - copied, changed from r224691, geronimo/trunk/applications/demo/src/webapp/WEB-INF/geronimo-jetty.xml
    geronimo/trunk/applications/jmxdebug/src/webapp/WEB-INF/geronimo-web.xml
      - copied, changed from r224691, geronimo/trunk/applications/jmxdebug/src/webapp/WEB-INF/geronimo-jetty.xml
    geronimo/trunk/modules/console-web/src/webapp/WEB-INF/geronimo-web.xml
      - copied, changed from r224691, geronimo/trunk/modules/console-web/src/webapp/WEB-INF/geronimo-jetty.xml
Removed:
    geronimo/trunk/applications/demo/src/webapp/WEB-INF/geronimo-jetty.xml
    geronimo/trunk/applications/jmxdebug/src/webapp/WEB-INF/geronimo-jetty.xml
    geronimo/trunk/applications/jmxdebug/src/webapp/WEB-INF/geronimo-tomcat.xml
    geronimo/trunk/modules/console-web/src/webapp/WEB-INF/geronimo-jetty.xml

Copied: geronimo/trunk/applications/demo/src/webapp/WEB-INF/geronimo-web.xml (from r224691,
geronimo/trunk/applications/demo/src/webapp/WEB-INF/geronimo-jetty.xml)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/demo/src/webapp/WEB-INF/geronimo-web.xml?p2=geronimo/trunk/applications/demo/src/webapp/WEB-INF/geronimo-web.xml&p1=geronimo/trunk/applications/demo/src/webapp/WEB-INF/geronimo-jetty.xml&r1=224691&r2=225194&rev=225194&view=diff
==============================================================================
--- geronimo/trunk/applications/demo/src/webapp/WEB-INF/geronimo-jetty.xml (original)
+++ geronimo/trunk/applications/demo/src/webapp/WEB-INF/geronimo-web.xml Mon Jul 25 15:43:00
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/trunk/applications/jmxdebug/src/webapp/WEB-INF/geronimo-web.xml (from r224691,
geronimo/trunk/applications/jmxdebug/src/webapp/WEB-INF/geronimo-jetty.xml)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/jmxdebug/src/webapp/WEB-INF/geronimo-web.xml?p2=geronimo/trunk/applications/jmxdebug/src/webapp/WEB-INF/geronimo-web.xml&p1=geronimo/trunk/applications/jmxdebug/src/webapp/WEB-INF/geronimo-jetty.xml&r1=224691&r2=225194&rev=225194&view=diff
==============================================================================
--- geronimo/trunk/applications/jmxdebug/src/webapp/WEB-INF/geronimo-jetty.xml (original)
+++ geronimo/trunk/applications/jmxdebug/src/webapp/WEB-INF/geronimo-web.xml Mon Jul 25 15:43:00
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/trunk/modules/console-web/src/webapp/WEB-INF/geronimo-web.xml (from r224691,
geronimo/trunk/modules/console-web/src/webapp/WEB-INF/geronimo-jetty.xml)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/console-web/src/webapp/WEB-INF/geronimo-web.xml?p2=geronimo/trunk/modules/console-web/src/webapp/WEB-INF/geronimo-web.xml&p1=geronimo/trunk/modules/console-web/src/webapp/WEB-INF/geronimo-jetty.xml&r1=224691&r2=225194&rev=225194&view=diff
==============================================================================
--- geronimo/trunk/modules/console-web/src/webapp/WEB-INF/geronimo-jetty.xml (original)
+++ geronimo/trunk/modules/console-web/src/webapp/WEB-INF/geronimo-web.xml Mon Jul 25 15:43:00
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"
     >



Mime
View raw message