FYI, I removed the directories added in this commit. See
URL: http://svn.apache.org/viewcvs?rev=400273&view=rev Log: GERONIMO-1640 Delete directories that were accidentally added in previous checkin. John [EMAIL PROTECTED] wrote:
Author: kevan Date: Fri May 5 21:03:29 2006 New Revision: 400233 URL: http://svn.apache.org/viewcvs?rev=400233&view=rev Log: GERONIMO-1640 Upgrade Tomcat version to 5.5.15. For compliant jsp operation, upgrade required that Jasper config option 'development' be configured to false. So, involved a bit more than simple version change... Added: geronimo/branches/1.1/applications/daytrader/core/ geronimo/branches/1.1/applications/daytrader/ear/ geronimo/branches/1.1/applications/daytrader/ejb/ geronimo/branches/1.1/applications/daytrader/streamer/ geronimo/branches/1.1/applications/daytrader/web/ geronimo/branches/1.1/applications/daytrader/wsappclient/ geronimo/branches/1.1/applications/jmxdebug/ geronimo/branches/1.1/modules/interop/ Modified: geronimo/branches/1.1/configs/jetty-deployer/src/plan/plan.xml geronimo/branches/1.1/etc/explicit_versions.properties geronimo/branches/1.1/etc/project.properties geronimo/branches/1.1/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java geronimo/branches/1.1/modules/tomcat/src/resources/META-INF/geronimo-tomcat/var/catalina/conf/web.xml Modified: geronimo/branches/1.1/configs/jetty-deployer/src/plan/plan.xml URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/jetty-deployer/src/plan/plan.xml?rev=400233&r1=400232&r2=400233&view=diff ============================================================================== --- geronimo/branches/1.1/configs/jetty-deployer/src/plan/plan.xml (original) +++ geronimo/branches/1.1/configs/jetty-deployer/src/plan/plan.xml Fri May 5 21:03:29 2006 @@ -93,8 +93,9 @@ <attribute name="servletClass">org.apache.jasper.servlet.JspServlet</attribute> <attribute name="loadOnStartup">0</attribute> <attribute name="initParams"> - logVerbosityLevel=DEBUG + development=false fork=false + logVerbosityLevel=DEBUG xpoweredBy=false</attribute> <attribute name="servletMappings">*.jsp,*.jspf,*.jspx,*.xsp</attribute> </gbean> Modified: geronimo/branches/1.1/etc/explicit_versions.properties URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/etc/explicit_versions.properties?rev=400233&r1=400232&r2=400233&view=diff ============================================================================== --- geronimo/branches/1.1/etc/explicit_versions.properties (original) +++ geronimo/branches/1.1/etc/explicit_versions.properties Fri May 5 21:03:29 2006 @@ -45,7 +45,7 @@ howl///=0.1.11 #security: hsqldb///=1.7.2.2 -jasper///=5.5.12 +jasper///=5.5.15 javacc///=2.1 jdbm///=0.20-dev jdom///=1.0 @@ -73,8 +73,8 @@ standard_taglibs///=1.1.1 stax/stax//jar=1.1.1-dev stax/stax_api//jar=1.0 -tomcat_ajp///=5.5.9 -tomcat///=5.5.9 +tomcat_ajp///=5.5.15 +tomcat///=5.5.15 tomcat_servlet_examples///=5.5.15 tomcat_jsp_examples///=5.5.15 wadi///=2.0M1 Modified: geronimo/branches/1.1/etc/project.properties URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/etc/project.properties?rev=400233&r1=400232&r2=400233&view=diff ============================================================================== --- geronimo/branches/1.1/etc/project.properties (original) +++ geronimo/branches/1.1/etc/project.properties Fri May 5 21:03:29 2006 @@ -155,7 +155,7 @@ howl_version=0.1.11 #security: hsqldb_version=1.7.2.2 -jasper_version=5.5.12 +jasper_version=5.5.15 javacc_version=2.1 jdbm_version=0.20-dev jdom_version=1.0 @@ -183,8 +183,8 @@ standard_taglibs_version=1.1.1 stax_version=1.1.1-dev stax_api_version=1.0 -tomcat_ajp_version=5.5.9 -tomcat_version=5.5.9 +tomcat_ajp_version=5.5.15 +tomcat_version=5.5.15 tomcat_servlet_examples_version=5.5.15 tomcat_jsp_examples_version=5.5.15 wadi_version=2.0M1 Modified: geronimo/branches/1.1/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java?rev=400233&r1=400232&r2=400233&view=diff ============================================================================== --- geronimo/branches/1.1/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java (original) +++ geronimo/branches/1.1/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java Fri May 5 21:03:29 2006 @@ -840,6 +840,7 @@ String servletName = servletType.getServletName().getStringValue().trim(); AbstractName servletAbstractName = earContext.getNaming().createChildName(webModuleName, servletName, NameFactory.SERVLET); GBeanData servletData; + Map initParams = new HashMap(); if (servletType.isSetServletClass()) { String servletClassName = servletType.getServletClass().getStringValue().trim(); Class servletClass; @@ -872,6 +873,7 @@ servletData.setAttribute("jspFile", servletType.getJspFile().getStringValue().trim()); //TODO MAKE THIS CONFIGURABLE!!! Jetty uses the servlet mapping set up from the default-web.xml servletData.setAttribute("servletClass", "org.apache.jasper.servlet.JspServlet"); + initParams.put("development", "false"); } else { throw new DeploymentException("Neither servlet class nor jsp file is set for " + servletName); // TODO identify web app in message } @@ -886,7 +888,6 @@ //TODO in init param setter, add classpath if jspFile is not null. servletData.setReferencePattern("JettyServletRegistration", webModuleName); servletData.setAttribute("servletName", servletName); - Map initParams = new HashMap(); ParamValueType[] initParamArray = servletType.getInitParamArray(); for (int j = 0; j < initParamArray.length; j++) { ParamValueType paramValueType = initParamArray[j]; Modified: geronimo/branches/1.1/modules/tomcat/src/resources/META-INF/geronimo-tomcat/var/catalina/conf/web.xml URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/tomcat/src/resources/META-INF/geronimo-tomcat/var/catalina/conf/web.xml?rev=400233&r1=400232&r2=400233&view=diff ============================================================================== --- geronimo/branches/1.1/modules/tomcat/src/resources/META-INF/geronimo-tomcat/var/catalina/conf/web.xml (original) +++ geronimo/branches/1.1/modules/tomcat/src/resources/META-INF/geronimo-tomcat/var/catalina/conf/web.xml Fri May 5 21:03:29 2006 @@ -187,6 +187,10 @@ <servlet-name>jsp</servlet-name> <servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class> <init-param> + <param-name>development</param-name> + <param-value>false</param-value> + </init-param> + <init-param> <param-name>fork</param-name> <param-value>false</param-value> </init-param>
