Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 11876 invoked from network); 21 Sep 2004 22:36:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 21 Sep 2004 22:36:29 -0000 Received: (qmail 86470 invoked by uid 500); 21 Sep 2004 22:36:28 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 86407 invoked by uid 500); 21 Sep 2004 22:36:27 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Reply-To: dev@geronimo.apache.org Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 86394 invoked by uid 99); 21 Sep 2004 22:36:27 -0000 X-ASF-Spam-Status: No, hits=-10.0 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Tue, 21 Sep 2004 15:36:25 -0700 Received: (qmail 11848 invoked by uid 65534); 21 Sep 2004 22:36:23 -0000 Date: 21 Sep 2004 22:36:23 -0000 Message-ID: <20040921223623.11842.qmail@minotaur.apache.org> From: jlaskowski@apache.org To: scm@geronimo.apache.org Subject: svn commit: rev 47004 - in geronimo/trunk: etc modules/tomcat modules/tomcat/src/java/org/apache/geronimo/tomcat modules/tomcat/src/plan modules/tomcat/src/var specs/jsp X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: jlaskowski Date: Tue Sep 21 15:36:21 2004 New Revision: 47004 Added: geronimo/trunk/modules/tomcat/src/var/web.xml (contents, props changed) Modified: geronimo/trunk/etc/version-info.ent geronimo/trunk/modules/tomcat/maven.xml geronimo/trunk/modules/tomcat/project.xml geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatGBean.java geronimo/trunk/modules/tomcat/src/plan/tomcat-plan.xml geronimo/trunk/modules/tomcat/src/var/server.xml geronimo/trunk/specs/jsp/project.xml Log: Apache Tomcat/5.0.28 finally works in Apache Geronimo Modified: geronimo/trunk/etc/version-info.ent ============================================================================== --- geronimo/trunk/etc/version-info.ent (original) +++ geronimo/trunk/etc/version-info.ent Tue Sep 21 15:36:21 2004 @@ -26,7 +26,7 @@ - + Modified: geronimo/trunk/modules/tomcat/maven.xml ============================================================================== --- geronimo/trunk/modules/tomcat/maven.xml (original) +++ geronimo/trunk/modules/tomcat/maven.xml Tue Sep 21 15:36:21 2004 @@ -61,16 +61,9 @@ --> - - - - - + + + + - + + Deploying Apache Tomcat configuration tomcat + jasper-compiler + &tomcat-version; + http://jakarta.apache.org/tomcat/ + + true + + + + tomcat + jasper-runtime + &tomcat-version; + http://jakarta.apache.org/tomcat/ + + true + + + + tomcat tomcat-util &tomcat-version; http://jakarta.apache.org/tomcat/ @@ -106,6 +124,47 @@ + tomcat + naming-resources + &tomcat-version; + http://jakarta.apache.org/tomcat/ + + true + + + + tomcat + servlets-common + &tomcat-version; + http://jakarta.apache.org/tomcat/ + + true + + + + tomcat + servlets-default + &tomcat-version; + http://jakarta.apache.org/tomcat/ + + true + + + + tomcat + servlets-invoker + &tomcat-version; + http://jakarta.apache.org/tomcat/ + + true + + + + xerces + xercesImpl + &xerces-version; + + commons-beanutils commons-beanutils &commons-beanutils-version; @@ -128,6 +187,15 @@ commons-digester &commons-digester-version; http://jakarta.apache.org/commons/digester + + true + + + + commons-el + commons-el + &commons-el-version; + http://jakarta.apache.org/commons/el true Modified: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatGBean.java ============================================================================== --- geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatGBean.java (original) +++ geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatGBean.java Tue Sep 21 15:36:21 2004 @@ -97,6 +97,7 @@ shell.setConfig(catalinaConfig); } shell.setParentClassLoader(this.getClass().getClassLoader()); + shell.setUseNaming(false); shell.start(); } Modified: geronimo/trunk/modules/tomcat/src/plan/tomcat-plan.xml ============================================================================== --- geronimo/trunk/modules/tomcat/src/plan/tomcat-plan.xml (original) +++ geronimo/trunk/modules/tomcat/src/plan/tomcat-plan.xml Tue Sep 21 15:36:21 2004 @@ -16,6 +16,12 @@ tomcat/jars/catalina-5.0.28.jar + tomcat/jars/jasper-compiler-5.0.28.jar + + + tomcat/jars/jasper-runtime-5.0.28.jar + + tomcat/jars/tomcat-coyote-5.0.28.jar @@ -28,6 +34,18 @@ tomcat/jars/naming-common-5.0.28.jar + tomcat/jars/naming-resources-5.0.28.jar + + + tomcat/jars/servlets-common-5.0.28.jar + + + tomcat/jars/servlets-default-5.0.28.jar + + + tomcat/jars/servlets-invoker-5.0.28.jar + + commons-beanutils/jars/commons-beanutils-1.6.1.jar @@ -37,16 +55,19 @@ commons-digester/jars/commons-digester-1.6.jar - commons-modeler/jars/commons-modeler-1.1-dev.jar + commons-el/jars/commons-el-1.0.jar + + + commons-modeler/jars/commons-modeler-1.1.jar regexp/jars/regexp-1.3.jar - . - . - var/catalina/server.xml + var/catalina + var/catalina + conf/server.xml Modified: geronimo/trunk/modules/tomcat/src/var/server.xml ============================================================================== --- geronimo/trunk/modules/tomcat/src/var/server.xml (original) +++ geronimo/trunk/modules/tomcat/src/var/server.xml Tue Sep 21 15:36:21 2004 @@ -1,22 +1,22 @@ - - + + - - - - - - - - \ No newline at end of file + + + + + + + + + + Added: geronimo/trunk/modules/tomcat/src/var/web.xml ============================================================================== --- (empty file) +++ geronimo/trunk/modules/tomcat/src/var/web.xml Tue Sep 21 15:36:21 2004 @@ -0,0 +1,948 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + default + + org.apache.catalina.servlets.DefaultServlet + + + debug + 0 + + + listings + true + + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + jsp + org.apache.jasper.servlet.JspServlet + + fork + false + + + xpoweredBy + false + + 3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + default + / + + + + + + + + jsp + *.jsp + + + + jsp + *.jspx + + + + + + + + + + + + + + + + 30 + + + + + + + + + + + + abs + audio/x-mpeg + + + ai + application/postscript + + + aif + audio/x-aiff + + + aifc + audio/x-aiff + + + aiff + audio/x-aiff + + + aim + application/x-aim + + + art + image/x-jg + + + asf + video/x-ms-asf + + + asx + video/x-ms-asf + + + au + audio/basic + + + avi + video/x-msvideo + + + avx + video/x-rad-screenplay + + + bcpio + application/x-bcpio + + + bin + application/octet-stream + + + bmp + image/bmp + + + body + text/html + + + cdf + application/x-cdf + + + cer + application/x-x509-ca-cert + + + class + application/java + + + cpio + application/x-cpio + + + csh + application/x-csh + + + css + text/css + + + dib + image/bmp + + + doc + application/msword + + + dtd + text/plain + + + dv + video/x-dv + + + dvi + application/x-dvi + + + eps + application/postscript + + + etx + text/x-setext + + + exe + application/octet-stream + + + gif + image/gif + + + gtar + application/x-gtar + + + gz + application/x-gzip + + + hdf + application/x-hdf + + + hqx + application/mac-binhex40 + + + htc + text/x-component + + + htm + text/html + + + html + text/html + + + hqx + application/mac-binhex40 + + + ief + image/ief + + + jad + text/vnd.sun.j2me.app-descriptor + + + jar + application/java-archive + + + java + text/plain + + + jnlp + application/x-java-jnlp-file + + + jpe + image/jpeg + + + jpeg + image/jpeg + + + jpg + image/jpeg + + + js + text/javascript + + + jsf + text/plain + + + jspf + text/plain + + + kar + audio/x-midi + + + latex + application/x-latex + + + m3u + audio/x-mpegurl + + + mac + image/x-macpaint + + + man + application/x-troff-man + + + me + application/x-troff-me + + + mid + audio/x-midi + + + midi + audio/x-midi + + + mif + application/x-mif + + + mov + video/quicktime + + + movie + video/x-sgi-movie + + + mp1 + audio/x-mpeg + + + mp2 + audio/x-mpeg + + + mp3 + audio/x-mpeg + + + mpa + audio/x-mpeg + + + mpe + video/mpeg + + + mpeg + video/mpeg + + + mpega + audio/x-mpeg + + + mpg + video/mpeg + + + mpv2 + video/mpeg2 + + + ms + application/x-wais-source + + + nc + application/x-netcdf + + + oda + application/oda + + + pbm + image/x-portable-bitmap + + + pct + image/pict + + + pdf + application/pdf + + + pgm + image/x-portable-graymap + + + pic + image/pict + + + pict + image/pict + + + pls + audio/x-scpls + + + png + image/png + + + pnm + image/x-portable-anymap + + + pnt + image/x-macpaint + + + ppm + image/x-portable-pixmap + + + ppt + application/powerpoint + + + ps + application/postscript + + + psd + image/x-photoshop + + + qt + video/quicktime + + + qti + image/x-quicktime + + + qtif + image/x-quicktime + + + ras + image/x-cmu-raster + + + rgb + image/x-rgb + + + rm + application/vnd.rn-realmedia + + + roff + application/x-troff + + + rtf + application/rtf + + + rtx + text/richtext + + + sh + application/x-sh + + + shar + application/x-shar + + + smf + audio/x-midi + + + sit + application/x-stuffit + + + snd + audio/basic + + + src + application/x-wais-source + + + sv4cpio + application/x-sv4cpio + + + sv4crc + application/x-sv4crc + + + swf + application/x-shockwave-flash + + + t + application/x-troff + + + tar + application/x-tar + + + tcl + application/x-tcl + + + tex + application/x-tex + + + texi + application/x-texinfo + + + texinfo + application/x-texinfo + + + tif + image/tiff + + + tiff + image/tiff + + + tr + application/x-troff + + + tsv + text/tab-separated-values + + + txt + text/plain + + + ulw + audio/basic + + + ustar + application/x-ustar + + + xbm + image/x-xbitmap + + + xht + application/xhtml+xml + + + xhtml + application/xhtml+xml + + + xml + text/xml + + + xpm + image/x-xpixmap + + + xsl + text/xml + + + xwd + image/x-xwindowdump + + + wav + audio/x-wav + + + svg + image/svg+xml + + + svgz + image/svg+xml + + + vsd + application/x-visio + + + + wbmp + image/vnd.wap.wbmp + + + + wml + text/vnd.wap.wml + + + + wmlc + application/vnd.wap.wmlc + + + + wmls + text/vnd.wap.wmlscript + + + + wmlscriptc + application/vnd.wap.wmlscriptc + + + wrl + x-world/x-vrml + + + Z + application/x-compress + + + z + application/x-compress + + + zip + application/zip + + + + + + + + + + + + + + + + + index.html + index.htm + index.jsp + + + Modified: geronimo/trunk/specs/jsp/project.xml ============================================================================== --- geronimo/trunk/specs/jsp/project.xml (original) +++ geronimo/trunk/specs/jsp/project.xml Tue Sep 21 15:36:21 2004 @@ -72,6 +72,17 @@ jsp_2_0.xsd + + + ${basedir}/src/schema + javax/servlet/resources + + web-jsptaglibrary_2_0.xsd + +