tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1187791 [1/2] - /tomcat/trunk/java/org/apache/catalina/startup/
Date Sat, 22 Oct 2011 21:11:35 GMT
Author: markt
Date: Sat Oct 22 21:11:34 2011
New Revision: 1187791

URL: http://svn.apache.org/viewvc?rev=1187791&view=rev
Log:
Whitespace removal from /java/org/apache/catalina/startup

Modified:
    tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java
    tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java
    tomcat/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java
    tomcat/trunk/java/org/apache/catalina/startup/ConnectorCreateRule.java
    tomcat/trunk/java/org/apache/catalina/startup/Constants.java
    tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java
    tomcat/trunk/java/org/apache/catalina/startup/CopyParentClassLoaderRule.java
    tomcat/trunk/java/org/apache/catalina/startup/DigesterFactory.java
    tomcat/trunk/java/org/apache/catalina/startup/Embedded.java
    tomcat/trunk/java/org/apache/catalina/startup/EngineConfig.java
    tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java
    tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java
    tomcat/trunk/java/org/apache/catalina/startup/HomesUserDatabase.java
    tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
    tomcat/trunk/java/org/apache/catalina/startup/HostRuleSet.java
    tomcat/trunk/java/org/apache/catalina/startup/LifecycleListenerRule.java
    tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties
    tomcat/trunk/java/org/apache/catalina/startup/NamingRuleSet.java
    tomcat/trunk/java/org/apache/catalina/startup/PasswdUserDatabase.java
    tomcat/trunk/java/org/apache/catalina/startup/RealmRuleSet.java
    tomcat/trunk/java/org/apache/catalina/startup/SetAllPropertiesRule.java
    tomcat/trunk/java/org/apache/catalina/startup/SetContextPropertiesRule.java
    tomcat/trunk/java/org/apache/catalina/startup/SetNextNamingRule.java
    tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java
    tomcat/trunk/java/org/apache/catalina/startup/TldRuleSet.java
    tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
    tomcat/trunk/java/org/apache/catalina/startup/Tool.java
    tomcat/trunk/java/org/apache/catalina/startup/UserConfig.java
    tomcat/trunk/java/org/apache/catalina/startup/UserDatabase.java
    tomcat/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java
    tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java
    tomcat/trunk/java/org/apache/catalina/startup/XmlErrorHandler.java
    tomcat/trunk/java/org/apache/catalina/startup/mbeans-descriptors.xml

Modified: tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java?rev=1187791&r1=1187790&r2=1187791&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java Sat Oct 22 21:11:34 2011
@@ -169,7 +169,7 @@ public final class Bootstrap {
 
     /**
      * System property replacement in the given string.
-     * 
+     *
      * @param str The original string
      * @return the modified string
      */

Modified: tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java?rev=1187791&r1=1187790&r2=1187791&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java Sat Oct 22 21:11:34 2011
@@ -5,9 +5,9 @@
  * 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.
@@ -60,7 +60,7 @@ public class CatalinaProperties {
      * Return specified property value.
      */
     public static String getProperty(String name) {
-    
+
         return properties.getProperty(name);
 
     }
@@ -154,8 +154,8 @@ public class CatalinaProperties {
         return System.getProperty(Globals.CATALINA_HOME_PROP,
                                   System.getProperty("user.dir"));
     }
-    
-    
+
+
     /**
      * Get the value of the catalina.base environment variable.
      */

Modified: tomcat/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java?rev=1187791&r1=1187790&r2=1187791&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java Sat Oct 22 21:11:34 2011
@@ -5,9 +5,9 @@
  * 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.
@@ -57,7 +57,7 @@ public final class ClassLoaderFactory {
 
 
     private static final Log log = LogFactory.getLog(ClassLoaderFactory.class);
-    
+
     // --------------------------------------------------------- Public Methods
 
 
@@ -66,10 +66,10 @@ public final class ClassLoaderFactory {
      * defaults and the specified directory paths:
      *
      * @param unpacked Array of pathnames to unpacked directories that should
-     *  be added to the repositories of the class loader, or <code>null</code> 
+     *  be added to the repositories of the class loader, or <code>null</code>
      * for no unpacked directories to be considered
      * @param packed Array of pathnames to directories containing JAR files
-     *  that should be added to the repositories of the class loader, 
+     *  that should be added to the repositories of the class loader,
      * or <code>null</code> for no directories of JAR files to be considered
      * @param parent Parent class loader for the new class loader, or
      *  <code>null</code> for the system class loader.
@@ -278,20 +278,20 @@ public final class ClassLoaderFactory {
         JAR,
         URL
     }
-    
+
     public static class Repository {
         private String location;
         private RepositoryType type;
-        
+
         public Repository(String location, RepositoryType type) {
             this.location = location;
             this.type = type;
         }
-        
+
         public String getLocation() {
             return location;
         }
-        
+
         public RepositoryType getType() {
             return type;
         }

Modified: tomcat/trunk/java/org/apache/catalina/startup/ConnectorCreateRule.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ConnectorCreateRule.java?rev=1187791&r1=1187790&r2=1187791&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ConnectorCreateRule.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ConnectorCreateRule.java Sat Oct 22 21:11:34 2011
@@ -5,15 +5,15 @@
  * 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.
- */ 
+ */
 
 
 package org.apache.catalina.startup;
@@ -44,10 +44,10 @@ public class ConnectorCreateRule extends
     /**
      * Process the beginning of this element.
      *
-     * @param namespace the namespace URI of the matching element, or an 
+     * @param namespace the namespace URI of the matching element, or an
      *   empty string if the parser is not namespace aware or the element has
      *   no namespace
-     * @param name the local name if the parser is namespace aware, or just 
+     * @param name the local name if the parser is namespace aware, or just
      *   the element name otherwise
      * @param attributes The attribute list for this element
      */
@@ -61,10 +61,10 @@ public class ConnectorCreateRule extends
         }
         Connector con = new Connector(attributes.getValue("protocol"));
         if ( ex != null )  _setExecutor(con,ex);
-        
+
         digester.push(con);
     }
-    
+
     public void _setExecutor(Connector con, Executor ex) throws Exception {
         Method m = IntrospectionUtils.findMethod(con.getProtocolHandler().getClass(),"setExecutor",new Class[] {java.util.concurrent.Executor.class});
         if (m!=null) {
@@ -77,11 +77,11 @@ public class ConnectorCreateRule extends
 
     /**
      * Process the end of this element.
-     * 
-     * @param namespace the namespace URI of the matching element, or an 
+     *
+     * @param namespace the namespace URI of the matching element, or an
      *   empty string if the parser is not namespace aware or the element has
      *   no namespace
-     * @param name the local name if the parser is namespace aware, or just 
+     * @param name the local name if the parser is namespace aware, or just
      *   the element name otherwise
      */
     @Override

Modified: tomcat/trunk/java/org/apache/catalina/startup/Constants.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Constants.java?rev=1187791&r1=1187790&r2=1187791&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Constants.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Constants.java Sat Oct 22 21:11:34 2011
@@ -1,193 +1,193 @@
-/*
- * 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.
- */
-
-
-package org.apache.catalina.startup;
-
-
-/**
- * String constants for the startup package.
- *
- * @author Craig R. McClanahan
- * @author Jean-Francois Arcand
- * @version $Id$
- */
-
-public final class Constants {
-
-    public static final String Package = "org.apache.catalina.startup";
-
-    public static final String ApplicationContextXml = "META-INF/context.xml";
-    public static final String ApplicationWebXml = "/WEB-INF/web.xml";
-    public static final String DefaultContextXml = "conf/context.xml";
-    public static final String DefaultWebXml = "conf/web.xml";
-    public static final String HostContextXml = "context.xml.default";
-    public static final String HostWebXml = "web.xml.default";
-
-    /**
-     * A dummy value used to suppress loading the default web.xml file.
-     *
-     * <p>
-     * It is useful when embedding Tomcat, when the default configuration is
-     * done programmatically, e.g. by calling
-     * <code>Tomcat.initWebappDefaults(context)</code>.
-     *
-     * @see Tomcat
-     */
-    public static final String NoDefaultWebXml = "org/apache/catalina/startup/NO_DEFAULT_XML";
-
-    // J2EE
-    public static final String J2eeSchemaPublicId_14 =
-        "j2ee_1_4.xsd";
-    public static final String J2eeSchemaResourcePath_14 =
-        "/javax/servlet/resources/j2ee_1_4.xsd";
-
-    public static final String JavaeeSchemaPublicId_5 =
-        "javaee_5.xsd";
-    public static final String JavaeeSchemaResourcePath_5 =
-        "/javax/servlet/resources/javaee_5.xsd";
-
-    public static final String JavaeeSchemaPublicId_6 =
-        "javaee_6.xsd";
-    public static final String JavaeeSchemaResourcePath_6 =
-        "/javax/servlet/resources/javaee_6.xsd";
-
-    
-    // W3C
-    public static final String W3cSchemaPublicId_10 =
-        "xml.xsd";
-    public static final String W3cSchemaResourcePath_10 =
-        "/javax/servlet/resources/xml.xsd";
-
-    public static final String W3cSchemaDTDPublicId_10 =
-        "XMLSchema.dtd";
-    public static final String W3cSchemaDTDResourcePath_10 =
-        "/javax/servlet/resources/XMLSchema.dtd";
-
-    public static final String W3cDatatypesDTDPublicId_10 =
-        "datatypes.dtd";
-    public static final String W3cDatatypesDTDResourcePath_10 =
-        "/javax/servlet/resources/datatypes.dtd";
-
-    
-    // JSP
-    public static final String JspSchemaPublicId_20 =
-        "jsp_2_0.xsd";
-    public static final String JspSchemaResourcePath_20 =
-        "/javax/servlet/jsp/resources/jsp_2_0.xsd";
-    
-    public static final String JspSchemaPublicId_21 =
-        "jsp_2_1.xsd";
-    public static final String JspSchemaResourcePath_21 =
-        "/javax/servlet/jsp/resources/jsp_2_1.xsd";
-
-    public static final String JspSchemaPublicId_22 =
-        "jsp_2_2.xsd";
-    public static final String JspSchemaResourcePath_22 =
-        "/javax/servlet/jsp/resources/jsp_2_2.xsd";
-
-
-    // TLD
-    public static final String TldDtdPublicId_11 =
-        "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN";
-    public static final String TldDtdResourcePath_11 =
-        "/javax/servlet/jsp/resources/web-jsptaglibrary_1_1.dtd";
-
-    public static final String TldDtdPublicId_12 =
-        "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN";
-    public static final String TldDtdResourcePath_12 =
-        "/javax/servlet/jsp/resources/web-jsptaglibrary_1_2.dtd";
-
-    public static final String TldSchemaPublicId_20 =
-        "web-jsptaglibrary_2_0.xsd";
-    public static final String TldSchemaResourcePath_20 =
-        "/javax/servlet/jsp/resources/web-jsptaglibrary_2_0.xsd";
-
-    public static final String TldSchemaPublicId_21 =
-        "web-jsptaglibrary_2_1.xsd";
-    public static final String TldSchemaResourcePath_21 =
-        "/javax/servlet/jsp/resources/web-jsptaglibrary_2_1.xsd";
-
-    
-    // web.xml
-    public static final String WebDtdPublicId_22 =
-        "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN";
-    public static final String WebDtdResourcePath_22 =
-        "/javax/servlet/resources/web-app_2_2.dtd";
-
-    public static final String WebDtdPublicId_23 =
-        "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN";
-    public static final String WebDtdResourcePath_23 =
-        "/javax/servlet/resources/web-app_2_3.dtd";
-
-    public static final String WebSchemaPublicId_24 =
-        "web-app_2_4.xsd";
-    public static final String WebSchemaResourcePath_24 =
-        "/javax/servlet/resources/web-app_2_4.xsd";
-
-    public static final String WebSchemaPublicId_25 =
-        "web-app_2_5.xsd";
-    public static final String WebSchemaResourcePath_25 =
-        "/javax/servlet/resources/web-app_2_5.xsd";
-
-    public static final String WebSchemaPublicId_30 =
-        "web-app_3_0.xsd";
-    public static final String WebSchemaResourcePath_30 =
-        "/javax/servlet/resources/web-app_3_0.xsd";
-
-    public static final String WebCommonSchemaPublicId_30 =
-        "web-common_3_0.xsd";
-    public static final String WebCommonSchemaResourcePath_30 =
-        "/javax/servlet/resources/web-common_3_0.xsd";
-
-    public static final String WebFragmentSchemaPublicId_30 =
-        "web-fragment_3_0.xsd";
-    public static final String WebFragmentSchemaResourcePath_30 =
-        "/javax/servlet/resources/web-fragment_3_0.xsd";
-    
-    // Web service
-    public static final String J2eeWebServiceSchemaPublicId_11 =
-            "j2ee_web_services_1_1.xsd";
-    public static final String J2eeWebServiceSchemaResourcePath_11 =
-            "/javax/servlet/resources/j2ee_web_services_1_1.xsd";
-    
-    public static final String J2eeWebServiceClientSchemaPublicId_11 =
-            "j2ee_web_services_client_1_1.xsd";
-    public static final String J2eeWebServiceClientSchemaResourcePath_11 =
-            "/javax/servlet/resources/j2ee_web_services_client_1_1.xsd";
-
-    public static final String JavaeeWebServiceSchemaPublicId_12 =
-        "javaee_web_services_1_2.xsd";
-    public static final String JavaeeWebServiceSchemaResourcePath_12 =
-        "/javax/servlet/resources/javaee_web_services_1_2.xsd";
-
-    public static final String JavaeeWebServiceClientSchemaPublicId_12 =
-        "javaee_web_services_client_1_2.xsd";
-    public static final String JavaeeWebServiceClientSchemaResourcePath_12 =
-        "/javax/servlet/resources/javaee_web_services_client_1_2.xsd";
-
-    public static final String JavaeeWebServiceSchemaPublicId_13 =
-        "javaee_web_services_1_3.xsd";
-    public static final String JavaeeWebServiceSchemaResourcePath_13 =
-        "/javax/servlet/resources/javaee_web_services_1_3.xsd";
-
-    public static final String JavaeeWebServiceClientSchemaPublicId_13 =
-        "javaee_web_services_client_1_3.xsd";
-    public static final String JavaeeWebServiceClientSchemaResourcePath_13 =
-        "/javax/servlet/resources/javaee_web_services_client_1_3.xsd";
-
-}
+/*
+ * 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.
+ */
+
+
+package org.apache.catalina.startup;
+
+
+/**
+ * String constants for the startup package.
+ *
+ * @author Craig R. McClanahan
+ * @author Jean-Francois Arcand
+ * @version $Id$
+ */
+
+public final class Constants {
+
+    public static final String Package = "org.apache.catalina.startup";
+
+    public static final String ApplicationContextXml = "META-INF/context.xml";
+    public static final String ApplicationWebXml = "/WEB-INF/web.xml";
+    public static final String DefaultContextXml = "conf/context.xml";
+    public static final String DefaultWebXml = "conf/web.xml";
+    public static final String HostContextXml = "context.xml.default";
+    public static final String HostWebXml = "web.xml.default";
+
+    /**
+     * A dummy value used to suppress loading the default web.xml file.
+     *
+     * <p>
+     * It is useful when embedding Tomcat, when the default configuration is
+     * done programmatically, e.g. by calling
+     * <code>Tomcat.initWebappDefaults(context)</code>.
+     *
+     * @see Tomcat
+     */
+    public static final String NoDefaultWebXml = "org/apache/catalina/startup/NO_DEFAULT_XML";
+
+    // J2EE
+    public static final String J2eeSchemaPublicId_14 =
+        "j2ee_1_4.xsd";
+    public static final String J2eeSchemaResourcePath_14 =
+        "/javax/servlet/resources/j2ee_1_4.xsd";
+
+    public static final String JavaeeSchemaPublicId_5 =
+        "javaee_5.xsd";
+    public static final String JavaeeSchemaResourcePath_5 =
+        "/javax/servlet/resources/javaee_5.xsd";
+
+    public static final String JavaeeSchemaPublicId_6 =
+        "javaee_6.xsd";
+    public static final String JavaeeSchemaResourcePath_6 =
+        "/javax/servlet/resources/javaee_6.xsd";
+
+
+    // W3C
+    public static final String W3cSchemaPublicId_10 =
+        "xml.xsd";
+    public static final String W3cSchemaResourcePath_10 =
+        "/javax/servlet/resources/xml.xsd";
+
+    public static final String W3cSchemaDTDPublicId_10 =
+        "XMLSchema.dtd";
+    public static final String W3cSchemaDTDResourcePath_10 =
+        "/javax/servlet/resources/XMLSchema.dtd";
+
+    public static final String W3cDatatypesDTDPublicId_10 =
+        "datatypes.dtd";
+    public static final String W3cDatatypesDTDResourcePath_10 =
+        "/javax/servlet/resources/datatypes.dtd";
+
+
+    // JSP
+    public static final String JspSchemaPublicId_20 =
+        "jsp_2_0.xsd";
+    public static final String JspSchemaResourcePath_20 =
+        "/javax/servlet/jsp/resources/jsp_2_0.xsd";
+
+    public static final String JspSchemaPublicId_21 =
+        "jsp_2_1.xsd";
+    public static final String JspSchemaResourcePath_21 =
+        "/javax/servlet/jsp/resources/jsp_2_1.xsd";
+
+    public static final String JspSchemaPublicId_22 =
+        "jsp_2_2.xsd";
+    public static final String JspSchemaResourcePath_22 =
+        "/javax/servlet/jsp/resources/jsp_2_2.xsd";
+
+
+    // TLD
+    public static final String TldDtdPublicId_11 =
+        "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN";
+    public static final String TldDtdResourcePath_11 =
+        "/javax/servlet/jsp/resources/web-jsptaglibrary_1_1.dtd";
+
+    public static final String TldDtdPublicId_12 =
+        "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN";
+    public static final String TldDtdResourcePath_12 =
+        "/javax/servlet/jsp/resources/web-jsptaglibrary_1_2.dtd";
+
+    public static final String TldSchemaPublicId_20 =
+        "web-jsptaglibrary_2_0.xsd";
+    public static final String TldSchemaResourcePath_20 =
+        "/javax/servlet/jsp/resources/web-jsptaglibrary_2_0.xsd";
+
+    public static final String TldSchemaPublicId_21 =
+        "web-jsptaglibrary_2_1.xsd";
+    public static final String TldSchemaResourcePath_21 =
+        "/javax/servlet/jsp/resources/web-jsptaglibrary_2_1.xsd";
+
+
+    // web.xml
+    public static final String WebDtdPublicId_22 =
+        "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN";
+    public static final String WebDtdResourcePath_22 =
+        "/javax/servlet/resources/web-app_2_2.dtd";
+
+    public static final String WebDtdPublicId_23 =
+        "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN";
+    public static final String WebDtdResourcePath_23 =
+        "/javax/servlet/resources/web-app_2_3.dtd";
+
+    public static final String WebSchemaPublicId_24 =
+        "web-app_2_4.xsd";
+    public static final String WebSchemaResourcePath_24 =
+        "/javax/servlet/resources/web-app_2_4.xsd";
+
+    public static final String WebSchemaPublicId_25 =
+        "web-app_2_5.xsd";
+    public static final String WebSchemaResourcePath_25 =
+        "/javax/servlet/resources/web-app_2_5.xsd";
+
+    public static final String WebSchemaPublicId_30 =
+        "web-app_3_0.xsd";
+    public static final String WebSchemaResourcePath_30 =
+        "/javax/servlet/resources/web-app_3_0.xsd";
+
+    public static final String WebCommonSchemaPublicId_30 =
+        "web-common_3_0.xsd";
+    public static final String WebCommonSchemaResourcePath_30 =
+        "/javax/servlet/resources/web-common_3_0.xsd";
+
+    public static final String WebFragmentSchemaPublicId_30 =
+        "web-fragment_3_0.xsd";
+    public static final String WebFragmentSchemaResourcePath_30 =
+        "/javax/servlet/resources/web-fragment_3_0.xsd";
+
+    // Web service
+    public static final String J2eeWebServiceSchemaPublicId_11 =
+            "j2ee_web_services_1_1.xsd";
+    public static final String J2eeWebServiceSchemaResourcePath_11 =
+            "/javax/servlet/resources/j2ee_web_services_1_1.xsd";
+
+    public static final String J2eeWebServiceClientSchemaPublicId_11 =
+            "j2ee_web_services_client_1_1.xsd";
+    public static final String J2eeWebServiceClientSchemaResourcePath_11 =
+            "/javax/servlet/resources/j2ee_web_services_client_1_1.xsd";
+
+    public static final String JavaeeWebServiceSchemaPublicId_12 =
+        "javaee_web_services_1_2.xsd";
+    public static final String JavaeeWebServiceSchemaResourcePath_12 =
+        "/javax/servlet/resources/javaee_web_services_1_2.xsd";
+
+    public static final String JavaeeWebServiceClientSchemaPublicId_12 =
+        "javaee_web_services_client_1_2.xsd";
+    public static final String JavaeeWebServiceClientSchemaResourcePath_12 =
+        "/javax/servlet/resources/javaee_web_services_client_1_2.xsd";
+
+    public static final String JavaeeWebServiceSchemaPublicId_13 =
+        "javaee_web_services_1_3.xsd";
+    public static final String JavaeeWebServiceSchemaResourcePath_13 =
+        "/javax/servlet/resources/javaee_web_services_1_3.xsd";
+
+    public static final String JavaeeWebServiceClientSchemaPublicId_13 =
+        "javaee_web_services_client_1_3.xsd";
+    public static final String JavaeeWebServiceClientSchemaResourcePath_13 =
+        "/javax/servlet/resources/javaee_web_services_client_1_3.xsd";
+
+}

Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java?rev=1187791&r1=1187790&r2=1187791&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java Sat Oct 22 21:11:34 2011
@@ -5,9 +5,9 @@
  * 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.

Modified: tomcat/trunk/java/org/apache/catalina/startup/CopyParentClassLoaderRule.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/CopyParentClassLoaderRule.java?rev=1187791&r1=1187790&r2=1187791&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/CopyParentClassLoaderRule.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/CopyParentClassLoaderRule.java Sat Oct 22 21:11:34 2011
@@ -5,9 +5,9 @@
  * 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.

Modified: tomcat/trunk/java/org/apache/catalina/startup/DigesterFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/DigesterFactory.java?rev=1187791&r1=1187790&r2=1187791&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/DigesterFactory.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/DigesterFactory.java Sat Oct 22 21:11:34 2011
@@ -5,9 +5,9 @@
  * 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.
@@ -45,7 +45,7 @@ public class DigesterFactory {
         return newDigester(false, false, null);
     }
 
-    
+
     /**
      * Create a <code>Digester</code> parser with XML validation turned off.
      * @param rule an instance of <code>RuleSet</code> used for parsing the xml.
@@ -54,7 +54,7 @@ public class DigesterFactory {
         return newDigester(false,false,rule);
     }
 
-    
+
     /**
      * Create a <code>Digester</code> parser.
      * @param xmlValidation turn on/off xml validation
@@ -71,7 +71,7 @@ public class DigesterFactory {
 
         SchemaResolver schemaResolver = new SchemaResolver(digester);
         registerLocalSchema(schemaResolver);
-        
+
         digester.setEntityResolver(schemaResolver);
         if ( rule != null ) {
             digester.addRuleSet(rule);
@@ -126,10 +126,10 @@ public class DigesterFactory {
                 schemaResolver);
 
         // TLD
-        register(Constants.TldDtdResourcePath_11,  
+        register(Constants.TldDtdResourcePath_11,
                  Constants.TldDtdPublicId_11,
                  schemaResolver);
-        
+
         register(Constants.TldDtdResourcePath_12,
                  Constants.TldDtdPublicId_12,
                  schemaResolver);
@@ -142,7 +142,7 @@ public class DigesterFactory {
                 Constants.TldSchemaPublicId_21,
                 schemaResolver);
 
-        // web.xml    
+        // web.xml
         register(Constants.WebDtdResourcePath_22,
                  Constants.WebDtdPublicId_22,
                  schemaResolver);
@@ -166,7 +166,7 @@ public class DigesterFactory {
         register(Constants.WebCommonSchemaResourcePath_30,
                 Constants.WebCommonSchemaPublicId_30,
                 schemaResolver);
-        
+
         register(Constants.WebFragmentSchemaResourcePath_30,
                 Constants.WebFragmentSchemaPublicId_30,
                 schemaResolver);
@@ -204,7 +204,7 @@ public class DigesterFactory {
     protected static void register(String resourceURL, String resourcePublicId,
             SchemaResolver schemaResolver){
         URL url = DigesterFactory.class.getResource(resourceURL);
-   
+
         if(url == null) {
             log.warn("Could not get url for " + resourceURL);
         } else {

Modified: tomcat/trunk/java/org/apache/catalina/startup/Embedded.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Embedded.java?rev=1187791&r1=1187790&r2=1187791&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Embedded.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Embedded.java Sat Oct 22 21:11:34 2011
@@ -5,9 +5,9 @@
  * 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.
@@ -99,7 +99,7 @@ import org.apache.tomcat.util.res.String
  *
  * @author Craig R. McClanahan
  * @version $Id$
- * 
+ *
  * @deprecated Use {@link Tomcat} instead.
  */
 
@@ -131,7 +131,7 @@ public class Embedded  extends StandardS
         super();
         setRealm(realm);
         setSecurityProtection();
-        
+
     }
 
 
@@ -422,14 +422,14 @@ public class Embedded  extends StandardS
             }
 
             if (address != null) {
-                IntrospectionUtils.setProperty(connector, "address", 
+                IntrospectionUtils.setProperty(connector, "address",
                                                "" + address);
             }
             IntrospectionUtils.setProperty(connector, "port", "" + port);
 
         } catch (Exception e) {
             log.error("Couldn't create connector.");
-        } 
+        }
 
         return (connector);
 
@@ -858,7 +858,7 @@ public class Embedded  extends StandardS
                 }
             }
         }
-        // last resort - for minimal/embedded cases. 
+        // last resort - for minimal/embedded cases.
         if(catalinaHome==null) {
             catalinaHome=System.getProperty("user.dir");
         }
@@ -889,7 +889,7 @@ public class Embedded  extends StandardS
             }
             System.setProperty(Globals.CATALINA_BASE_PROP, catalinaBase);
         }
-        
+
         String temp = System.getProperty("java.io.tmpdir");
         if (temp == null || (!(new File(temp)).exists())
                 || (!(new File(temp)).isDirectory())) {
@@ -898,7 +898,7 @@ public class Embedded  extends StandardS
 
     }
 
-    
+
     protected void initStreams() {
         if (redirectStreams) {
             // Replace System.out and System.err with a custom PrintStream
@@ -906,7 +906,7 @@ public class Embedded  extends StandardS
             System.setErr(new SystemLogHandler(System.err));
         }
     }
-    
+
 
     // -------------------------------------------------------- Private Methods
 

Modified: tomcat/trunk/java/org/apache/catalina/startup/EngineConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/EngineConfig.java?rev=1187791&r1=1187790&r2=1187791&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/EngineConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/EngineConfig.java Sat Oct 22 21:11:34 2011
@@ -5,9 +5,9 @@
  * 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.

Modified: tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java?rev=1187791&r1=1187790&r2=1187791&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java Sat Oct 22 21:11:34 2011
@@ -89,7 +89,7 @@ public class EngineRuleSet extends RuleS
      */
     @Override
     public void addRuleInstances(Digester digester) {
-        
+
         digester.addObjectCreate(prefix + "Engine",
                                  "org.apache.catalina.core.StandardEngine",
                                  "className");

Modified: tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java?rev=1187791&r1=1187790&r2=1187791&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java Sat Oct 22 21:11:34 2011
@@ -5,9 +5,9 @@
  * 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.
@@ -144,7 +144,7 @@ public class ExpandWar {
             throw e;
         } finally {
             if (!success) {
-                // If something went wrong, delete expanded dir to keep things 
+                // If something went wrong, delete expanded dir to keep things
                 // clean
                 deleteDir(docBase);
             }
@@ -237,9 +237,9 @@ public class ExpandWar {
      * @param dest File object representing the destination
      */
     public static boolean copy(File src, File dest) {
-        
+
         boolean result = true;
-        
+
         String files[] = null;
         if (src.isDirectory()) {
             files = src.list();
@@ -284,10 +284,10 @@ public class ExpandWar {
             }
         }
         return result;
-        
+
     }
-    
-    
+
+
     /**
      * Delete the specified directory, including all of its contents and
      * sub-directories recursively. Any failure will be logged.
@@ -324,8 +324,8 @@ public class ExpandWar {
         }
         return result;
     }
-    
-    
+
+
     /**
      * Delete the specified directory, including all of its contents and
      * sub-directories recursively. Any failure will be logged.
@@ -365,12 +365,12 @@ public class ExpandWar {
         } else {
             result = true;
         }
-        
+
         if (logFailure && !result) {
             log.error(sm.getString(
                     "expandWar.deleteFailed", dir.getAbsolutePath()));
         }
-        
+
         return result;
 
     }
@@ -388,7 +388,7 @@ public class ExpandWar {
         throws IOException {
         BufferedOutputStream output = null;
         try {
-            output = 
+            output =
                 new BufferedOutputStream(new FileOutputStream(file));
             byte buffer[] = new byte[2048];
             while (true) {

Modified: tomcat/trunk/java/org/apache/catalina/startup/HomesUserDatabase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HomesUserDatabase.java?rev=1187791&r1=1187790&r2=1187791&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/HomesUserDatabase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HomesUserDatabase.java Sat Oct 22 21:11:34 2011
@@ -5,9 +5,9 @@
  * 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.

Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1187791&r1=1187790&r2=1187791&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Sat Oct 22 21:11:34 2011
@@ -5,9 +5,9 @@
  * 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.
@@ -71,7 +71,7 @@ import org.apache.tomcat.util.res.String
  */
 public class HostConfig
     implements LifecycleListener {
-    
+
     private static final Log log = LogFactory.getLog( HostConfig.class );
 
     // ----------------------------------------------------- Instance Variables
@@ -100,12 +100,12 @@ public class HostConfig
      */
     protected Host host = null;
 
-    
+
     /**
      * The JMX ObjectName of this component.
      */
     protected ObjectName oname = null;
-    
+
 
     /**
      * The string resources for this package.
@@ -126,8 +126,8 @@ public class HostConfig
      * default when a web application is deployed?
      */
     protected boolean copyXML = false;
-    
-    
+
+
     /**
      * Should we unpack WAR files when auto-deploying applications in the
      * <code>appBase</code> directory?
@@ -141,13 +141,13 @@ public class HostConfig
     protected HashMap<String, DeployedApplication> deployed =
         new HashMap<String, DeployedApplication>();
 
-    
+
     /**
-     * List of applications which are being serviced, and shouldn't be 
+     * List of applications which are being serviced, and shouldn't be
      * deployed/undeployed/redeployed at the moment.
      */
     protected ArrayList<String> serviced = new ArrayList<String>();
-    
+
 
     /**
      * The <code>Digester</code> instance used to parse context descriptors.
@@ -271,8 +271,8 @@ public class HostConfig
         this.unpackWARs = unpackWARs;
 
     }
-    
-    
+
+
     // --------------------------------------------------------- Public Methods
 
 
@@ -308,15 +308,15 @@ public class HostConfig
 
     }
 
-    
+
     /**
      * Add a serviced application to the list.
      */
     public synchronized void addServiced(String name) {
         serviced.add(name);
     }
-    
-    
+
+
     /**
      * Is application serviced ?
      * @return state of the application
@@ -324,7 +324,7 @@ public class HostConfig
     public synchronized boolean isServiced(String name) {
         return (serviced.contains(name));
     }
-    
+
 
     /**
      * Removed a serviced application from the list.
@@ -333,7 +333,7 @@ public class HostConfig
         serviced.remove(name);
     }
 
-    
+
     /**
      * Get the instant where an application was deployed.
      * @return 0L if no application with that name is deployed, or the instant
@@ -344,11 +344,11 @@ public class HostConfig
         if (app == null) {
             return 0L;
         }
-        
+
         return app.timestamp;
     }
-    
-    
+
+
     /**
      * Has the specified application been deployed? Note applications defined
      * in server.xml will not have been deployed.
@@ -361,14 +361,14 @@ public class HostConfig
         if (app == null) {
             return false;
         }
-        
+
         return true;
     }
-    
-    
+
+
     // ------------------------------------------------------ Protected Methods
 
-    
+
     /**
      * Create the digester which will be used to parse context config files.
      */
@@ -378,12 +378,12 @@ public class HostConfig
         // Add object creation rule
         digester.addObjectCreate("Context", "org.apache.catalina.core.StandardContext",
             "className");
-        // Set the properties on that object (it doesn't matter if extra 
+        // Set the properties on that object (it doesn't matter if extra
         // properties are set)
         digester.addSetProperties("Context");
         return (digester);
     }
-    
+
     protected File returnCanonicalPath(String path) {
         File file = new File(path);
         File base = new File(System.getProperty(Globals.CATALINA_BASE_PROP));
@@ -395,7 +395,7 @@ public class HostConfig
             return file;
         }
     }
-    
+
 
     /**
      * Return a File object representing the "configuration root" directory
@@ -406,7 +406,7 @@ public class HostConfig
         if (configBase != null) {
             return configBase;
         }
-        
+
         if (host.getXmlBase()!=null) {
             configBase = returnCanonicalPath(host.getXmlBase());
         } else {
@@ -448,16 +448,16 @@ public class HostConfig
         deployWARs(appBase, filteredAppPaths);
         // Deploy expanded folders
         deployDirectories(appBase, filteredAppPaths);
-        
+
     }
 
 
     /**
      * Filter the list of application file paths to remove those that match
      * the regular expression defined by {@link Host#getDeployIgnore()}.
-     *  
+     *
      * @param unfilteredAppPaths    The list of application paths to filtert
-     * 
+     *
      * @return  The filtered list of application paths
      */
     protected String[] filterAppPaths(String[] unfilteredAppPaths) {
@@ -496,7 +496,7 @@ public class HostConfig
         File configBase = configBase();
         ContextName cn = new ContextName(name);
         String baseName = cn.getBaseName();
-        
+
         // Deploy XML descriptors from configBase
         File xml = new File(configBase, baseName + ".xml");
         if (xml.exists())
@@ -519,7 +519,7 @@ public class HostConfig
 
         if (files == null)
             return;
-        
+
         for (int i = 0; i < files.length; i++) {
             File contextXml = new File(configBase, files[i]);
 
@@ -529,7 +529,7 @@ public class HostConfig
 
                 if (isServiced(name))
                     continue;
-                
+
                 deployDescriptor(cn, contextXml);
             }
         }
@@ -544,7 +544,7 @@ public class HostConfig
         if (deploymentExists(cn.getName())) {
             return;
         }
-        
+
         DeployedApplication deployedApp = new DeployedApplication(cn.getName());
 
         // Assume this is a configuration descriptor and deploy it
@@ -638,7 +638,7 @@ public class HostConfig
                 if (expandedDocBase.exists()) {
                     deployedApp.redeployResources.put(expandedDocBase.getAbsolutePath(),
                             Long.valueOf(expandedDocBase.lastModified()));
-                    addWatchedResources(deployedApp, 
+                    addWatchedResources(deployedApp,
                             expandedDocBase.getAbsolutePath(), context);
                 } else {
                     addWatchedResources(deployedApp, null, context);
@@ -666,12 +666,12 @@ public class HostConfig
      * Deploy WAR files.
      */
     protected void deployWARs(File appBase, String[] files) {
-        
+
         if (files == null)
             return;
-        
+
         for (int i = 0; i < files.length; i++) {
-            
+
             if (files[i].equalsIgnoreCase("META-INF"))
                 continue;
             if (files[i].equalsIgnoreCase("WEB-INF"))
@@ -679,9 +679,9 @@ public class HostConfig
             File war = new File(appBase, files[i]);
             if (files[i].toLowerCase(Locale.ENGLISH).endsWith(".war") && war.isFile()
                     && !invalidWars.contains(files[i]) ) {
-                
+
                 ContextName cn = new ContextName(files[i]);
-                
+
                 // Check for WARs with /../ /./ or similar sequences in the name
                 if (!validateContextPath(appBase, cn.getBaseName())) {
                     log.error(sm.getString(
@@ -692,7 +692,7 @@ public class HostConfig
 
                 if (isServiced(cn.getName()))
                     continue;
-                
+
                 deployWAR(cn, war);
             }
         }
@@ -702,10 +702,10 @@ public class HostConfig
     private boolean validateContextPath(File appBase, String contextPath) {
         // More complicated than the ideal as the canonical path may or may
         // not end with File.separator for a directory
-        
+
         StringBuilder docBase;
         String canonicalDocBase = null;
-        
+
         try {
             String canonicalAppBase = appBase.getCanonicalPath();
             docBase = new StringBuilder(canonicalAppBase);
@@ -717,10 +717,10 @@ public class HostConfig
             }
             // At this point docBase should be canonical but will not end
             // with File.separator
-            
+
             canonicalDocBase =
                 (new File(docBase.toString())).getCanonicalPath();
-    
+
             // If the canonicalDocBase ends with File.separator, add one to
             // docBase before they are compared
             if (canonicalDocBase.endsWith(File.separator)) {
@@ -729,9 +729,9 @@ public class HostConfig
         } catch (IOException ioe) {
             return false;
         }
-        
+
         // Compare the two. If they are not the same, the contextPath must
-        // have /../ like sequences in it 
+        // have /../ like sequences in it
         return canonicalDocBase.equals(docBase.toString());
     }
 
@@ -740,10 +740,10 @@ public class HostConfig
      * @param war
      */
     protected void deployWAR(ContextName cn, File war) {
-        
+
         if (deploymentExists(cn.getName()))
             return;
-        
+
         // Checking for a nested /META-INF/context.xml
         JarFile jar = null;
         JarEntry entry = null;
@@ -757,7 +757,7 @@ public class HostConfig
                     cn.getBaseName() + "/META-INF/context.xml");
         }
         boolean xmlInWar = false;
-        
+
         if (deployXML && !xml.exists()) {
             try {
                 jar = new JarFile(war);
@@ -767,7 +767,7 @@ public class HostConfig
                 }
                 if ((copyXML || unpackWARs) && xmlInWar) {
                     istream = jar.getInputStream(entry);
-                    
+
                     ostream =
                         new BufferedOutputStream
                         (new FileOutputStream(xml), 1024);
@@ -815,11 +815,11 @@ public class HostConfig
                 }
             }
         }
-        
+
         DeployedApplication deployedApp = new DeployedApplication(cn.getName());
-        
+
         // Deploy the application in this WAR file
-        if(log.isInfoEnabled()) 
+        if(log.isInfoEnabled())
             log.info(sm.getString("hostConfig.deployWar",
                     war.getAbsolutePath()));
 
@@ -922,7 +922,7 @@ public class HostConfig
             log.error(sm.getString("hostConfig.deployWar.error",
                     war.getAbsolutePath()), t);
         }
-        
+
         deployed.put(cn.getName(), deployedApp);
     }
 
@@ -934,7 +934,7 @@ public class HostConfig
 
         if (files == null)
             return;
-        
+
         for (int i = 0; i < files.length; i++) {
 
             if (files[i].equalsIgnoreCase("META-INF"))
@@ -953,20 +953,20 @@ public class HostConfig
         }
     }
 
-    
+
     /**
      * @param cn
      * @param dir
      */
     protected void deployDirectory(ContextName cn, File dir) {
-        
+
         if (deploymentExists(cn.getName()))
             return;
 
         DeployedApplication deployedApp = new DeployedApplication(cn.getName());
 
         // Deploy the application in this directory
-        if( log.isInfoEnabled() ) 
+        if( log.isInfoEnabled() )
             log.info(sm.getString("hostConfig.deployDir",
                     dir.getAbsolutePath()));
         try {
@@ -1042,24 +1042,24 @@ public class HostConfig
             addWatchedResources(deployedApp, dir.getAbsolutePath(), context);
         } catch (Throwable t) {
             ExceptionUtils.handleThrowable(t);
-            log.error(sm.getString("hostConfig.deployDir.error", 
+            log.error(sm.getString("hostConfig.deployDir.error",
                     dir.getAbsolutePath()), t);
         }
 
         deployed.put(cn.getName(), deployedApp);
     }
 
-    
+
     /**
      * Check if a webapp is already deployed in this host.
-     * 
+     *
      * @param contextName of the context which will be checked
      */
     protected boolean deploymentExists(String contextName) {
         return (deployed.containsKey(contextName) ||
                 (host.findChild(contextName) != null));
     }
-    
+
 
     /**
      * Add watched resources to the specified Context.
@@ -1095,11 +1095,11 @@ public class HostConfig
             if(log.isDebugEnabled())
                 log.debug("Watching WatchedResource '" +
                         resource.getAbsolutePath() + "'");
-            app.reloadResources.put(resource.getAbsolutePath(), 
+            app.reloadResources.put(resource.getAbsolutePath(),
                     Long.valueOf(resource.lastModified()));
         }
     }
-    
+
 
     /**
      * Check resources for redeployment and reloading.
@@ -1171,7 +1171,7 @@ public class HostConfig
                 // Undeploy application
                 if (log.isInfoEnabled())
                     log.info(sm.getString("hostConfig.undeploy", app.name));
-                ContainerBase context = 
+                ContainerBase context =
                     (ContainerBase) host.findChild(app.name);
                 try {
                     host.removeChild(context);
@@ -1232,7 +1232,7 @@ public class HostConfig
                         "] reload resource " + resource);
             long lastModified =
                 app.reloadResources.get(resources[i]).longValue();
-            if ((!resource.exists() && lastModified != 0L) 
+            if ((!resource.exists() && lastModified != 0L)
                 || (resource.lastModified() != lastModified)) {
                 // Reload application
                 if(log.isInfoEnabled())
@@ -1247,7 +1247,7 @@ public class HostConfig
                     log.warn(sm.getString
                              ("hostConfig.context.restart", app.name), e);
                 }
-                // If the context was not started (for example an error 
+                // If the context was not started (for example an error
                 // in web.xml) we'll still get to try to start
                 try {
                     context.start();
@@ -1263,8 +1263,8 @@ public class HostConfig
             }
         }
     }
-    
-    
+
+
     /**
      * Process a "start" event for this Host.
      */
@@ -1282,7 +1282,7 @@ public class HostConfig
         } catch (Exception e) {
             log.error(sm.getString("hostConfig.jmx.register", oname), e);
         }
-        
+
         if (host.getCreateDirs()) {
             File[] dirs = new File[] {host.getAppBaseFile(),configBase()};
             for (int i=0; i<dirs.length; i++) {
@@ -1301,7 +1301,7 @@ public class HostConfig
 
         if (host.getDeployOnStartup())
             deployApps();
-        
+
     }
 
 
@@ -1333,7 +1333,7 @@ public class HostConfig
 
         if (host.getAutoDeploy()) {
             // Check for resources modification to trigger redeployment
-            DeployedApplication[] apps = 
+            DeployedApplication[] apps =
                 deployed.values().toArray(new DeployedApplication[0]);
             for (int i = 0; i < apps.length; i++) {
                 if (!isServiced(apps[i].name))
@@ -1345,7 +1345,7 @@ public class HostConfig
 
     }
 
-    
+
     /**
      * Check status of a specific webapp, for use with stuff like management webapps.
      */
@@ -1362,15 +1362,15 @@ public class HostConfig
      * Add a new Context to be managed by us.
      * Entry point for the admin webapp, and other JMX Context controllers.
      */
-    public void manageApp(Context context)  {    
+    public void manageApp(Context context)  {
 
         String contextName = context.getName();
-        
+
         if (deployed.containsKey(contextName))
             return;
 
         DeployedApplication deployedApp = new DeployedApplication(contextName);
-        
+
         // Add the associated docBase to the redeployed list if it's a WAR
         boolean isWar = false;
         if (context.getDocBase() != null) {
@@ -1413,22 +1413,22 @@ public class HostConfig
 
 
     /**
-     * This class represents the state of a deployed application, as well as 
+     * This class represents the state of a deployed application, as well as
      * the monitored resources.
      */
     protected static class DeployedApplication {
         public DeployedApplication(String name) {
             this.name = name;
         }
-        
+
         /**
-         * Application context path. The assertion is that 
+         * Application context path. The assertion is that
          * (host.getChild(name) != null).
          */
         public String name;
-        
+
         /**
-         * Any modification of the specified (static) resources will cause a 
+         * Any modification of the specified (static) resources will cause a
          * redeployment of the application. If any of the specified resources is
          * removed, the application will be undeployed. Typically, this will
          * contain resources like the context.xml file, a compressed WAR path.
@@ -1438,7 +1438,7 @@ public class HostConfig
             new LinkedHashMap<String, Long>();
 
         /**
-         * Any modification of the specified (static) resources will cause a 
+         * Any modification of the specified (static) resources will cause a
          * reload of the application. This will typically contain resources
          * such as the web.xml of a webapp, but can be configured to contain
          * additional descriptors.

Modified: tomcat/trunk/java/org/apache/catalina/startup/HostRuleSet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostRuleSet.java?rev=1187791&r1=1187790&r2=1187791&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/HostRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostRuleSet.java Sat Oct 22 21:11:34 2011
@@ -5,9 +5,9 @@
  * 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.

Modified: tomcat/trunk/java/org/apache/catalina/startup/LifecycleListenerRule.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LifecycleListenerRule.java?rev=1187791&r1=1187790&r2=1187791&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/LifecycleListenerRule.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LifecycleListenerRule.java Sat Oct 22 21:11:34 2011
@@ -5,9 +5,9 @@
  * 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.
@@ -100,7 +100,7 @@ public class LifecycleListenerRule exten
         }
 
         String className = null;
-        
+
         // Check the container for the specified attribute
         if (attributeName != null) {
             String value = attributes.getValue(attributeName);
@@ -116,12 +116,12 @@ public class LifecycleListenerRule exten
                 className = configClass;
             }
         }
-        
+
         // Use the default
         if (className == null) {
             className = listenerClass;
         }
-        
+
         // Instantiate a new LifecyleListener implementation object
         Class<?> clazz = Class.forName(className);
         LifecycleListener listener =

Modified: tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties?rev=1187791&r1=1187790&r2=1187791&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties Sat Oct 22 21:11:34 2011
@@ -37,13 +37,13 @@ contextConfig.defaultMissing=No global w
 contextConfig.defaultPosition=Occurred at line {0} column {1}
 contextConfig.destroy=ContextConfig: Destroying
 contextConfig.fileUrl=Unable to create a File object from the URL [{0}]
-contextConfig.fixDocBase=Exception fixing docBase for context [{0}] 
+contextConfig.fixDocBase=Exception fixing docBase for context [{0}]
 contextConfig.init=ContextConfig: Initializing
 contextConfig.inputStreamFile=Unable to process file [{0}] for annotations
 contextConfig.inputStreamJar=Unable to process Jar entry [{0}] from Jar [{1}] for annotations
 contextConfig.inputStreamJndi=Unable to process resource element [{0}] for annotations
 contextConfig.invalidSci=The ServletContentInitializer [{0}] could not be created
-contextConfig.invalidSciHandlesTypes=Unable to load class [{0}] to check against the @HandlesTypes annotation of one or more ServletContentInitializers. 
+contextConfig.invalidSciHandlesTypes=Unable to load class [{0}] to check against the @HandlesTypes annotation of one or more ServletContentInitializers.
 contextConfig.jarUrl=The connection created for URL [{0}] was not a JarUrlConnection
 contextConfig.jar=Unable to process resource [{0}] for annotations
 contextConfig.jndiUrl=Unable to process JNDI URL [{0}] for annotations
@@ -125,5 +125,5 @@ userConfig.start=UserConfig: Processing 
 userConfig.stop=UserConfig: Processing STOP
 webRuleSet.absoluteOrdering=<absolute-ordering> element not valid in web-fragment.xml and will be ignored
 webRuleSet.relativeOrdering=<ordering> element not valid in web.xml and will be ignored
-xmlErrorHandler.error=Non-fatal error [{0}] reported processing [{1}]. 
-xmlErrorHandler.warning=Warning [{0}] reported processing [{1}]. 
+xmlErrorHandler.error=Non-fatal error [{0}] reported processing [{1}].
+xmlErrorHandler.warning=Warning [{0}] reported processing [{1}].

Modified: tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties?rev=1187791&r1=1187790&r2=1187791&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties Sat Oct 22 21:11:34 2011
@@ -42,7 +42,7 @@ contextConfig.inputStreamFile = No puedo
 contextConfig.inputStreamJar = No puedo procesar la entrada de Jar [{0}] desde el Jar [{1}] para las anotaciones
 contextConfig.inputStreamJndi = No puedo procesar el elemento de recurso [{0}] para las anotaciones
 contextConfig.invalidSci = No se pudo crear el ServletContentInitializer [{0}]
-contextConfig.invalidSciHandlesTypes = No puedo cargar la clase [{0}] para revisar contra la anotaci\u00F3n  @HandlesTypes de uno o m\u00E1s ServletContentInitializers. 
+contextConfig.invalidSciHandlesTypes = No puedo cargar la clase [{0}] para revisar contra la anotaci\u00F3n  @HandlesTypes de uno o m\u00E1s ServletContentInitializers.
 contextConfig.jarUrl = La conexi\u00F3n creada para la URL [{0}] no era una JarUrlConnection
 contextConfig.jar = No puedo crear el recurso [{0}] para las anotaciones
 contextConfig.jndiUrl = No puedo procesar la URL JNDI [{0}] para las anotaciones
@@ -121,5 +121,5 @@ userConfig.start = "UserConfig"\: Tratam
 userConfig.stop = "UserConfig"\: Tratamiento del "STOP"
 webRuleSet.absoluteOrdering = Elemento <absolute-ordering> no v\u00E1lido en web-fragment.xml y ser\u00E1 ignorado
 webRuleSet.relativeOrdering = elemento <ordering> no v\u00E1lido en web.xml y ser\u00E1 ignorado
-xmlErrorHandler.error = Error no fatal [{0}] reportado por el proceso [{1}]. 
-xmlErrorHandler.warning = Aviso [{0}] reportado por el proceso [{1}]. 
+xmlErrorHandler.error = Error no fatal [{0}] reportado por el proceso [{1}].
+xmlErrorHandler.warning = Aviso [{0}] reportado por el proceso [{1}].

Modified: tomcat/trunk/java/org/apache/catalina/startup/NamingRuleSet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/NamingRuleSet.java?rev=1187791&r1=1187790&r2=1187791&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/NamingRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/NamingRuleSet.java Sat Oct 22 21:11:34 2011
@@ -5,9 +5,9 @@
  * 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.

Modified: tomcat/trunk/java/org/apache/catalina/startup/PasswdUserDatabase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/PasswdUserDatabase.java?rev=1187791&r1=1187790&r2=1187791&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/PasswdUserDatabase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/PasswdUserDatabase.java Sat Oct 22 21:11:34 2011
@@ -5,9 +5,9 @@
  * 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.

Modified: tomcat/trunk/java/org/apache/catalina/startup/RealmRuleSet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/RealmRuleSet.java?rev=1187791&r1=1187790&r2=1187791&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/RealmRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/RealmRuleSet.java Sat Oct 22 21:11:34 2011
@@ -5,9 +5,9 @@
  * 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.

Modified: tomcat/trunk/java/org/apache/catalina/startup/SetAllPropertiesRule.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/SetAllPropertiesRule.java?rev=1187791&r1=1187790&r2=1187791&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/SetAllPropertiesRule.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/SetAllPropertiesRule.java Sat Oct 22 21:11:34 2011
@@ -5,9 +5,9 @@
  * 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.
@@ -26,16 +26,16 @@ import org.xml.sax.Attributes;
 
 /**
  * Rule that uses the introspection utils to set properties.
- * 
+ *
  * @author Remy Maucherat
  * @author Filip Hanik
  */
 public class SetAllPropertiesRule extends Rule {
 
-    
+
     // ----------------------------------------------------------- Constructors
     public SetAllPropertiesRule() {}
-    
+
     public SetAllPropertiesRule(String[] exclude) {
         for (int i=0; i<exclude.length; i++ ) if (exclude[i]!=null) this.excludes.put(exclude[i],exclude[i]);
     }
@@ -64,8 +64,8 @@ public class SetAllPropertiesRule extend
             }
             String value = attributes.getValue(i);
             if ( !excludes.containsKey(name)) {
-                if (!digester.isFakeAttribute(digester.peek(), name) 
-                        && !IntrospectionUtils.setProperty(digester.peek(), name, value) 
+                if (!digester.isFakeAttribute(digester.peek(), name)
+                        && !IntrospectionUtils.setProperty(digester.peek(), name, value)
                         && digester.getRulesValidation()) {
                     digester.getLogger().warn("[SetAllPropertiesRule]{" + digester.getMatch() +
                             "} Setting property '" + name + "' to '" +

Modified: tomcat/trunk/java/org/apache/catalina/startup/SetContextPropertiesRule.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/SetContextPropertiesRule.java?rev=1187791&r1=1187790&r2=1187791&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/SetContextPropertiesRule.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/SetContextPropertiesRule.java Sat Oct 22 21:11:34 2011
@@ -5,9 +5,9 @@
  * 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.
@@ -23,9 +23,9 @@ import org.apache.tomcat.util.digester.R
 import org.xml.sax.Attributes;
 
 /**
- * Rule that uses the introspection utils to set properties of a context 
+ * Rule that uses the introspection utils to set properties of a context
  * (everything except "path").
- * 
+ *
  * @author Remy Maucherat
  */
 public class SetContextPropertiesRule extends Rule {
@@ -60,8 +60,8 @@ public class SetContextPropertiesRule ex
                 continue;
             }
             String value = attributes.getValue(i);
-            if (!digester.isFakeAttribute(digester.peek(), name) 
-                    && !IntrospectionUtils.setProperty(digester.peek(), name, value) 
+            if (!digester.isFakeAttribute(digester.peek(), name)
+                    && !IntrospectionUtils.setProperty(digester.peek(), name, value)
                     && digester.getRulesValidation()) {
                 digester.getLogger().warn("[SetContextPropertiesRule]{" + digester.getMatch() +
                         "} Setting property '" + name + "' to '" +

Modified: tomcat/trunk/java/org/apache/catalina/startup/SetNextNamingRule.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/SetNextNamingRule.java?rev=1187791&r1=1187790&r2=1187791&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/SetNextNamingRule.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/SetNextNamingRule.java Sat Oct 22 21:11:34 2011
@@ -5,15 +5,15 @@
  * 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.
- */ 
+ */
 
 
 package org.apache.catalina.startup;
@@ -30,9 +30,9 @@ import org.apache.tomcat.util.digester.R
  * commonly used to establish parent-child relationships.</p>
  *
  * <p>This rule now supports more flexible method matching by default.
- * It is possible that this may break (some) code 
+ * It is possible that this may break (some) code
  * written against release 1.1.1 or earlier.
- * </p> 
+ * </p>
  */
 
 public class SetNextNamingRule extends Rule {
@@ -40,7 +40,7 @@ public class SetNextNamingRule extends R
 
     // ----------------------------------------------------------- Constructors
 
-    
+
     /**
      * Construct a "set next" rule with the specified method name.
      *
@@ -79,11 +79,11 @@ public class SetNextNamingRule extends R
 
     /**
      * Process the end of this element.
-     * 
-     * @param namespace the namespace URI of the matching element, or an 
+     *
+     * @param namespace the namespace URI of the matching element, or an
      *   empty string if the parser is not namespace aware or the element has
      *   no namespace
-     * @param name the local name if the parser is namespace aware, or just 
+     * @param name the local name if the parser is namespace aware, or just
      *   the element name otherwise
      */
     @Override
@@ -99,7 +99,7 @@ public class SetNextNamingRule extends R
         } else {
             namingResources = (NamingResources) parent;
         }
-        
+
         // Call the specified method
         IntrospectionUtils.callMethod1(namingResources, methodName,
                 child, paramType, digester.getClassLoader());

Modified: tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java?rev=1187791&r1=1187790&r2=1187791&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java Sat Oct 22 21:11:34 2011
@@ -5,9 +5,9 @@
  * 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.
@@ -60,7 +60,7 @@ public final class TldConfig  implements
     private static final String TLD_EXT = ".tld";
     private static final String WEB_INF = "/WEB-INF/";
     private static final String WEB_INF_LIB = "/WEB-INF/lib/";
-    
+
     // Names of JARs that are known not to contain any TLDs
     private static volatile Set<String> noTldJars = null;
 
@@ -84,7 +84,7 @@ public final class TldConfig  implements
      */
     private static Digester createTldDigester(boolean namespaceAware,
             boolean validation) {
-        
+
         Digester digester = null;
         if (!namespaceAware && !validation) {
             if (tldDigesters[0] == null) {
@@ -171,7 +171,7 @@ public final class TldConfig  implements
     /**
      * Sets the list of JARs that are known not to contain any TLDs.
      *
-     * @param jarNames List of comma-separated names of JAR files that are 
+     * @param jarNames List of comma-separated names of JAR files that are
      * known not to contain any TLDs.
      */
     public static void setNoTldJars(String jarNames) {
@@ -214,10 +214,10 @@ public final class TldConfig  implements
     /**
      * Scan for and configure all tag library descriptors found in this
      * web application.
-     * 
+     *
      * This supports a Tomcat-specific extension to the TLD search
      * order defined in the JSP spec. It allows tag libraries packaged as JAR
-     * files to be shared by web applications by simply dropping them in a 
+     * files to be shared by web applications by simply dropping them in a
      * location that all web applications have access to (e.g.,
      * <CATALINA_HOME>/lib). It also supports some of the weird and
      * wonderful arrangements present when Tomcat gets embedded.
@@ -235,13 +235,13 @@ public final class TldConfig  implements
          * 2. web.xml entries
          * 3. JARS in WEB-INF/lib & TLDs under WEB-INF (equal priority)
          * 4. Additional entries from the container
-         * 
+         *
          * Keep processing order in sync with o.a.j.compiler.TldLocationsCache
          */
-        
+
         // Stage 2 - web.xml entries
         tldScanWebXml();
-        
+
         // Stage 3a - TLDs under WEB-INF (not lib or classes)
         tldScanResourcePaths(WEB_INF);
 
@@ -250,7 +250,7 @@ public final class TldConfig  implements
         jarScanner.scan(context.getServletContext(),
                 context.getLoader().getClassLoader(),
                 new TldJarScannerCallback(), noTldJars);
-        
+
         // Now add all the listeners we found to the listeners for this context
         String list[] = getTldListeners();
 
@@ -290,13 +290,13 @@ public final class TldConfig  implements
 
     /**
      * Get the taglib entries from web.xml and add them to the map.
-     * 
+     *
      * This is not kept in sync with o.a.j.compiler.TldLocationsCache as this
      * code needs to scan the TLDs listed in web.xml whereas Jasper only needs
      * the URI to TLD mappings.
      */
     private void tldScanWebXml() {
-        
+
         if (log.isTraceEnabled()) {
             log.trace(sm.getString("tldConfig.webxmlStart"));
         }
@@ -344,7 +344,7 @@ public final class TldConfig  implements
             }
         }
     }
-    
+
     /*
      * Scans the web application's sub-directory identified by startPath,
      * along with its sub-directories, for TLDs.
@@ -352,7 +352,7 @@ public final class TldConfig  implements
      * Initially, rootPath equals /WEB-INF/. The /WEB-INF/classes and
      * /WEB-INF/lib sub-directories are excluded from the search, as per the
      * JSP 2.0 spec.
-     * 
+     *
      * Keep in sync with o.a.j.comiler.TldLocationsCache
      */
     private void tldScanResourcePaths(String startPath) {
@@ -400,7 +400,7 @@ public final class TldConfig  implements
             }
         }
     }
-    
+
     /*
      * Scans the directory identified by startPath, along with its
      * sub-directories, for TLDs.
@@ -448,17 +448,17 @@ public final class TldConfig  implements
      * (or a sub-directory of it).
      *
      * @param jarConn The JarURLConnection to the JAR file to scan
-     * 
+     *
      * Keep in sync with o.a.j.comiler.TldLocationsCache
      */
     private void tldScanJar(JarURLConnection jarConn) {
 
         Jar jar = null;
         InputStream is;
-        
+
         try {
             jar = JarFactory.newInstance(jarConn.getURL());
-            
+
             jar.nextEntry();
             String entryName = jar.getEntryName();
             while (entryName != null) {
@@ -494,7 +494,7 @@ public final class TldConfig  implements
 
     /*
      * Scan the TLD contents in the specified input stream, and register
-     * any application event listeners found there.  <b>NOTE</b> - This 
+     * any application event listeners found there.  <b>NOTE</b> - This
      * method ensure that the InputStream is correctly closed.
      *
      * @param resourceStream InputStream containing a tag library descriptor
@@ -503,11 +503,11 @@ public final class TldConfig  implements
      */
     private XmlErrorHandler tldScanStream(InputStream resourceStream)
             throws IOException {
-        
+
         InputSource source = new InputSource(resourceStream);
-        
+
         XmlErrorHandler result = new XmlErrorHandler();
-        
+
         synchronized (tldDigester) {
             try {
                 tldDigester.setErrorHandler(result);
@@ -532,7 +532,7 @@ public final class TldConfig  implements
             log.error(sm.getString("tldConfig.cce", event.getLifecycle()), e);
             return;
         }
-        
+
         if (event.getType().equals(Lifecycle.AFTER_INIT_EVENT)) {
             init();
         } else if (event.getType().equals(Lifecycle.CONFIGURE_START_EVENT)) {
@@ -548,7 +548,7 @@ public final class TldConfig  implements
             listeners.clear();
         }
     }
-    
+
     private void init() {
         if (tldDigester == null){
             tldDigester = createTldDigester(context.getTldNamespaceAware(),

Modified: tomcat/trunk/java/org/apache/catalina/startup/TldRuleSet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/TldRuleSet.java?rev=1187791&r1=1187790&r2=1187791&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/TldRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/TldRuleSet.java Sat Oct 22 21:11:34 2011
@@ -5,9 +5,9 @@
  * 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.
@@ -90,10 +90,10 @@ public class TldRuleSet extends RuleSetB
     public void addRuleInstances(Digester digester) {
 
         // Note the sharing of state between rules
-        TaglibUriRule taglibUriRule = new TaglibUriRule(); 
+        TaglibUriRule taglibUriRule = new TaglibUriRule();
 
         digester.addRule(prefix + "taglib", new TaglibRule(taglibUriRule));
-        
+
         digester.addRule(prefix + "taglib/uri", taglibUriRule);
 
         digester.addRule(prefix + "taglib/listener/listener-class",
@@ -109,11 +109,11 @@ public class TldRuleSet extends RuleSetB
  */
 final class TaglibRule extends Rule {
     private final TaglibUriRule taglibUriRule;
-    
+
     public TaglibRule(TaglibUriRule taglibUriRule) {
         this.taglibUriRule = taglibUriRule;
     }
-    
+
     @Override
     public void body(String namespace, String name, String text)
     throws Exception {
@@ -123,10 +123,10 @@ final class TaglibRule extends Rule {
 }
 
 final class TaglibUriRule extends Rule {
-    
+
     // This is set to false for each file processed by the TaglibRule
     private boolean duplicateUri;
-    
+
     public TaglibUriRule() {
     }
 
@@ -154,7 +154,7 @@ final class TaglibUriRule extends Rule {
             tldConfig.addTaglibUri(text);
         }
     }
-    
+
     public boolean isDuplicateUri() {
         return duplicateUri;
     }
@@ -166,9 +166,9 @@ final class TaglibUriRule extends Rule {
 }
 
 final class TaglibListenerRule extends Rule {
-    
+
     private final TaglibUriRule taglibUriRule;
-    
+
     public TaglibListenerRule(TaglibUriRule taglibUriRule) {
         this.taglibUriRule = taglibUriRule;
     }
@@ -178,11 +178,11 @@ final class TaglibListenerRule extends R
             throws Exception {
         TldConfig tldConfig =
             (TldConfig) digester.peek(digester.getCount() - 1);
-        
+
         // Only process the listener if the URI is not a duplicate
         if (!taglibUriRule.isDuplicateUri()) {
             tldConfig.addApplicationListener(text);
         }
     }
-    
+
 }
\ No newline at end of file



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message