geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r950880 - in /geronimo/server/branches/3.0-M1: ./ plugins/tomcat/geronimo-tomcat7-clustering-wadi/src/main/java/org/apache/geronimo/tomcat/cluster/ plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/ plugins/tomcat/ger...
Date Thu, 03 Jun 2010 05:31:09 GMT
Author: xuhaihong
Date: Thu Jun  3 05:31:09 2010
New Revision: 950880

URL: http://svn.apache.org/viewvc?rev=950880&view=rev
Log:
Use releaed Geronimo Tomcat 7.0.0.1

Modified:
    geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7-clustering-wadi/src/main/java/org/apache/geronimo/tomcat/cluster/JkRouter.java
    geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BaseGeronimoContextConfig.java
    geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java
    geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/EjbWsContextConfig.java
    geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java
    geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java
    geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/model/HostType.java
    geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
    geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7/src/test/java/org/apache/geronimo/tomcat/TomcatServerGBeanTest.java
    geronimo/server/branches/3.0-M1/plugins/tomcat/tomcat7/src/main/filtered-resources/tomcat-base/conf/web.xml
    geronimo/server/branches/3.0-M1/pom.xml

Modified: geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7-clustering-wadi/src/main/java/org/apache/geronimo/tomcat/cluster/JkRouter.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7-clustering-wadi/src/main/java/org/apache/geronimo/tomcat/cluster/JkRouter.java?rev=950880&r1=950879&r2=950880&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7-clustering-wadi/src/main/java/org/apache/geronimo/tomcat/cluster/JkRouter.java (original)
+++ geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7-clustering-wadi/src/main/java/org/apache/geronimo/tomcat/cluster/JkRouter.java Thu Jun  3 05:31:09 2010
@@ -22,10 +22,10 @@ package org.apache.geronimo.tomcat.clust
 import javax.servlet.http.Cookie;
 
 import org.apache.catalina.Context;
-import org.apache.catalina.Globals;
 import org.apache.catalina.Session;
 import org.apache.catalina.connector.Request;
 import org.apache.catalina.connector.Response;
+import org.apache.catalina.core.ApplicationSessionCookieConfig;
 
 /**
  * setNewSessionCookie contains code copied from
@@ -81,7 +81,7 @@ public class JkRouter implements Router 
     protected void setNewSessionCookie(Request request, Response response, String augmentedSessionID) {
         Context context = request.getContext();
         if (context.getCookies()) {
-            Cookie newCookie = new Cookie(Globals.SESSION_COOKIE_NAME, augmentedSessionID);
+            Cookie newCookie = new Cookie(ApplicationSessionCookieConfig.getSessionCookieName(request.getContext()), augmentedSessionID);
             newCookie.setMaxAge(-1);
             String contextPath = null;
             if (context != null && context.getSessionCookiePath() != null) {

Modified: geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BaseGeronimoContextConfig.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BaseGeronimoContextConfig.java?rev=950880&r1=950879&r2=950880&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BaseGeronimoContextConfig.java (original)
+++ geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BaseGeronimoContextConfig.java Thu Jun  3 05:31:09 2010
@@ -32,6 +32,7 @@ import javax.security.auth.message.confi
 import javax.security.auth.message.config.ServerAuthConfig;
 
 import org.apache.catalina.core.StandardContext;
+import org.apache.catalina.deploy.WebXml;
 import org.apache.catalina.startup.ContextConfig;
 import org.apache.geronimo.security.ContextManager;
 import org.apache.geronimo.security.jaas.ConfigurationFactory;
@@ -53,6 +54,7 @@ import org.apache.geronimo.tomcat.securi
 import org.apache.geronimo.tomcat.security.jacc.JACCAuthorizer;
 import org.apache.geronimo.tomcat.security.jacc.JACCRealm;
 import org.apache.geronimo.tomcat.security.jacc.JACCSecurityValve;
+import org.xml.sax.InputSource;
 
 /**
  * @version $Rev$ $Date$
@@ -60,7 +62,7 @@ import org.apache.geronimo.tomcat.securi
 public class BaseGeronimoContextConfig extends ContextConfig {
     private static final String MESSAGE_LAYER = "HttpServlet";
     private static final String POLICY_CONTEXT_ID_KEY = "javax.security.jacc.PolicyContext";
-        
+
     private static org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog(BaseGeronimoContextConfig.class);
 
     protected void configureSecurity(StandardContext geronimoContext, String policyContextId, ConfigurationFactory configurationFactory, Subject defaultSubject, String authMethod, String realmName, String loginPage, String errorPage) {
@@ -121,8 +123,15 @@ public class BaseGeronimoContextConfig e
 
         geronimoContext.setRealm(new JACCRealm());
     }
-    
+
     protected Authorizer createAuthorizer(AccessControlContext defaultAcc) {
         return new JACCAuthorizer(defaultAcc);
     }
+
+    @Override
+    protected void parseWebXml(InputSource source, WebXml dest, boolean fragment) {
+        super.parseWebXml(source, dest, fragment);
+        //Let's forbidden Tomcat scanning anything
+        dest.setMetadataComplete(true);
+    }
 }

Modified: geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java?rev=950880&r1=950879&r2=950880&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java (original)
+++ geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java Thu Jun  3 05:31:09 2010
@@ -246,7 +246,7 @@ public class BundleDirContext extends Ba
     }
 
     @Override
-    protected Object doLookup(String name) throws NamingException {
+    protected Object doLookup(String name) {
         name = getName(name);
         URL url = BundleUtils.getEntry(bundle, name);
         if (url == null) {

Modified: geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/EjbWsContextConfig.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/EjbWsContextConfig.java?rev=950880&r1=950879&r2=950880&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/EjbWsContextConfig.java (original)
+++ geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/EjbWsContextConfig.java Thu Jun  3 05:31:09 2010
@@ -64,8 +64,4 @@ public class EjbWsContextConfig extends 
         return new JACCEJBWebServiceAuthorizer(defaultAcc);
     }
 
-    @Override
-    protected void webConfig() {
-        //For a EJBWsContextConfig, we no need to scan web.xml/annotations
-    }
 }

Modified: geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java?rev=950880&r1=950879&r2=950880&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java (original)
+++ geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java Thu Jun  3 05:31:09 2010
@@ -123,6 +123,8 @@ public class GeronimoStandardContext ext
         // By default, we configure HttpOnly with false value, as it would cause DWR fail to work
         //On the runtime, Tomcat will determine the value based on the configurations in web.xml and context, so the users still have a chance to open it via web.xml
         setUseHttpOnly(false);
+        //Turn off  webXmlValidation, Geronimo should have done there in the deployment process
+        setXmlValidation(false);
     }
 
     public void setContextProperties(TomcatContext ctx) throws DeploymentException {
@@ -723,6 +725,10 @@ public class GeronimoStandardContext ext
     @Override
     public String getBasePath() {
         //TODO Override setDocBase with an empty block to avoid NullPointerException
-        return null;
+        if (getDocBase() == null) {
+            return null;
+        } else {
+            return super.getBasePath();
+        }
     }
 }

Modified: geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java?rev=950880&r1=950879&r2=950880&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java (original)
+++ geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java Thu Jun  3 05:31:09 2010
@@ -24,20 +24,20 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 
-import javax.management.ObjectName;
 import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
 import javax.security.auth.Subject;
 
 import org.apache.catalina.Container;
 import org.apache.catalina.Context;
 import org.apache.catalina.Engine;
+import org.apache.catalina.Lifecycle;
+import org.apache.catalina.LifecycleException;
 import org.apache.catalina.LifecycleListener;
 import org.apache.catalina.Service;
-import org.apache.catalina.LifecycleException;
-import org.apache.catalina.Lifecycle;
+import org.apache.catalina.connector.Connector;
 import org.apache.catalina.core.StandardService;
 import org.apache.catalina.startup.ContextConfig;
-import org.apache.catalina.connector.Connector;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.gbean.annotation.GBean;
 import org.apache.geronimo.gbean.annotation.ParamAttribute;
@@ -48,8 +48,8 @@ import org.apache.geronimo.j2ee.j2eeobje
 import org.apache.geronimo.management.geronimo.NetworkConnector;
 import org.apache.geronimo.management.geronimo.WebManager;
 import org.apache.geronimo.osgi.web.WebApplicationConstants;
-import org.apache.geronimo.security.jaas.ConfigurationFactory;
 import org.apache.geronimo.security.ContextManager;
+import org.apache.geronimo.security.jaas.ConfigurationFactory;
 import org.apache.geronimo.system.serverinfo.ServerInfo;
 import org.apache.geronimo.webservices.SoapHandler;
 import org.apache.geronimo.webservices.WebServiceContainer;
@@ -170,6 +170,7 @@ public class TomcatContainer implements 
             ObjectName objName = objectName == null ? null : ObjectName.getInstance(objectName);
             for (Container host : hosts) {
                 defaultContext = createContext("", classLoader, null);
+                defaultContext.setDocBase(docBase);
                 if (objName != null) {
                     defaultContext.setName(objName.getKeyProperty(NameFactory.J2EE_NAME));
                 }

Modified: geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/model/HostType.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/model/HostType.java?rev=950880&r1=950879&r2=950880&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/model/HostType.java (original)
+++ geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/model/HostType.java Thu Jun  3 05:31:09 2010
@@ -551,7 +551,7 @@ public class HostType {
         recipe.allow(Option.IGNORE_MISSING_PROPERTIES);
         Host host = (Host) recipe.create(cl);
         if (host instanceof Lifecycle) {
-            Lifecycle lifecycle = (Lifecycle) host;
+            Lifecycle lifecycle = host;
             for (ListenerType listenerType : getListener()) {
                 LifecycleListener listener = listenerType.getLifecycleListener(cl);
                 lifecycle.addLifecycleListener(listener);

Modified: geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java?rev=950880&r1=950879&r2=950880&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java (original)
+++ geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java Thu Jun  3 05:31:09 2010
@@ -246,5 +246,6 @@ public abstract class AbstractWebModuleT
     protected void setUp() throws Exception {
         super.setUp();
         System.setProperty("catalina.useNaming", "false");
+        System.setProperty("catalina.base", BASEDIR.getAbsolutePath());
     }
 }

Modified: geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7/src/test/java/org/apache/geronimo/tomcat/TomcatServerGBeanTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7/src/test/java/org/apache/geronimo/tomcat/TomcatServerGBeanTest.java?rev=950880&r1=950879&r2=950880&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7/src/test/java/org/apache/geronimo/tomcat/TomcatServerGBeanTest.java (original)
+++ geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7/src/test/java/org/apache/geronimo/tomcat/TomcatServerGBeanTest.java Thu Jun  3 05:31:09 2010
@@ -78,7 +78,7 @@ public class TomcatServerGBeanTest exten
         assertEquals(2, clusterType.getValve().size());
         assertEquals(2, clusterType.getClusterListener().size());
         ChannelType channelType = clusterType.getChannel();
-        assertEquals(3, channelType.getInterceptor().size());        
+        assertEquals(3, channelType.getInterceptor().size());
         assertEquals(1, channelType.getInterceptor().get(2).getMember().size());
     }
 
@@ -91,4 +91,11 @@ public class TomcatServerGBeanTest exten
             tomcatServerGBean.doStop();
         }
     }
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        System.setProperty("catalina.useNaming", "false");
+        System.setProperty("catalina.base", BASEDIR.getAbsolutePath());
+    }
 }

Modified: geronimo/server/branches/3.0-M1/plugins/tomcat/tomcat7/src/main/filtered-resources/tomcat-base/conf/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/tomcat/tomcat7/src/main/filtered-resources/tomcat-base/conf/web.xml?rev=950880&r1=950879&r2=950880&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/tomcat/tomcat7/src/main/filtered-resources/tomcat-base/conf/web.xml (original)
+++ geronimo/server/branches/3.0-M1/plugins/tomcat/tomcat7/src/main/filtered-resources/tomcat-base/conf/web.xml Thu Jun  3 05:31:09 2010
@@ -1,26 +1,25 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
 -->
-
 <web-app xmlns="http://java.sun.com/xml/ns/javaee"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-   version="2.5" >
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+                      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+  version="3.0"> 
 
   <!-- ======================== Introduction ============================== -->
   <!-- This document defines default values for *all* web applications      -->
@@ -72,13 +71,21 @@
   <!--                       which sendfile will be used. Use a negative    -->
   <!--                       value to always disable sendfile.  [48]        -->
   <!--                                                                      -->
+  <!--   useAcceptRanges     Should the Accept-Ranges header be included    -->
+  <!--                       in responses where appropriate? [true]         -->
+  <!--                                                                      -->
   <!--  For directory listing customization. Checks localXsltFile, then     -->
   <!--  globalXsltFile, then defaults to original behavior.                 -->
   <!--                                                                      -->
   <!--   localXsltFile       Make directory listings an XML doc and         -->
   <!--                       pass the result to this style sheet residing   -->
   <!--                       in that directory. This overrides              -->
-  <!--                        globalXsltFile[null]                          -->
+  <!--                       contextXsltFile and globalXsltFile[null]       -->
+  <!--                                                                      -->
+  <!--   contextXsltFile     Make directory listings an XML doc and         -->
+  <!--                       pass the result to this style sheet which is   -->
+  <!--                       relative to the context root. This overrides   -->
+  <!--                       globalXsltFile[null]                           -->
   <!--                                                                      -->
   <!--   globalXsltFile      Site wide configuration version of             -->
   <!--                       localXsltFile This argument is expected        -->
@@ -101,34 +108,6 @@
     </servlet>
 
 
-  <!-- The "invoker" servlet, which executes anonymous servlet classes      -->
-  <!-- that have not been defined in a web.xml file.  Traditionally, this   -->
-  <!-- servlet is mapped to the URL pattern "/servlet/*", but you can map   -->
-  <!-- it to other patterns as well.  The extra path info portion of such a -->
-  <!-- request must be the fully qualified class name of a Java class that  -->
-  <!-- implements Servlet (or extends HttpServlet), or the servlet name     -->
-  <!-- of an existing servlet definition.     This servlet supports the     -->
-  <!-- following initialization parameters (default values are in square    -->
-  <!-- brackets):                                                           -->
-  <!--                                                                      -->
-  <!--   debug               Debugging detail level for messages logged     -->
-  <!--                       by this servlet.  [0]                          -->
-
-<!--
-    <servlet>
-        <servlet-name>invoker</servlet-name>
-        <servlet-class>
-          org.apache.catalina.servlets.InvokerServlet
-        </servlet-class>
-        <init-param>
-            <param-name>debug</param-name>
-            <param-value>0</param-value>
-        </init-param>
-        <load-on-startup>2</load-on-startup>
-    </servlet>
--->
-
-
   <!-- The JSP page compiler and execution servlet, which is the mechanism  -->
   <!-- used by Tomcat to support JSP pages.  Traditionally, this servlet    -->
   <!-- is mapped to the URL pattern "*.jsp".  This servlet supports the     -->
@@ -138,21 +117,8 @@
   <!--   checkInterval       If development is false and checkInterval is   -->
   <!--                       greater than zero, background compilations are -->
   <!--                       enabled. checkInterval is the time in seconds  -->
-  <!--                       between checks to see if a JSP page needs to   -->
-  <!--                       be recompiled. [0]                             -->
-  <!--                                                                      -->
-  <!--   modificationTestInterval                                           -->
-  <!--                       Causes a JSP (and its dependent files) to not  -->
-  <!--                       be checked for modification during the         -->
-  <!--                       specified time interval (in seconds) from the  -->
-  <!--                       last time the JSP was checked for              -->
-  <!--                       modification. A value of 0 will cause the JSP  -->
-  <!--                       to be checked on every access.                 -->
-  <!--                       Used in development mode only. [4]             -->
-  <!--                                                                      -->
-  <!--   compiler            Which compiler Ant should use to compile JSP   -->
-  <!--                       pages.  See the Ant documentation for more     -->
-  <!--                       information. [javac]                           -->
+  <!--                       between checks to see if a JSP page (and its   -->
+  <!--                       dependent files) needs to  be recompiled. [0]  -->
   <!--                                                                      -->
   <!--   classdebuginfo      Should the class file be compiled with         -->
   <!--                       debugging information?  [true]                 -->
@@ -161,18 +127,50 @@
   <!--                       generated servlets?  [Created dynamically      -->
   <!--                       based on the current web application]          -->
   <!--                                                                      -->
+  <!--   compiler            Which compiler Ant should use to compile JSP   -->
+  <!--                       pages.  See the jasper documentation for more  -->
+  <!--                       information.                                   -->
+  <!--                                                                      -->
+  <!--   compilerSourceVM    Compiler source VM. [1.6]                      -->
+  <!--                                                                      -->
+  <!--   compilerTargetVM    Compiler target VM. [1.6]                      -->
+  <!--                                                                      -->
   <!--   development         Is Jasper used in development mode? If true,   -->
   <!--                       the frequency at which JSPs are checked for    -->
   <!--                       modification may be specified via the          -->
   <!--                       modificationTestInterval parameter. [true]     -->
   <!--                                                                      -->
+  <!--   displaySourceFragment                                              -->
+  <!--                       Should a source fragment be included in        -->
+  <!--                       exception messages? [true]                     -->
+  <!--                                                                      -->
+  <!--   dumpSmap            Should the SMAP info for JSR45 debugging be    -->
+  <!--                       dumped to a file? [false]                      -->
+  <!--                       False if suppressSmap is true                  -->
+  <!--                                                                      -->
   <!--   enablePooling       Determines whether tag handler pooling is      -->
-  <!--                       enabled  [true]                                -->
+  <!--                       enabled. This is a compilation option. It will -->
+  <!--                       not alter the behaviour of JSPs that have      -->
+  <!--                       already been compiled. [true]                  -->
+  <!--                                                                      -->
+  <!--   engineOptionsClass  Allows specifying the Options class used to    -->
+  <!--                       configure Jasper. If not present, the default  -->
+  <!--                       EmbeddedServletOptions will be used.           -->
+  <!--                                                                      -->
+  <!--   errorOnUseBeanInvalidClassAttribute                                -->
+  <!--                       Should Jasper issue an error when the value of -->
+  <!--                       the class attribute in an useBean action is    -->
+  <!--                       not a valid bean class?  [true]                -->
   <!--                                                                      -->
   <!--   fork                Tell Ant to fork compiles of JSP pages so that -->
   <!--                       a separate JVM is used for JSP page compiles   -->
   <!--                       from the one Tomcat is running in. [true]      -->
   <!--                                                                      -->
+  <!--   genStringAsCharArray                                               -->
+  <!--                       Should text strings be generated as char       -->
+  <!--                       arrays, to improve performance in some cases?  -->
+  <!--                       [false]                                        -->
+  <!--                                                                      -->
   <!--   ieClassId           The class-id value to be sent to Internet      -->
   <!--                       Explorer when using <jsp:plugin> tags.         -->
   <!--                       [clsid:8AD9C840-044E-11D1-B3E9-00805F499D93]   -->
@@ -187,42 +185,44 @@
   <!--                       print statement per input line, to ease        -->
   <!--                       debugging?  [true]                             -->
   <!--                                                                      -->
-  <!--   trimSpaces          Should white spaces in template text between   -->
-  <!--                       actions or directives be trimmed?  [false]     -->
-  <!--                                                                      -->
-  <!--   suppressSmap        Should the generation of SMAP info for JSR45   -->
-  <!--                       debugging be suppressed?  [false]              -->
+  <!--   maxLoadedJsps       The maximum number of JSPs that will be loaded -->
+  <!--                       for a web application. If more than this       -->
+  <!--                       number of JSPs are loaded, the least recently  -->
+  <!--                       used JSPs will be unloaded so that the number  -->
+  <!--                       of JSPs loaded at any one time does not exceed -->
+  <!--                       this limit. A value of zero or less indicates  -->
+  <!--                       no limit. [-1]                                 -->
   <!--                                                                      -->
-  <!--   dumpSmap            Should the SMAP info for JSR45 debugging be    -->
-  <!--                       dumped to a file? [false]                      -->
-  <!--                       False if suppressSmap is true                  -->
+  <!--   modificationTestInterval                                           -->
+  <!--                       Causes a JSP (and its dependent files) to not  -->
+  <!--                       be checked for modification during the         -->
+  <!--                       specified time interval (in seconds) from the  -->
+  <!--                       last time the JSP was checked for              -->
+  <!--                       modification. A value of 0 will cause the JSP  -->
+  <!--                       to be checked on every access.                 -->
+  <!--                       Used in development mode only. [4]             -->
   <!--                                                                      -->
-  <!--   genStrAsCharArray   Should text strings be generated as char       -->
-  <!--                       arrays, to improve performance in some cases?  -->
+  <!--   recompileOnFail     If a JSP compilation fails should the          -->
+  <!--                       modificationTestInterval be ignored and the    -->
+  <!--                       next access trigger a re-compilation attempt?  -->
+  <!--                       Used in development mode only and is disabled  -->
+  <!--                       by default as compilation may be expensive and -->
+  <!--                       could lead to excessive resource usage.        -->
   <!--                       [false]                                        -->
   <!--                                                                      -->
-  <!--   errorOnUseBeanInvalidClassAttribute                                -->
-  <!--                       Should Jasper issue an error when the value of -->
-  <!--                       the class attribute in an useBean action is    -->
-  <!--                       not a valid bean class?  [true]                -->
-  <!--                                                                      -->
   <!--   scratchdir          What scratch directory should we use when      -->
   <!--                       compiling JSP pages?  [default work directory  -->
   <!--                       for the current web application]               -->
   <!--                                                                      -->
+  <!--   suppressSmap        Should the generation of SMAP info for JSR45   -->
+  <!--                       debugging be suppressed?  [false]              -->
+  <!--                                                                      -->
+  <!--   trimSpaces          Should white spaces in template text between   -->
+  <!--                       actions or directives be trimmed?  [false]     -->
+  <!--                                                                      -->
   <!--   xpoweredBy          Determines whether X-Powered-By response       -->
   <!--                       header is added by generated servlet  [false]  -->
   <!--                                                                      -->
-  <!--   compilerTargetVM    Compiler target VM                             -->  
-  <!--                       default is System.properties                   -->
-  <!--                        java.specification.version > 1.4              -->
-  <!--                        [1.5] else [1.4]                              -->
-  <!--                                                                      -->
-  <!--   compilerSourceVM    Compiler source VM                             -->
-  <!--                       default is System.properties                   -->
-  <!--                        java.specification.version > 1.4              -->
-  <!--                        [1.5] else [1.4]                              -->
-  <!--                                                                      -->
   <!-- If you wish to use Jikes to compile JSP pages:                       -->
   <!--   Please see the "Using Jikes" section of the Jasper-HowTo           -->
   <!--   page in the Tomcat documentation.                                  -->
@@ -279,11 +279,6 @@
   <!--                                                                      -->
   <!--   outputEncoding      The encoding to use for the page that results  -->
   <!--                       from the SSI processing. [UTF-8]               -->
-  <!--                                                                      -->
-  <!--                                                                      -->
-  <!-- IMPORTANT: To use the SSI servlet, you also need to rename the       -->
-  <!--            $CATALINA_HOME/server/lib/servlets-ssi.renametojar file   -->
-  <!--            to $CATALINA_HOME/server/lib/servlets-ssi.jar             -->
 
 <!--
     <servlet>
@@ -327,7 +322,7 @@
   <!--   debug                Debugging detail level for messages logged    -->
   <!--                        by this servlet.  [0]                         -->
   <!--                                                                      -->
-  <!--   executable           Name of the exectuable used to run the        -->
+  <!--   executable           Name of the executable used to run the        -->
   <!--                        script. [perl]                                -->
   <!--                                                                      -->
   <!--   parameterEncoding    Name of parameter encoding to be used with    -->
@@ -337,9 +332,9 @@
   <!--   passShellEnvironment Should the shell environment variables (if    -->
   <!--                        any) be passed to the CGI script? [false]     -->
   <!--                                                                      -->
-  <!-- IMPORTANT: To use the CGI servlet, you also need to rename the       -->
-  <!--            $CATALINA_HOME/server/lib/servlets-cgi.renametojar file   -->
-  <!--            to $CATALINA_HOME/server/lib/servlets-cgi.jar             -->
+  <!--   stderrTimeout        The time (in milliseconds) to wait for the    -->
+  <!--                        reading of stderr to complete before          -->
+  <!--                        terminating the CGI process. [2000]           -->
 
 <!--
     <servlet>
@@ -372,14 +367,6 @@
         <url-pattern>/</url-pattern>
     </servlet-mapping>
 
-    <!-- The mapping for the invoker servlet -->
-<!--
-    <servlet-mapping>
-        <servlet-name>invoker</servlet-name>
-        <url-pattern>/servlet/*</url-pattern>
-    </servlet-mapping>
--->
-
     <!-- The mapping for the JSP servlet -->
     <servlet-mapping>
         <servlet-name>jsp</servlet-name>
@@ -409,6 +396,75 @@
 -->
 
 
+  <!-- ================== Built In Filter Definitions ===================== -->
+
+  <!-- NOTE: An SSI Servlet is also available as an alternative SSI         -->
+  <!-- implementation. Use either the Servlet or the Filter but NOT both.   -->
+  <!--                                                                      -->
+  <!-- Server Side Includes processing filter, which processes SSI          -->
+  <!-- directives in HTML pages consistent with similar support in web      -->
+  <!-- servers like Apache.  Traditionally, this filter is mapped to the    -->
+  <!-- URL pattern "*.shtml", though it can be mapped to "*" as it will     -->
+  <!-- selectively enable/disable SSI processing based on mime types. For   -->
+  <!-- this to work you will need to uncomment the .shtml mime type         -->
+  <!-- definition towards the bottom of this file.                          -->
+  <!-- The contentType init param allows you to apply SSI processing to JSP -->
+  <!-- pages, javascript, or any other content you wish.  This filter       -->
+  <!-- supports the following initialization parameters (default values are -->
+  <!-- in square brackets):                                                 -->
+  <!--                                                                      -->
+  <!--   contentType         A regex pattern that must be matched before    -->
+  <!--                       SSI processing is applied.                     -->
+  <!--                       [text/x-server-parsed-html(;.*)?]              -->
+  <!--                                                                      -->
+  <!--   debug               Debugging detail level for messages logged     -->
+  <!--                       by this servlet.  [0]                          -->
+  <!--                                                                      -->
+  <!--   expires             The number of seconds before a page with SSI   -->
+  <!--                       directives will expire.  [No default]          -->
+  <!--                                                                      -->
+  <!--   isVirtualWebappRelative                                            -->
+  <!--                       Should "virtual" paths be interpreted as       -->
+  <!--                       relative to the context root, instead of       -->
+  <!--                       the server root?  (0=false, 1=true) [0]        -->
+
+<!--
+    <filter>
+        <filter-name>ssi</filter-name>
+        <filter-class>
+          org.apache.catalina.ssi.SSIFilter
+        </filter-class>
+        <init-param>
+          <param-name>contentType</param-name>
+          <param-value>text/x-server-parsed-html(;.*)?</param-value>
+        </init-param>
+        <init-param>
+          <param-name>debug</param-name>
+          <param-value>0</param-value>
+        </init-param>
+        <init-param>
+          <param-name>expires</param-name>
+          <param-value>666</param-value>
+        </init-param>
+        <init-param>
+          <param-name>isVirtualWebappRelative</param-name>
+          <param-value>0</param-value>
+        </init-param>
+    </filter>
+-->
+
+
+  <!-- ==================== Built In Filter Mappings ====================== -->
+
+  <!-- The mapping for the SSI Filter -->
+<!--
+    <filter-mapping>
+        <filter-name>ssi</filter-name>
+        <url-pattern>*.shtml</url-pattern>
+    </filter-mapping>
+-->
+
+
   <!-- ==================== Default Session Configuration ================= -->
   <!-- You can set the default session timeout (in minutes) for all newly   -->
   <!-- created sessions by modifying the value below.                       -->
@@ -686,6 +742,10 @@
         <mime-type>audio/x-mpeg</mime-type>
     </mime-mapping>
     <mime-mapping>
+        <extension>mp4</extension>
+        <mime-type>video/mp4</mime-type>
+    </mime-mapping>
+    <mime-mapping>
         <extension>mpa</extension>
         <mime-type>audio/x-mpeg</mime-type>
     </mime-mapping>
@@ -767,10 +827,6 @@
         <mime-type>application/vnd.oasis.opendocument.text</mime-type>
     </mime-mapping>
     <mime-mapping>
-        <extension>ogg</extension>
-        <mime-type>application/ogg</mime-type>
-    </mime-mapping>
-    <mime-mapping>
         <!-- OpenDocument Drawing Template -->
         <extension>otg </extension>
         <mime-type>application/vnd.oasis.opendocument.graphics-template</mime-type>
@@ -795,6 +851,47 @@
         <extension>ott</extension>
         <mime-type>application/vnd.oasis.opendocument.text-template</mime-type>
     </mime-mapping>
+    <!-- xiph mime types -->
+    <mime-mapping>
+        <extension>ogx</extension>
+        <mime-type>application/ogg</mime-type>
+    </mime-mapping>
+    <mime-mapping>
+        <extension>ogv</extension>
+        <mime-type>video/ogg</mime-type>
+    </mime-mapping>
+    <mime-mapping>
+        <extension>oga</extension>
+        <mime-type>audio/ogg</mime-type>
+    </mime-mapping>
+    <mime-mapping>
+        <extension>ogg</extension>
+        <mime-type>audio/ogg</mime-type>
+    </mime-mapping>
+    <mime-mapping>
+        <extension>spx</extension>
+        <mime-type>audio/ogg</mime-type>
+    </mime-mapping>
+    <mime-mapping>
+        <extension>flac</extension>
+        <mime-type>audio/flac</mime-type>
+    </mime-mapping>
+    <mime-mapping>
+        <extension>anx</extension>
+        <mime-type>application/annodex</mime-type>
+    </mime-mapping>
+    <mime-mapping>
+        <extension>axa</extension>
+        <mime-type>audio/annodex</mime-type>
+    </mime-mapping>
+    <mime-mapping>
+        <extension>axv</extension>
+        <mime-type>video/annodex</mime-type>
+    </mime-mapping>
+    <mime-mapping>
+        <extension>xspf</extension>
+        <mime-type>application/xspf+xml</mime-type>
+    </mime-mapping>
     <mime-mapping>
         <extension>pbm</extension>
         <mime-type>image/x-portable-bitmap</mime-type>
@@ -841,7 +938,11 @@
     </mime-mapping>
     <mime-mapping>
         <extension>ppt</extension>
-        <mime-type>application/powerpoint</mime-type>
+        <mime-type>application/vnd.ms-powerpoint</mime-type>
+    </mime-mapping>
+    <mime-mapping>
+        <extension>pps</extension>
+        <mime-type>application/vnd.ms-powerpoint</mime-type>
     </mime-mapping>
     <mime-mapping>
         <extension>ps</extension>
@@ -930,6 +1031,14 @@
         <mime-type>application/x-sv4crc</mime-type>
     </mime-mapping>
     <mime-mapping>
+        <extension>svg</extension>
+        <mime-type>image/svg+xml</mime-type>
+    </mime-mapping>
+    <mime-mapping>
+        <extension>svgz</extension>
+        <mime-type>image/svg+xml</mime-type>
+    </mime-mapping>
+    <mime-mapping>
         <extension>swf</extension>
         <mime-type>application/x-shockwave-flash</mime-type>
     </mime-mapping>
@@ -974,10 +1083,6 @@
         <mime-type>text/tab-separated-values</mime-type>
     </mime-mapping>
     <mime-mapping>
-       <extension>text</extension>
-       <mime-type>text/plain</mime-type>
-    </mime-mapping>
-    <mime-mapping>
         <extension>txt</extension>
         <mime-type>text/plain</mime-type>
     </mime-mapping>
@@ -1006,6 +1111,10 @@
         <mime-type>application/xhtml+xml</mime-type>
     </mime-mapping>
     <mime-mapping>
+        <extension>xls</extension>
+        <mime-type>application/vnd.ms-excel</mime-type>
+    </mime-mapping>
+    <mime-mapping>
         <extension>xml</extension>
         <mime-type>application/xml</mime-type>
     </mime-mapping>
@@ -1030,22 +1139,14 @@
         <mime-type>image/x-xwindowdump</mime-type>
     </mime-mapping>
     <mime-mapping>
-        <extension>wav</extension>
-        <mime-type>audio/x-wav</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>svg</extension>
-        <mime-type>image/svg+xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>svgz</extension>
-        <mime-type>image/svg+xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
         <extension>vsd</extension>
         <mime-type>application/x-visio</mime-type>
     </mime-mapping>
     <mime-mapping>
+        <extension>wav</extension>
+        <mime-type>audio/x-wav</mime-type>
+    </mime-mapping>
+    <mime-mapping>
         <!-- Wireless Bitmap -->
         <extension>wbmp</extension>
         <mime-type>image/vnd.wap.wbmp</mime-type>
@@ -1071,12 +1172,16 @@
         <mime-type>application/vnd.wap.wmlscriptc</mime-type>
     </mime-mapping>
     <mime-mapping>
+        <extension>wmv</extension>
+        <mime-type>video/x-ms-wmv</mime-type>
+    </mime-mapping>
+    <mime-mapping>
         <extension>wrl</extension>
         <mime-type>x-world/x-vrml</mime-type>
     </mime-mapping>
     <mime-mapping>
-        <extension>wsdl</extension>
-        <mime-type>text/xml</mime-type>
+        <extension>wspolicy</extension>
+        <mime-type>application/wspolicy+xml</mime-type>
     </mime-mapping>
     <mime-mapping>
         <extension>Z</extension>
@@ -1091,16 +1196,8 @@
         <mime-type>application/zip</mime-type>
     </mime-mapping>
     <mime-mapping>
-        <extension>xls</extension>
-        <mime-type>application/vnd.ms-excel</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>doc</extension>
-        <mime-type>application/vnd.ms-word</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ppt</extension>
-        <mime-type>application/vnd.ms-powerpoint</mime-type>
+        <extension>wsdl</extension>
+        <mime-type>text/xml</mime-type>
     </mime-mapping>
 
   <!-- ==================== Default Welcome File List ===================== -->

Modified: geronimo/server/branches/3.0-M1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/pom.xml?rev=950880&r1=950879&r2=950880&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/pom.xml Thu Jun  3 05:31:09 2010
@@ -67,7 +67,7 @@
         FIXME: STOP using properties for dependency versions unless you absolutly need them,
                ie. you have a hundred dependencies that all use the same version.
         -->
-        <tomcatVersion>7.0.0.0</tomcatVersion>
+        <tomcatVersion>7.0.0.1</tomcatVersion>
         <tomcatGroupId>org.apache.geronimo.ext.tomcat</tomcatGroupId>
 
         <openejbVersion>3.1.3.0</openejbVersion>



Mime
View raw message