tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1187803 [1/6] - in /tomcat/trunk/java/org/apache/jasper: ./ compiler/ compiler/tagplugin/ el/ resources/ runtime/ security/ servlet/ tagplugins/jstl/ tagplugins/jstl/core/ util/ xmlparser/
Date Sat, 22 Oct 2011 21:18:07 GMT
Author: markt
Date: Sat Oct 22 21:18:03 2011
New Revision: 1187803

URL: http://svn.apache.org/viewvc?rev=1187803&view=rev
Log:
Whitespace removal from remaining /java/org/apache/jasper

Modified:
    tomcat/trunk/java/org/apache/jasper/Constants.java
    tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
    tomcat/trunk/java/org/apache/jasper/JasperException.java
    tomcat/trunk/java/org/apache/jasper/JspC.java
    tomcat/trunk/java/org/apache/jasper/Options.java
    tomcat/trunk/java/org/apache/jasper/compiler/AntCompiler.java
    tomcat/trunk/java/org/apache/jasper/compiler/AttributeParser.java
    tomcat/trunk/java/org/apache/jasper/compiler/BeanRepository.java
    tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java
    tomcat/trunk/java/org/apache/jasper/compiler/DefaultErrorHandler.java
    tomcat/trunk/java/org/apache/jasper/compiler/Dumper.java
    tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java
    tomcat/trunk/java/org/apache/jasper/compiler/ELNode.java
    tomcat/trunk/java/org/apache/jasper/compiler/ELParser.java
    tomcat/trunk/java/org/apache/jasper/compiler/ErrorDispatcher.java
    tomcat/trunk/java/org/apache/jasper/compiler/ErrorHandler.java
    tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
    tomcat/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java
    tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java
    tomcat/trunk/java/org/apache/jasper/compiler/JarResource.java
    tomcat/trunk/java/org/apache/jasper/compiler/JarScannerFactory.java
    tomcat/trunk/java/org/apache/jasper/compiler/JarURLResource.java
    tomcat/trunk/java/org/apache/jasper/compiler/JasperTagInfo.java
    tomcat/trunk/java/org/apache/jasper/compiler/JavacErrorDetail.java
    tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java
    tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
    tomcat/trunk/java/org/apache/jasper/compiler/JspReader.java
    tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
    tomcat/trunk/java/org/apache/jasper/compiler/Localizer.java
    tomcat/trunk/java/org/apache/jasper/compiler/Mark.java
    tomcat/trunk/java/org/apache/jasper/compiler/Node.java
    tomcat/trunk/java/org/apache/jasper/compiler/PageDataImpl.java
    tomcat/trunk/java/org/apache/jasper/compiler/PageInfo.java
    tomcat/trunk/java/org/apache/jasper/compiler/Parser.java
    tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java
    tomcat/trunk/java/org/apache/jasper/compiler/ScriptingVariabler.java
    tomcat/trunk/java/org/apache/jasper/compiler/ServletWriter.java
    tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java
    tomcat/trunk/java/org/apache/jasper/compiler/SmapStratum.java
    tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java
    tomcat/trunk/java/org/apache/jasper/compiler/TagConstants.java
    tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
    tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
    tomcat/trunk/java/org/apache/jasper/compiler/TagPluginManager.java
    tomcat/trunk/java/org/apache/jasper/compiler/TextOptimizer.java
    tomcat/trunk/java/org/apache/jasper/compiler/TldLocation.java
    tomcat/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
    tomcat/trunk/java/org/apache/jasper/compiler/Validator.java
    tomcat/trunk/java/org/apache/jasper/compiler/WebXml.java
    tomcat/trunk/java/org/apache/jasper/compiler/tagplugin/TagPlugin.java
    tomcat/trunk/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java
    tomcat/trunk/java/org/apache/jasper/el/ELContextImpl.java
    tomcat/trunk/java/org/apache/jasper/el/ELContextWrapper.java
    tomcat/trunk/java/org/apache/jasper/el/ELResolverImpl.java
    tomcat/trunk/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java
    tomcat/trunk/java/org/apache/jasper/el/ExpressionImpl.java
    tomcat/trunk/java/org/apache/jasper/el/FunctionMapperImpl.java
    tomcat/trunk/java/org/apache/jasper/el/JspELException.java
    tomcat/trunk/java/org/apache/jasper/el/JspMethodExpression.java
    tomcat/trunk/java/org/apache/jasper/el/JspMethodNotFoundException.java
    tomcat/trunk/java/org/apache/jasper/el/JspPropertyNotFoundException.java
    tomcat/trunk/java/org/apache/jasper/el/JspPropertyNotWritableException.java
    tomcat/trunk/java/org/apache/jasper/el/JspValueExpression.java
    tomcat/trunk/java/org/apache/jasper/el/VariableResolverImpl.java
    tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
    tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
    tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
    tomcat/trunk/java/org/apache/jasper/runtime/BodyContentImpl.java
    tomcat/trunk/java/org/apache/jasper/runtime/HttpJspBase.java
    tomcat/trunk/java/org/apache/jasper/runtime/InstanceManagerFactory.java
    tomcat/trunk/java/org/apache/jasper/runtime/JspApplicationContextImpl.java
    tomcat/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java
    tomcat/trunk/java/org/apache/jasper/runtime/JspFactoryImpl.java
    tomcat/trunk/java/org/apache/jasper/runtime/JspFragmentHelper.java
    tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
    tomcat/trunk/java/org/apache/jasper/runtime/JspSourceDependent.java
    tomcat/trunk/java/org/apache/jasper/runtime/JspWriterImpl.java
    tomcat/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
    tomcat/trunk/java/org/apache/jasper/runtime/PerThreadTagHandlerPool.java
    tomcat/trunk/java/org/apache/jasper/runtime/ProtectedFunctionMapper.java
    tomcat/trunk/java/org/apache/jasper/runtime/ServletResponseWrapperInclude.java
    tomcat/trunk/java/org/apache/jasper/runtime/TagHandlerPool.java
    tomcat/trunk/java/org/apache/jasper/security/SecurityClassLoad.java
    tomcat/trunk/java/org/apache/jasper/security/SecurityUtil.java
    tomcat/trunk/java/org/apache/jasper/servlet/JasperLoader.java
    tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
    tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java
    tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
    tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java
    tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Catch.java
    tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Choose.java
    tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/ForEach.java
    tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/ForTokens.java
    tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/If.java
    tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Import.java
    tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Otherwise.java
    tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Out.java
    tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Param.java
    tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Redirect.java
    tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Remove.java
    tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Set.java
    tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Url.java
    tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/When.java
    tomcat/trunk/java/org/apache/jasper/util/Enumerator.java
    tomcat/trunk/java/org/apache/jasper/util/ExceptionUtils.java
    tomcat/trunk/java/org/apache/jasper/util/UniqueAttributesImpl.java
    tomcat/trunk/java/org/apache/jasper/xmlparser/ASCIIReader.java
    tomcat/trunk/java/org/apache/jasper/xmlparser/EncodingMap.java
    tomcat/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java
    tomcat/trunk/java/org/apache/jasper/xmlparser/SymbolTable.java
    tomcat/trunk/java/org/apache/jasper/xmlparser/TreeNode.java
    tomcat/trunk/java/org/apache/jasper/xmlparser/UCSReader.java
    tomcat/trunk/java/org/apache/jasper/xmlparser/UTF8Reader.java
    tomcat/trunk/java/org/apache/jasper/xmlparser/XMLChar.java
    tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java
    tomcat/trunk/java/org/apache/jasper/xmlparser/XMLString.java
    tomcat/trunk/java/org/apache/jasper/xmlparser/XMLStringBuffer.java

Modified: tomcat/trunk/java/org/apache/jasper/Constants.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/Constants.java?rev=1187803&r1=1187802&r2=1187803&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/Constants.java (original)
+++ tomcat/trunk/java/org/apache/jasper/Constants.java Sat Oct 22 21:18:03 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.
@@ -31,19 +31,19 @@ import java.util.List;
  * @author Mark Roth
  */
 public class Constants {
-    
+
     /**
-     * The base class of the generated servlets. 
+     * The base class of the generated servlets.
      */
-    public static final String JSP_SERVLET_BASE = 
+    public static final String JSP_SERVLET_BASE =
         System.getProperty("org.apache.jasper.Constants.JSP_SERVLET_BASE", "org.apache.jasper.runtime.HttpJspBase");
 
     /**
-     * _jspService is the name of the method that is called by 
+     * _jspService is the name of the method that is called by
      * HttpJspBase.service(). This is where most of the code generated
      * from JSPs go.
      */
-    public static final String SERVICE_METHOD_NAME = 
+    public static final String SERVICE_METHOD_NAME =
         System.getProperty("org.apache.jasper.Constants.SERVICE_METHOD_NAME", "_jspService");
 
     /**
@@ -53,22 +53,22 @@ public class Constants {
 
     /**
      * These classes/packages are automatically imported by the
-     * generated code. 
+     * generated code.
      */
-    private static final String[] PRIVATE_STANDARD_IMPORTS = { 
-        "javax.servlet.*", 
-        "javax.servlet.http.*", 
+    private static final String[] PRIVATE_STANDARD_IMPORTS = {
+        "javax.servlet.*",
+        "javax.servlet.http.*",
         "javax.servlet.jsp.*"
     };
     public static final List<String> STANDARD_IMPORTS =
         Collections.unmodifiableList(Arrays.asList(PRIVATE_STANDARD_IMPORTS));
 
     /**
-     * ServletContext attribute for classpath. This is tomcat specific. 
-     * Other servlet engines may choose to support this attribute if they 
-     * want to have this JSP engine running on them. 
+     * ServletContext attribute for classpath. This is tomcat specific.
+     * Other servlet engines may choose to support this attribute if they
+     * want to have this JSP engine running on them.
      */
-    public static final String SERVLET_CLASSPATH = 
+    public static final String SERVLET_CLASSPATH =
         System.getProperty("org.apache.jasper.Constants.SERVLET_CLASSPATH", "org.apache.catalina.jsp_classpath");
 
     /**
@@ -77,7 +77,7 @@ public class Constants {
      * value returned by <code>request.getServletPath()</code> to select
      * the JSP page to be executed.
      */
-    public static final String JSP_FILE = 
+    public static final String JSP_FILE =
         System.getProperty("org.apache.jasper.Constants.JSP_FILE", "org.apache.catalina.jsp_file");
 
 
@@ -103,56 +103,56 @@ public class Constants {
 
     /**
      * The query parameter that causes the JSP engine to just
-     * pregenerated the servlet but not invoke it. 
+     * pregenerated the servlet but not invoke it.
      */
-    public static final String PRECOMPILE = 
+    public static final String PRECOMPILE =
         System.getProperty("org.apache.jasper.Constants.PRECOMPILE", "jsp_precompile");
 
     /**
      * The default package name for compiled jsp pages.
      */
-    public static final String JSP_PACKAGE_NAME = 
+    public static final String JSP_PACKAGE_NAME =
         System.getProperty("org.apache.jasper.Constants.JSP_PACKAGE_NAME", "org.apache.jsp");
 
     /**
      * The default package name for tag handlers generated from tag files
      */
-    public static final String TAG_FILE_PACKAGE_NAME = 
+    public static final String TAG_FILE_PACKAGE_NAME =
         System.getProperty("org.apache.jasper.Constants.TAG_FILE_PACKAGE_NAME", "org.apache.jsp.tag");
 
     // Must be kept in sync with org/apache/catalina/Globals.java
-    public static final String ALT_DD_ATTR = 
+    public static final String ALT_DD_ATTR =
         System.getProperty("org.apache.jasper.Constants.ALT_DD_ATTR", "org.apache.catalina.deploy.alt_dd");
 
     /**
-     * Public Id and the Resource path (of the cached copy) 
-     * of the DTDs for tag library descriptors. 
+     * Public Id and the Resource path (of the cached copy)
+     * of the DTDs for tag library descriptors.
      */
-    public static final String TAGLIB_DTD_PUBLIC_ID_11 = 
+    public static final String TAGLIB_DTD_PUBLIC_ID_11 =
         "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN";
-    public static final String TAGLIB_DTD_RESOURCE_PATH_11 = 
+    public static final String TAGLIB_DTD_RESOURCE_PATH_11 =
         "/javax/servlet/jsp/resources/web-jsptaglibrary_1_1.dtd";
-    public static final String TAGLIB_DTD_PUBLIC_ID_12 = 
+    public static final String TAGLIB_DTD_PUBLIC_ID_12 =
         "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN";
-    public static final String TAGLIB_DTD_RESOURCE_PATH_12 = 
+    public static final String TAGLIB_DTD_RESOURCE_PATH_12 =
         "/javax/servlet/jsp/resources/web-jsptaglibrary_1_2.dtd";
 
     /**
-     * Public Id and the Resource path (of the cached copy) 
+     * Public Id and the Resource path (of the cached copy)
      * of the DTDs for web application deployment descriptors
      */
-    public static final String WEBAPP_DTD_PUBLIC_ID_22 = 
+    public static final String WEBAPP_DTD_PUBLIC_ID_22 =
         "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN";
-    public static final String WEBAPP_DTD_RESOURCE_PATH_22 = 
+    public static final String WEBAPP_DTD_RESOURCE_PATH_22 =
         "/javax/servlet/resources/web-app_2_2.dtd";
-    public static final String WEBAPP_DTD_PUBLIC_ID_23 = 
+    public static final String WEBAPP_DTD_PUBLIC_ID_23 =
         "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN";
-    public static final String WEBAPP_DTD_RESOURCE_PATH_23 = 
+    public static final String WEBAPP_DTD_RESOURCE_PATH_23 =
         "/javax/servlet/resources/web-app_2_3.dtd";
 
     /**
      * List of the Public IDs that we cache, and their
-     * associated location. This is used by 
+     * associated location. This is used by
      * an EntityResolver to return the location of the
      * cached copy of a DTD.
      */
@@ -175,14 +175,14 @@ public class Constants {
     public static final List<String> CACHED_DTD_RESOURCE_PATHS =
         Collections.unmodifiableList(
                 Arrays.asList(PRIVATE_CACHED_DTD_RESOURCE_PATHS));
-    
+
     /**
      * Default URLs to download the plugin for Netscape and IE.
      */
-    public static final String NS_PLUGIN_URL = 
+    public static final String NS_PLUGIN_URL =
         "http://java.sun.com/products/plugin/";
 
-    public static final String IE_PLUGIN_URL = 
+    public static final String IE_PLUGIN_URL =
         "http://java.sun.com/products/plugin/1.2.2/jinstall-1_2_2-win.cab#Version=1,2,2,0";
 
     /**
@@ -194,7 +194,7 @@ public class Constants {
     /**
      * Has security been turned on?
      */
-    public static final boolean IS_SECURITY_ENABLED = 
+    public static final boolean IS_SECURITY_ENABLED =
         (System.getSecurityManager() != null);
 
     public static final boolean USE_INSTANCE_MANAGER_FOR_TAGS =

Modified: tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java?rev=1187803&r1=1187802&r2=1187803&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java (original)
+++ tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java Sat Oct 22 21:18:03 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.
@@ -35,159 +35,159 @@ import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 
 /**
- * A class to hold all init parameters specific to the JSP engine. 
+ * A class to hold all init parameters specific to the JSP engine.
  *
  * @author Anil K. Vijendran
  * @author Hans Bergsten
  * @author Pierre Delisle
  */
 public final class EmbeddedServletOptions implements Options {
-    
+
     // Logger
     private final Log log = LogFactory.getLog(EmbeddedServletOptions.class);
-    
+
     private Properties settings = new Properties();
-    
+
     /**
      * Is Jasper being used in development mode?
      */
     private boolean development = true;
-    
+
     /**
      * Should Ant fork its java compiles of JSP pages.
      */
     public boolean fork = true;
-    
+
     /**
      * Do you want to keep the generated Java files around?
      */
     private boolean keepGenerated = true;
-    
+
     /**
      * Should white spaces between directives or actions be trimmed?
      */
     private boolean trimSpaces = false;
-    
+
     /**
      * Determines whether tag handler pooling is enabled.
      */
     private boolean isPoolingEnabled = true;
-    
+
     /**
      * Do you want support for "mapped" files? This will generate
      * servlet that has a print statement per line of the JSP file.
      * This seems like a really nice feature to have for debugging.
      */
     private boolean mappedFile = true;
-    
+
     /**
      * Do we want to include debugging information in the class file?
      */
     private boolean classDebugInfo = true;
-    
+
     /**
      * Background compile thread check interval in seconds.
      */
     private int checkInterval = 0;
-    
+
     /**
      * Is the generation of SMAP info for JSR45 debugging suppressed?
      */
     private boolean isSmapSuppressed = false;
-    
+
     /**
      * Should SMAP info for JSR45 debugging be dumped to a file?
      */
     private boolean isSmapDumped = false;
-    
+
     /**
      * Are Text strings to be generated as char arrays?
      */
     private boolean genStringAsCharArray = false;
-    
+
     private boolean errorOnUseBeanInvalidClassAttribute = true;
-    
+
     /**
      * I want to see my generated servlets. Which directory are they
      * in?
      */
     private File scratchDir;
-    
+
     /**
      * Need to have this as is for versions 4 and 5 of IE. Can be set from
      * the initParams so if it changes in the future all that is needed is
      * to have a jsp initParam of type ieClassId="<value>"
      */
     private String ieClassId = "clsid:8AD9C840-044E-11D1-B3E9-00805F499D93";
-    
+
     /**
      * What classpath should I use while compiling generated servlets?
      */
     private String classpath = null;
-    
+
     /**
      * Compiler to use.
      */
     private String compiler = null;
-    
+
     /**
      * Compiler target VM.
      */
     private String compilerTargetVM = "1.6";
-    
+
     /**
      * The compiler source VM.
      */
     private String compilerSourceVM = "1.6";
-    
+
     /**
      * The compiler class name.
      */
     private String compilerClassName = null;
-    
+
     /**
      * Cache for the TLD locations
      */
     private TldLocationsCache tldLocationsCache = null;
-    
+
     /**
      * Jsp config information
      */
     private JspConfig jspConfig = null;
-    
+
     /**
      * TagPluginManager
      */
     private TagPluginManager tagPluginManager = null;
-    
+
     /**
      * Java platform encoding to generate the JSP
      * page servlet.
      */
     private String javaEncoding = "UTF8";
-    
+
     /**
      * Modification test interval.
      */
     private int modificationTestInterval = 4;
-    
+
     /**
      * Is re-compilation attempted immediately after a failure?
      */
     private boolean recompileOnFail = false;
-    
+
     /**
      * Is generation of X-Powered-By response header enabled/disabled?
      */
     private boolean xpoweredBy;
-    
+
     /**
      * Should we include a source fragment in exception messages, which could be displayed
      * to the developer ?
      */
     private boolean displaySourceFragment = true;
 
-    
+
     /**
      * The maximum number of loaded jsps per web-application. If there are more
      * jsps loaded, they will be unloaded.
@@ -203,13 +203,13 @@ public final class EmbeddedServletOption
     public String getProperty(String name ) {
         return settings.getProperty( name );
     }
-    
+
     public void setProperty(String name, String value ) {
-        if (name != null && value != null){ 
+        if (name != null && value != null){
             settings.setProperty( name, value );
         }
     }
-    
+
     /**
      * Are we keeping generated code around?
      */
@@ -217,7 +217,7 @@ public final class EmbeddedServletOption
     public boolean getKeepGenerated() {
         return keepGenerated;
     }
-    
+
     /**
      * Should white spaces between directives or actions be trimmed?
      */
@@ -225,12 +225,12 @@ public final class EmbeddedServletOption
     public boolean getTrimSpaces() {
         return trimSpaces;
     }
-    
+
     @Override
     public boolean isPoolingEnabled() {
         return isPoolingEnabled;
     }
-    
+
     /**
      * Are we supporting HTML mapped servlets?
      */
@@ -238,7 +238,7 @@ public final class EmbeddedServletOption
     public boolean getMappedFile() {
         return mappedFile;
     }
-    
+
     /**
      * Should class files be compiled with debug information?
      */
@@ -246,7 +246,7 @@ public final class EmbeddedServletOption
     public boolean getClassDebugInfo() {
         return classDebugInfo;
     }
-    
+
     /**
      * Background JSP compile thread check interval
      */
@@ -254,7 +254,7 @@ public final class EmbeddedServletOption
     public int getCheckInterval() {
         return checkInterval;
     }
-    
+
     /**
      * Modification test interval.
      */
@@ -262,7 +262,7 @@ public final class EmbeddedServletOption
     public int getModificationTestInterval() {
         return modificationTestInterval;
     }
-    
+
     /**
      * Re-compile on failure.
      */
@@ -270,7 +270,7 @@ public final class EmbeddedServletOption
     public boolean getRecompileOnFail() {
         return recompileOnFail;
     }
-    
+
     /**
      * Is Jasper being used in development mode?
      */
@@ -278,7 +278,7 @@ public final class EmbeddedServletOption
     public boolean getDevelopment() {
         return development;
     }
-    
+
     /**
      * Is the generation of SMAP info for JSR45 debugging suppressed?
      */
@@ -286,7 +286,7 @@ public final class EmbeddedServletOption
     public boolean isSmapSuppressed() {
         return isSmapSuppressed;
     }
-    
+
     /**
      * Should SMAP info for JSR45 debugging be dumped to a file?
      */
@@ -294,7 +294,7 @@ public final class EmbeddedServletOption
     public boolean isSmapDumped() {
         return isSmapDumped;
     }
-    
+
     /**
      * Are Text strings to be generated as char arrays?
      */
@@ -302,15 +302,15 @@ public final class EmbeddedServletOption
     public boolean genStringAsCharArray() {
         return this.genStringAsCharArray;
     }
-    
+
     /**
-     * Class ID for use in the plugin tag when the browser is IE. 
+     * Class ID for use in the plugin tag when the browser is IE.
      */
     @Override
     public String getIeClassId() {
         return ieClassId;
     }
-    
+
     /**
      * What is my scratch dir?
      */
@@ -318,7 +318,7 @@ public final class EmbeddedServletOption
     public File getScratchDir() {
         return scratchDir;
     }
-    
+
     /**
      * What classpath should I use while compiling the servlets
      * generated from JSP files?
@@ -327,7 +327,7 @@ public final class EmbeddedServletOption
     public String getClassPath() {
         return classpath;
     }
-    
+
     /**
      * Is generation of X-Powered-By response header enabled/disabled?
      */
@@ -335,7 +335,7 @@ public final class EmbeddedServletOption
     public boolean isXpoweredBy() {
         return xpoweredBy;
     }
-    
+
     /**
      * Compiler to use.
      */
@@ -343,7 +343,7 @@ public final class EmbeddedServletOption
     public String getCompiler() {
         return compiler;
     }
-    
+
     /**
      * @see Options#getCompilerTargetVM
      */
@@ -351,7 +351,7 @@ public final class EmbeddedServletOption
     public String getCompilerTargetVM() {
         return compilerTargetVM;
     }
-    
+
     /**
      * @see Options#getCompilerSourceVM
      */
@@ -359,7 +359,7 @@ public final class EmbeddedServletOption
     public String getCompilerSourceVM() {
         return compilerSourceVM;
     }
-    
+
     /**
      * Java compiler class to use.
      */
@@ -372,45 +372,45 @@ public final class EmbeddedServletOption
     public boolean getErrorOnUseBeanInvalidClassAttribute() {
         return errorOnUseBeanInvalidClassAttribute;
     }
-    
+
     public void setErrorOnUseBeanInvalidClassAttribute(boolean b) {
         errorOnUseBeanInvalidClassAttribute = b;
     }
-    
+
     @Override
     public TldLocationsCache getTldLocationsCache() {
         return tldLocationsCache;
     }
-    
+
     public void setTldLocationsCache( TldLocationsCache tldC ) {
         tldLocationsCache = tldC;
     }
-    
+
     @Override
     public String getJavaEncoding() {
         return javaEncoding;
     }
-    
+
     @Override
     public boolean getFork() {
         return fork;
     }
-    
+
     @Override
     public JspConfig getJspConfig() {
         return jspConfig;
     }
-    
+
     @Override
     public TagPluginManager getTagPluginManager() {
         return tagPluginManager;
     }
-    
+
     @Override
     public boolean isCaching() {
         return false;
     }
-    
+
     @Override
     public Map<String, TagLibraryInfo> getCache() {
         return null;
@@ -445,22 +445,22 @@ public final class EmbeddedServletOption
 
     /**
      * Create an EmbeddedServletOptions object using data available from
-     * ServletConfig and ServletContext. 
+     * ServletConfig and ServletContext.
      */
     public EmbeddedServletOptions(ServletConfig config,
             ServletContext context) {
-        
+
         Enumeration<String> enumeration=config.getInitParameterNames();
         while( enumeration.hasMoreElements() ) {
             String k=enumeration.nextElement();
             String v=config.getInitParameter( k );
             setProperty( k, v);
         }
-        
+
         // quick hack
         String validating=config.getInitParameter( "validating");
         if( "false".equals( validating )) ParserUtils.validating=false;
-        
+
         String keepgen = config.getInitParameter("keepgenerated");
         if (keepgen != null) {
             if (keepgen.equalsIgnoreCase("true")) {
@@ -473,9 +473,9 @@ public final class EmbeddedServletOption
                 }
             }
         }
-        
-        
-        String trimsp = config.getInitParameter("trimSpaces"); 
+
+
+        String trimsp = config.getInitParameter("trimSpaces");
         if (trimsp != null) {
             if (trimsp.equalsIgnoreCase("true")) {
                 trimSpaces = true;
@@ -487,10 +487,10 @@ public final class EmbeddedServletOption
                 }
             }
         }
-        
+
         this.isPoolingEnabled = true;
         String poolingEnabledParam
-        = config.getInitParameter("enablePooling"); 
+        = config.getInitParameter("enablePooling");
         if (poolingEnabledParam != null
                 && !poolingEnabledParam.equalsIgnoreCase("true")) {
             if (poolingEnabledParam.equalsIgnoreCase("false")) {
@@ -501,8 +501,8 @@ public final class EmbeddedServletOption
                 }
             }
         }
-        
-        String mapFile = config.getInitParameter("mappedfile"); 
+
+        String mapFile = config.getInitParameter("mappedfile");
         if (mapFile != null) {
             if (mapFile.equalsIgnoreCase("true")) {
                 this.mappedFile = true;
@@ -514,7 +514,7 @@ public final class EmbeddedServletOption
                 }
             }
         }
-        
+
         String debugInfo = config.getInitParameter("classdebuginfo");
         if (debugInfo != null) {
             if (debugInfo.equalsIgnoreCase("true")) {
@@ -527,7 +527,7 @@ public final class EmbeddedServletOption
                 }
             }
         }
-        
+
         String checkInterval = config.getInitParameter("checkInterval");
         if (checkInterval != null) {
             try {
@@ -538,7 +538,7 @@ public final class EmbeddedServletOption
                 }
             }
         }
-        
+
         String modificationTestInterval = config.getInitParameter("modificationTestInterval");
         if (modificationTestInterval != null) {
             try {
@@ -549,8 +549,8 @@ public final class EmbeddedServletOption
                 }
             }
         }
-        
-        String recompileOnFail = config.getInitParameter("recompileOnFail"); 
+
+        String recompileOnFail = config.getInitParameter("recompileOnFail");
         if (recompileOnFail != null) {
             if (recompileOnFail.equalsIgnoreCase("true")) {
                 this.recompileOnFail = true;
@@ -574,7 +574,7 @@ public final class EmbeddedServletOption
                 }
             }
         }
-        
+
         String suppressSmap = config.getInitParameter("suppressSmap");
         if (suppressSmap != null) {
             if (suppressSmap.equalsIgnoreCase("true")) {
@@ -587,7 +587,7 @@ public final class EmbeddedServletOption
                 }
             }
         }
-        
+
         String dumpSmap = config.getInitParameter("dumpSmap");
         if (dumpSmap != null) {
             if (dumpSmap.equalsIgnoreCase("true")) {
@@ -600,7 +600,7 @@ public final class EmbeddedServletOption
                 }
             }
         }
-        
+
         String genCharArray = config.getInitParameter("genStringAsCharArray");
         if (genCharArray != null) {
             if (genCharArray.equalsIgnoreCase("true")) {
@@ -613,7 +613,7 @@ public final class EmbeddedServletOption
                 }
             }
         }
-        
+
         String errBeanClass =
             config.getInitParameter("errorOnUseBeanInvalidClassAttribute");
         if (errBeanClass != null) {
@@ -627,19 +627,19 @@ public final class EmbeddedServletOption
                 }
             }
         }
-        
+
         String ieClassId = config.getInitParameter("ieClassId");
         if (ieClassId != null)
             this.ieClassId = ieClassId;
-        
+
         String classpath = config.getInitParameter("classpath");
         if (classpath != null)
             this.classpath = classpath;
-        
+
         /*
          * scratchdir
          */
-        String dir = config.getInitParameter("scratchdir"); 
+        String dir = config.getInitParameter("scratchdir");
         if (dir != null) {
             scratchDir = new File(dir);
         } else {
@@ -652,39 +652,39 @@ public final class EmbeddedServletOption
                 if (dir != null)
                     scratchDir = new File(dir);
             }
-        }      
+        }
         if (this.scratchDir == null) {
             log.fatal(Localizer.getMessage("jsp.error.no.scratch.dir"));
             return;
         }
-        
+
         if (!(scratchDir.exists() && scratchDir.canRead() &&
                 scratchDir.canWrite() && scratchDir.isDirectory()))
             log.fatal(Localizer.getMessage("jsp.error.bad.scratch.dir",
                     scratchDir.getAbsolutePath()));
-        
+
         this.compiler = config.getInitParameter("compiler");
-        
+
         String compilerTargetVM = config.getInitParameter("compilerTargetVM");
         if(compilerTargetVM != null) {
             this.compilerTargetVM = compilerTargetVM;
         }
-        
+
         String compilerSourceVM = config.getInitParameter("compilerSourceVM");
         if(compilerSourceVM != null) {
             this.compilerSourceVM = compilerSourceVM;
         }
-        
+
         String javaEncoding = config.getInitParameter("javaEncoding");
         if (javaEncoding != null) {
             this.javaEncoding = javaEncoding;
         }
-        
+
         String compilerClassName = config.getInitParameter("compilerClassName");
         if (compilerClassName != null) {
             this.compilerClassName = compilerClassName;
         }
-        
+
         String fork = config.getInitParameter("fork");
         if (fork != null) {
             if (fork.equalsIgnoreCase("true")) {
@@ -697,8 +697,8 @@ public final class EmbeddedServletOption
                 }
             }
         }
-        
-        String xpoweredBy = config.getInitParameter("xpoweredBy"); 
+
+        String xpoweredBy = config.getInitParameter("xpoweredBy");
         if (xpoweredBy != null) {
             if (xpoweredBy.equalsIgnoreCase("true")) {
                 this.xpoweredBy = true;
@@ -710,8 +710,8 @@ public final class EmbeddedServletOption
                 }
             }
         }
-        
-        String displaySourceFragment = config.getInitParameter("displaySourceFragment"); 
+
+        String displaySourceFragment = config.getInitParameter("displaySourceFragment");
         if (displaySourceFragment != null) {
             if (displaySourceFragment.equalsIgnoreCase("true")) {
                 this.displaySourceFragment = true;
@@ -723,7 +723,7 @@ public final class EmbeddedServletOption
                 }
             }
         }
-        
+
         String maxLoadedJsps = config.getInitParameter("maxLoadedJsps");
         if (maxLoadedJsps != null) {
             try {
@@ -734,7 +734,7 @@ public final class EmbeddedServletOption
                 }
             }
         }
-        
+
         String jspIdleTimeout = config.getInitParameter("jspIdleTimeout");
         if (jspIdleTimeout != null) {
             try {
@@ -749,13 +749,13 @@ public final class EmbeddedServletOption
         // Setup the global Tag Libraries location cache for this
         // web-application.
         tldLocationsCache = TldLocationsCache.getInstance(context);
-        
+
         // Setup the jsp config info for this web app.
         jspConfig = new JspConfig(context);
-        
+
         // Create a Tag plugin instance
         tagPluginManager = new TagPluginManager(context);
     }
-    
+
 }
 

Modified: tomcat/trunk/java/org/apache/jasper/JasperException.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JasperException.java?rev=1187803&r1=1187802&r2=1187803&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/JasperException.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JasperException.java Sat Oct 22 21:18:03 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.
@@ -19,12 +19,12 @@ package org.apache.jasper;
 
 /**
  * Base class for all exceptions generated by the JSP engine. Makes it
- * convenient to catch just this at the top-level. 
+ * convenient to catch just this at the top-level.
  *
  * @author Anil K. Vijendran
  */
 public class JasperException extends javax.servlet.ServletException {
-    
+
     private static final long serialVersionUID = 1L;
 
     public JasperException(String reason) {

Modified: tomcat/trunk/java/org/apache/jasper/JspC.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspC.java?rev=1187803&r1=1187802&r2=1187803&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspC.java Sat Oct 22 21:18:03 2011
@@ -132,7 +132,7 @@ public class JspC implements Options {
     protected static final int DEFAULT_DIE_LEVEL = 1;
     protected static final int NO_DIE_LEVEL = 0;
     protected static final Set<String> insertBefore = new HashSet<String>();
-    
+
     static {
         insertBefore.add("</web-app>");
         insertBefore.add("<servlet-mapping>");
@@ -269,7 +269,7 @@ public class JspC implements Options {
 
     /**
      * Apply command-line arguments.
-     * 
+     *
      * @param arg
      *            The arguments
      */
@@ -329,7 +329,7 @@ public class JspC implements Options {
                     caching = false;
                 } else {
                     caching = true;
-                }            
+                }
             } else if (tok.equals(SWITCH_CLASSPATH)) {
                 setClassPath(nextArg());
             } else if (tok.startsWith(SWITCH_DIE)) {
@@ -505,7 +505,7 @@ public class JspC implements Options {
 
     /**
      * Sets the option to enable caching.
-     * 
+     *
      * @see Options#isCaching()
      */
     public void setCaching(boolean caching) {
@@ -547,8 +547,8 @@ public class JspC implements Options {
     public boolean getRecompileOnFail() {
         return false;
     }
-    
-    
+
+
     /**
      * In JspC this always returns <code>false</code>.
      * {@inheritDoc}
@@ -583,14 +583,14 @@ public class JspC implements Options {
 
     /**
      * Sets smapDumped flag.
-     * 
+     *
      * @see Options#isSmapDumped()
      */
     public void setSmapDumped(boolean smapDumped) {
         this.smapDumped = smapDumped;
     }
 
-    
+
     /**
      * Determines whether text strings are to be generated as char arrays,
      * which improves performance in some cases.
@@ -613,7 +613,7 @@ public class JspC implements Options {
     /**
      * Sets the class-id value to be sent to Internet Explorer when using
      * &lt;jsp:plugin&gt; tags.
-     * 
+     *
      * @param ieClassId
      *            Class-id value
      */
@@ -647,7 +647,7 @@ public class JspC implements Options {
 
     /**
      * Sets the option to determine what compiler to use.
-     * 
+     *
      * @see Options#getCompiler()
      */
     public void setCompiler(String c) {
@@ -672,7 +672,7 @@ public class JspC implements Options {
 
     /**
      * Sets the compiler target VM.
-     * 
+     *
      * @see Options#getCompilerTargetVM()
      */
     public void setCompilerTargetVM(String vm) {
@@ -689,7 +689,7 @@ public class JspC implements Options {
 
      /**
       * Sets the compiler source VM.
-      * 
+      *
       * @see Options#getCompilerSourceVM()
       */
     public void setCompilerSourceVM(String vm) {
@@ -906,11 +906,11 @@ public class JspC implements Options {
 
     /**
      * Sets the encoding to be used to read and write web.xml files.
-     * 
+     *
      * <p>
      * If not specified, defaults to the platform default encoding.
      * </p>
-     * 
+     *
      * @param encoding
      *            Encoding, e.g. "UTF-8".
      */
@@ -921,7 +921,7 @@ public class JspC implements Options {
     /**
      * Sets the option to merge generated web.xml fragment into the
      * WEB-INF/web.xml file of the web application that we were processing.
-     * 
+     *
      * @param b
      *            <code>true</code> to merge the fragment into the existing
      *            web.xml file of the processed web application
@@ -966,7 +966,7 @@ public class JspC implements Options {
     /**
      * Adds servlet declaration and mapping for the JSP page servlet to the
      * generated web.xml fragment.
-     * 
+     *
      * @param file
      *            Context-relative path to the JSP file, e.g.
      *            <code>/index.jsp</code>
@@ -1097,21 +1097,21 @@ public class JspC implements Options {
         if(!webXml2.delete() && log.isDebugEnabled())
             log.debug(Localizer.getMessage("jspc.delete.fail",
                     webXml2.toString()));
-        
+
         if (!(new File(webxmlFile)).delete() && log.isDebugEnabled())
             log.debug(Localizer.getMessage("jspc.delete.fail", webxmlFile));
 
     }
-    
+
     /*
      * Assumes valid xml
      */
     private String getElement(Reader reader) throws IOException {
         StringBuilder result = new StringBuilder();
         result.append('<');
-        
+
         boolean done = false;
-        
+
         while (!done) {
             int current = reader.read();
             while (current != '>') {
@@ -1122,7 +1122,7 @@ public class JspC implements Options {
                 current = reader.read();
             }
             result.append((char) current);
-            
+
             int len = result.length();
             if (len > 4 && result.substring(0, 4).equals("<!--")) {
                 // This is a comment - make sure we are at the end
@@ -1133,8 +1133,8 @@ public class JspC implements Options {
                 done = true;
             }
         }
-        
-        
+
+
         return result.toString();
     }
 

Modified: tomcat/trunk/java/org/apache/jasper/Options.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/Options.java?rev=1187803&r1=1187802&r2=1187803&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/Options.java (original)
+++ tomcat/trunk/java/org/apache/jasper/Options.java Sat Oct 22 21:18:03 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.
@@ -27,7 +27,7 @@ import org.apache.jasper.compiler.TagPlu
 import org.apache.jasper.compiler.TldLocationsCache;
 
 /**
- * A class to hold all init parameters specific to the JSP engine. 
+ * A class to hold all init parameters specific to the JSP engine.
  *
  * @author Anil K. Vijendran
  * @author Hans Bergsten
@@ -116,7 +116,7 @@ public interface Options {
 
     /**
      * Compiler to use.
-     * 
+     *
      * <p>
      * If <code>null</code> (the default), the java compiler from Eclipse JDT
      * project, bundled with Tomcat, will be used. Otherwise, the
@@ -134,19 +134,19 @@ public interface Options {
     /**
      * The compiler source VM, e.g. 1.3, 1.4, 1.5 or 1.6.
      */
-    public String getCompilerSourceVM();   
+    public String getCompilerSourceVM();
 
     /**
      * Jasper Java compiler class to use.
      */
-    public String getCompilerClassName();   
+    public String getCompilerClassName();
 
     /**
      * The cache for the location of the TLD's
      * for the various tag libraries 'exposed'
      * by the web application.
-     * A tag library is 'exposed' either explicitly in 
-     * web.xml or implicitly via the uri tag in the TLD 
+     * A tag library is 'exposed' either explicitly in
+     * web.xml or implicitly via the uri tag in the TLD
      * of a taglib deployed in a jar file (WEB-INF/lib).
      *
      * @return the instance of the TldLocationsCache
@@ -162,7 +162,7 @@ public interface Options {
 
     /**
      * The boolean flag to tell Ant whether to fork JSP page compilations.
-     * 
+     *
      * <p>
      * Is used only when Jasper uses an external java compiler (wrapped through
      * a <code>javac</code> Apache Ant task).
@@ -170,7 +170,7 @@ public interface Options {
     public boolean getFork();
 
     /**
-     * Obtain JSP configuration information specified in web.xml.  
+     * Obtain JSP configuration information specified in web.xml.
      */
     public JspConfig getJspConfig();
 
@@ -186,48 +186,48 @@ public interface Options {
 
     /**
      * Indicates whether text strings are to be generated as char arrays.
-     * 
+     *
      * @return <code>true</code> if text strings are to be generated as char
      *         arrays, <code>false</code> otherwise
      */
     public boolean genStringAsCharArray();
-    
+
     /**
      * Modification test interval.
      */
     public int getModificationTestInterval();
-    
+
 
     /**
      * Re-compile on failure.
      */
     public boolean getRecompileOnFail();
-    
+
     /**
      * Is caching enabled (used for precompilation).
      */
     public boolean isCaching();
-    
+
     /**
      * The web-application wide cache for the TagLibraryInfo tag library
      * descriptors, used if {@link #isCaching()} returns <code>true</code>.
-     * 
+     *
      * <p>
      * Using this cache avoids the cost of repeating the parsing of a tag
      * library descriptor XML file (performed by TagLibraryInfoImpl.parseTLD).
      * </p>
-     * 
+     *
      * @return the Map(String uri, TagLibraryInfo tld) instance.
      */
     public Map<String, TagLibraryInfo> getCache();
-    
+
     /**
      * The maximum number of loaded jsps per web-application. If there are more
      * jsps loaded, they will be unloaded. If unset or less than 0, no jsps
      * are unloaded.
      */
     public int getMaxLoadedJsps();
-    
+
     /**
      * The idle time in seconds after which a JSP is unloaded.
      * If unset or less or equal than 0, no jsps are unloaded.

Modified: tomcat/trunk/java/org/apache/jasper/compiler/AntCompiler.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/AntCompiler.java?rev=1187803&r1=1187802&r2=1187803&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/AntCompiler.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/AntCompiler.java Sat Oct 22 21:18:03 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.
@@ -48,7 +48,7 @@ import org.apache.tools.ant.types.Patter
 public class AntCompiler extends Compiler {
 
     private final Log log = LogFactory.getLog(AntCompiler.class); // must not be static
-    
+
     protected static final Object javacLock = new Object();
 
     static {
@@ -64,10 +64,10 @@ public class AntCompiler extends Compile
 
     // Lazy eval - if we don't need to compile we probably don't need the project
     protected Project getProject() {
-        
+
         if (project != null)
             return project;
-        
+
         // Initializing project
         project = new Project();
         logger = new JasperAntLogger();
@@ -78,7 +78,7 @@ public class AntCompiler extends Compile
         if (System.getProperty(Constants.CATALINA_HOME_PROP) != null) {
             project.setBasedir(System.getProperty(Constants.CATALINA_HOME_PROP));
         }
-        
+
         if( options.getCompiler() != null ) {
             if( log.isDebugEnabled() )
                 log.debug("Compiler " + options.getCompiler() );
@@ -87,40 +87,40 @@ public class AntCompiler extends Compile
         project.init();
         return project;
     }
-    
+
     public static class JasperAntLogger extends DefaultLogger {
-        
+
         protected StringBuilder reportBuf = new StringBuilder();
-        
+
         @Override
         protected void printMessage(final String message,
                 final PrintStream stream,
                 final int priority) {
         }
-        
+
         @Override
         protected void log(String message) {
             reportBuf.append(message);
             reportBuf.append(Constants.NEWLINE);
         }
-        
+
         protected String getReport() {
             String report = reportBuf.toString();
             reportBuf.setLength(0);
             return report;
         }
     }
-    
+
     // --------------------------------------------------------- Public Methods
 
 
-    /** 
+    /**
      * Compile the servlet from .java file to .class file
      */
     @Override
     protected void generateClass(String[] smap)
         throws FileNotFoundException, JasperException, Exception {
-        
+
         long t1 = 0;
         if (log.isDebugEnabled()) {
             t1 = System.currentTimeMillis();
@@ -128,23 +128,23 @@ public class AntCompiler extends Compile
 
         String javaEncoding = ctxt.getOptions().getJavaEncoding();
         String javaFileName = ctxt.getServletJavaFileName();
-        String classpath = ctxt.getClassPath(); 
-        
+        String classpath = ctxt.getClassPath();
+
         String sep = System.getProperty("path.separator");
-        
+
         StringBuilder errorReport = new StringBuilder();
-        
+
         StringBuilder info=new StringBuilder();
         info.append("Compile: javaFileName=" + javaFileName + "\n" );
         info.append("    classpath=" + classpath + "\n" );
-        
+
         // Start capturing the System.err output for this thread
         SystemLogHandler.setThread();
-        
+
         // Initializing javac task
         getProject();
         Javac javac = (Javac) project.createTask("javac");
-        
+
         // Initializing classpath
         Path path = new Path(project);
         path.setPath(System.getProperty("java.class.path"));
@@ -156,17 +156,17 @@ public class AntCompiler extends Compile
             path.setLocation(repository);
             info.append("    cp=" + repository + "\n");
         }
-        
+
         if( log.isDebugEnabled() )
             log.debug( "Using classpath: " + System.getProperty("java.class.path") + sep
                     + classpath);
-        
+
         // Initializing sourcepath
         Path srcPath = new Path(project);
         srcPath.setLocation(options.getScratchDir());
-        
+
         info.append("    work dir=" + options.getScratchDir() + "\n");
-        
+
         // Initialize and set java extensions
         String exts = System.getProperty("java.ext.dirs");
         if (exts != null) {
@@ -181,7 +181,7 @@ public class AntCompiler extends Compile
         if(ctxt.getOptions().getFork()) {
             String endorsed = System.getProperty("java.endorsed.dirs");
             if(endorsed != null) {
-                Javac.ImplementationSpecificArgument endorsedArg = 
+                Javac.ImplementationSpecificArgument endorsedArg =
                     javac.createCompilerArg();
                 endorsedArg.setLine("-J-Djava.endorsed.dirs=" +
                         quotePathList(endorsed));
@@ -191,7 +191,7 @@ public class AntCompiler extends Compile
                 info.append("    no endorsed dirs specified\n");
             }
         }
-        
+
         // Configure the compiler object
         javac.setEncoding(javaEncoding);
         javac.setClasspath(path);
@@ -201,7 +201,7 @@ public class AntCompiler extends Compile
         javac.setOptimize(! ctxt.getOptions().getClassDebugInfo() );
         javac.setFork(ctxt.getOptions().getFork());
         info.append("    srcDir=" + srcPath + "\n" );
-        
+
         // Set the Java compiler to use
         if (options.getCompiler() != null) {
             javac.setCompiler(options.getCompiler());
@@ -217,15 +217,15 @@ public class AntCompiler extends Compile
             javac.setSource(options.getCompilerSourceVM());
             info.append("   compilerSourceVM=" + options.getCompilerSourceVM() + "\n");
         }
-        
+
         // Build includes path
         PatternSet.NameEntry includes = javac.createInclude();
-        
+
         includes.setName(ctxt.getJavaPath());
         info.append("    include="+ ctxt.getJavaPath() + "\n" );
-        
+
         BuildException be = null;
-        
+
         try {
             if (ctxt.getOptions().getFork()) {
                 javac.execute();
@@ -239,7 +239,7 @@ public class AntCompiler extends Compile
             log.error(Localizer.getMessage("jsp.error.javac"), e);
             log.error(Localizer.getMessage("jsp.error.javac.env") + info.toString());
         }
-        
+
         errorReport.append(logger.getReport());
 
         // Stop capturing the System.err output for this thread
@@ -253,7 +253,7 @@ public class AntCompiler extends Compile
             File javaFile = new File(javaFileName);
             javaFile.delete();
         }
-        
+
         if (be != null) {
             String errorReportString = errorReport.toString();
             log.error(Localizer.getMessage("jsp.error.compilation", javaFileName, errorReportString));
@@ -265,20 +265,20 @@ public class AntCompiler extends Compile
                 errDispatcher.javacError(errorReportString, be);
             }
         }
-        
+
         if( log.isDebugEnabled() ) {
             long t2 = System.currentTimeMillis();
             log.debug("Compiled " + ctxt.getServletJavaFileName() + " "
                       + (t2-t1) + "ms");
         }
-        
+
         logger = null;
         project = null;
-        
+
         if (ctxt.isPrototypeMode()) {
             return;
         }
-        
+
         // JSR45 Support
         if (! options.isSmapSuppressed()) {
             SmapUtil.installSmap(smap);

Modified: tomcat/trunk/java/org/apache/jasper/compiler/AttributeParser.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/AttributeParser.java?rev=1187803&r1=1187802&r2=1187803&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/AttributeParser.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/AttributeParser.java Sat Oct 22 21:18:03 2011
@@ -28,7 +28,7 @@ package org.apache.jasper.compiler;
  */
 public class AttributeParser {
 
-    /* System property that controls if the strict quoting rules are applied. */ 
+    /* System property that controls if the strict quoting rules are applied. */
     private static final boolean STRICT_QUOTE_ESCAPING = Boolean.valueOf(
             System.getProperty(
                     "org.apache.jasper.compiler.Parser.STRICT_QUOTE_ESCAPING",
@@ -37,7 +37,7 @@ public class AttributeParser {
     /**
      * Parses the provided input String as a JSP attribute and returns an
      * unquoted value.
-     * 
+     *
      * @param input         The input.
      * @param quote         The quote character for the attribute or 0 for
      *                      scripting expressions.
@@ -59,7 +59,7 @@ public class AttributeParser {
     /**
      * Provided solely for unit test purposes and allows per call overriding of
      * the STRICT_QUOTE_ESCAPING system property.
-     * 
+     *
      * @param input         The input.
      * @param quote         The quote character for the attribute or 0 for
      *                      scripting expressions.
@@ -81,32 +81,32 @@ public class AttributeParser {
 
     /* The quoted input string. */
     private final String input;
-    
+
     /* The quote used for the attribute - null for scripting expressions. */
     private final char quote;
-    
+
     /* Is expression language being ignored - affects unquoting. \$ and \# are
      * treated as literals rather than quoted values. */
     private final boolean isELIgnored;
-    
+
     /* Are deferred expression treated as literals */
     private final boolean isDeferredSyntaxAllowedAsLiteral;
-    
+
     /* Overrides the STRICT_QUOTE_ESCAPING. Used for Unit tests only. */
     private final boolean strict;
-    
+
     /* The type ($ or #) of expression. Literals have a type of null. */
     private char type;
-    
+
     /* The length of the quoted input string. */
     private final int size;
-    
+
     /* Tracks the current position of the parser in the input String. */
     private int i = 0;
-    
+
     /* Indicates if the last character returned by nextChar() was escaped. */
     private boolean lastChEscaped = false;
-    
+
     /* The unquoted result. */
     private StringBuilder result;
 
@@ -258,7 +258,7 @@ public class AttributeParser {
     private char nextChar() {
         lastChEscaped = false;
         char ch = input.charAt(i);
-        
+
         if (ch == '&') {
             if (i + 5 < size && input.charAt(i + 1) == 'a' &&
                     input.charAt(i + 2) == 'p' && input.charAt(i + 3) == 'o' &&

Modified: tomcat/trunk/java/org/apache/jasper/compiler/BeanRepository.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/BeanRepository.java?rev=1187803&r1=1187802&r2=1187803&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/BeanRepository.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/BeanRepository.java Sat Oct 22 21:18:03 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.
@@ -22,7 +22,7 @@ import java.util.HashMap;
 import org.apache.jasper.JasperException;
 
 /**
- * Repository of {page, request, session, application}-scoped beans 
+ * Repository of {page, request, session, application}-scoped beans
  *
  * @author Mandar Raje
  * @author Remy Maucherat
@@ -35,7 +35,7 @@ public class BeanRepository {
 
     /**
      * Constructor.
-     */    
+     */
     public BeanRepository(ClassLoader loader, ErrorDispatcher err) {
         this.loader = loader;
         this.errDispatcher = err;
@@ -45,14 +45,14 @@ public class BeanRepository {
     public void addBean(Node.UseBean n, String s, String type, String scope)
         throws JasperException {
 
-        if (!(scope == null || scope.equals("page") || scope.equals("request") 
+        if (!(scope == null || scope.equals("page") || scope.equals("request")
                 || scope.equals("session") || scope.equals("application"))) {
             errDispatcher.jspError(n, "jsp.error.usebean.badScope");
         }
 
         beanTypes.put(s, type);
     }
-            
+
     public Class<?> getBeanType(String bean)
         throws JasperException {
         Class<?> clazz = null;
@@ -63,7 +63,7 @@ public class BeanRepository {
         }
         return clazz;
     }
-      
+
     public boolean checkVariable(String bean) {
         return beanTypes.containsKey(bean);
     }

Modified: tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java?rev=1187803&r1=1187802&r2=1187803&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java Sat Oct 22 21:18:03 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.
@@ -39,7 +39,7 @@ import org.apache.juli.logging.LogFactor
 
 /**
  * Main JSP compiler class. This class uses Ant for compiling.
- * 
+ *
  * @author Anil K. Vijendran
  * @author Mandar Raje
  * @author Pierre Delisle
@@ -48,7 +48,7 @@ import org.apache.juli.logging.LogFactor
  * @author Mark Roth
  */
 public abstract class Compiler {
-    
+
     private final Log log = LogFactory.getLog(Compiler.class); // must not be static
 
     // ----------------------------------------------------- Instance Variables
@@ -90,7 +90,7 @@ public abstract class Compiler {
 
     /**
      * Compile the jsp file into equivalent servlet in .java file
-     * 
+     *
      * @return a smap for the current JSP page, if one is generated, null
      *         otherwise
      */
@@ -184,16 +184,16 @@ public abstract class Compiler {
              * solutions. We now use two passes to parse the translation unit.
              * The first just parses the directives and the second parses the
              * whole translation unit once we know how isELIgnored has been set.
-             * TODO There are some possible optimisations of this process.  
-             */ 
+             * TODO There are some possible optimisations of this process.
+             */
             // Parse the file
             ParserController parserCtl = new ParserController(ctxt, this);
-            
+
             // Pass 1 - the directives
             Node.Nodes directives =
                 parserCtl.parseDirectives(ctxt.getJspFile());
             Validator.validateDirectives(this, directives);
-            
+
             // Pass 2 - the whole translation unit
             pageNodes = parserCtl.parse(ctxt.getJspFile());
 
@@ -343,7 +343,7 @@ public abstract class Compiler {
     /**
      * Compile the jsp file from the current engine context. As an side- effect,
      * tag files that are referenced by this page are also compiled.
-     * 
+     *
      * @param compileClass
      *            If true, generate both .java and .class file If false,
      *            generate only .java file
@@ -356,7 +356,7 @@ public abstract class Compiler {
     /**
      * Compile the jsp file from the current engine context. As an side- effect,
      * tag files that are referenced by this page are also compiled.
-     * 
+     *
      * @param compileClass
      *            If true, generate both .java and .class file If false,
      *            generate only .java file
@@ -430,7 +430,7 @@ public abstract class Compiler {
      * JSP page with that of the corresponding .class or .java file. If the page
      * has dependencies, the check is also extended to its dependents, and so
      * on. This method can by overridden by a subclasses of Compiler.
-     * 
+     *
      * @param checkClass
      *            If true, check against .class file, if false, check against
      *            .java file.

Modified: tomcat/trunk/java/org/apache/jasper/compiler/DefaultErrorHandler.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/DefaultErrorHandler.java?rev=1187803&r1=1187802&r2=1187803&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/DefaultErrorHandler.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/DefaultErrorHandler.java Sat Oct 22 21:18:03 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,7 +26,7 @@ import org.apache.jasper.JasperException
  * @author Jan Luehe
  */
 class DefaultErrorHandler implements ErrorHandler {
-    
+
     /*
      * Processes the given JSP parse error.
      *
@@ -44,7 +44,7 @@ class DefaultErrorHandler implements Err
                         Integer.toString(line), Integer.toString(column)) +
                 ") " + errMsg, ex);
     }
-    
+
     /*
      * Processes the given JSP parse error.
      *
@@ -55,7 +55,7 @@ class DefaultErrorHandler implements Err
     public void jspError(String errMsg, Exception ex) throws JasperException {
         throw new JasperException(errMsg, ex);
     }
-    
+
     /*
      * Processes the given javac compilation errors.
      *
@@ -64,18 +64,18 @@ class DefaultErrorHandler implements Err
      */
     @Override
     public void javacError(JavacErrorDetail[] details) throws JasperException {
-        
+
         if (details == null) {
             return;
         }
-        
+
         Object[] args = null;
         StringBuilder buf = new StringBuilder();
-        
+
         for (int i=0; i < details.length; i++) {
             if (details[i].getJspBeginLineNumber() >= 0) {
                 args = new Object[] {
-                        Integer.valueOf(details[i].getJspBeginLineNumber()), 
+                        Integer.valueOf(details[i].getJspBeginLineNumber()),
                         details[i].getJspFileName() };
                 buf.append(Constants.NEWLINE);
                 buf.append(Constants.NEWLINE);
@@ -102,7 +102,7 @@ class DefaultErrorHandler implements Err
         throw new JasperException(
                 Localizer.getMessage("jsp.error.unable.compile") + ": " + buf);
     }
-    
+
     /**
      * Processes the given javac error report and exception.
      *
@@ -112,9 +112,9 @@ class DefaultErrorHandler implements Err
     @Override
     public void javacError(String errorReport, Exception exception)
     throws JasperException {
-        
+
         throw new JasperException(
                 Localizer.getMessage("jsp.error.unable.compile"), exception);
     }
-    
+
 }

Modified: tomcat/trunk/java/org/apache/jasper/compiler/Dumper.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Dumper.java?rev=1187803&r1=1187802&r2=1187803&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Dumper.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Dumper.java Sat Oct 22 21:18:03 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.
@@ -133,28 +133,28 @@ class Dumper {
             dumpBody(n);
             printString("</jsp:useBean>");
         }
-        
+
         @Override
         public void visit(Node.PlugIn n) throws JasperException {
             printAttributes("<jsp:plugin", n.getAttributes(), ">");
             dumpBody(n);
             printString("</jsp:plugin>");
         }
-        
+
         @Override
         public void visit(Node.ParamsAction n) throws JasperException {
             printAttributes("<jsp:params", n.getAttributes(), ">");
             dumpBody(n);
             printString("</jsp:params>");
         }
-        
+
         @Override
         public void visit(Node.ParamAction n) throws JasperException {
             printAttributes("<jsp:param", n.getAttributes(), ">");
             dumpBody(n);
             printString("</jsp:param>");
         }
-        
+
         @Override
         public void visit(Node.NamedAttribute n) throws JasperException {
             printAttributes("<jsp:attribute", n.getAttributes(), ">");
@@ -168,7 +168,7 @@ class Dumper {
             dumpBody(n);
             printString("</jsp:body>");
         }
-        
+
         @Override
         public void visit(Node.ELExpression n) throws JasperException {
             printString( "${" + n.getText() + "}" );
@@ -203,7 +203,7 @@ class Dumper {
 
     public static void dump(Node n) {
         try {
-            n.accept(new DumpVisitor());        
+            n.accept(new DumpVisitor());
         } catch (JasperException e) {
             e.printStackTrace();
         }

Modified: tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java?rev=1187803&r1=1187802&r2=1187803&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java Sat Oct 22 21:18:03 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.
@@ -46,7 +46,7 @@ public class ELFunctionMapper {
      *
      * @param page The current compilation unit.
      */
-    public static void map(Node.Nodes page) 
+    public static void map(Node.Nodes page)
                 throws JasperException {
 
         ELFunctionMapper map = new ELFunctionMapper();
@@ -69,7 +69,7 @@ public class ELFunctionMapper {
      * for functions, and if found functions mappers are created.
      */
     class ELFunctionVisitor extends Node.Visitor {
-        
+
         /**
          * Use a global name map to facilitate reuse of function maps.
          * The key used is prefix:function:uri.
@@ -148,7 +148,7 @@ public class ELFunctionMapper {
             doMap(n.getEL());
         }
 
-        private void doMap(Node.JspAttribute attr) 
+        private void doMap(Node.JspAttribute attr)
                 throws JasperException {
             if (attr != null) {
                 doMap(attr.getEL());
@@ -158,7 +158,7 @@ public class ELFunctionMapper {
         /**
          * Creates function mappers, if needed, from ELNodes
          */
-        private void doMap(ELNode.Nodes el) 
+        private void doMap(ELNode.Nodes el)
                 throws JasperException {
 
             // Only care about functions in ELNode's
@@ -195,7 +195,7 @@ public class ELFunctionMapper {
                 el.setMapName(decName);
                 return;
             }
-        
+
             // Generate declaration for the map statically
             decName = getMapName();
             ss.append("private static org.apache.jasper.runtime.ProtectedFunctionMapper " + decName + ";\n");
@@ -296,13 +296,13 @@ public class ELFunctionMapper {
         /**
          * Convert a binary class name into a canonical one that can be used
          * when generating Java source code.
-         * 
+         *
          * @param className Binary class name
          * @return          Canonical equivalent
          */
         private String getCanonicalName(String className) throws JasperException {
             Class<?> clazz;
-            
+
             ClassLoader tccl;
             if (Constants.IS_SECURITY_ENABLED) {
                 PrivilegedAction<ClassLoader> pa = new PrivilegedGetTccl();
@@ -319,7 +319,7 @@ public class ELFunctionMapper {
             return clazz.getCanonicalName();
         }
     }
-    
+
     private static class PrivilegedGetTccl
             implements PrivilegedAction<ClassLoader> {
 

Modified: tomcat/trunk/java/org/apache/jasper/compiler/ELNode.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ELNode.java?rev=1187803&r1=1187802&r2=1187803&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/ELNode.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ELNode.java Sat Oct 22 21:18:03 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.
@@ -238,7 +238,7 @@ abstract class ELNode {
         public String getMapName() {
             return mapName;
         }
-    
+
     }
 
     /*

Modified: tomcat/trunk/java/org/apache/jasper/compiler/ELParser.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ELParser.java?rev=1187803&r1=1187802&r2=1187803&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/ELParser.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ELParser.java Sat Oct 22 21:18:03 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.
@@ -19,12 +19,12 @@ package org.apache.jasper.compiler;
 
 /**
  * This class implements a parser for EL expressions.
- * 
+ *
  * It takes strings of the form xxx${..}yyy${..}zzz etc, and turn it into a
  * ELNode.Nodes.
- * 
+ *
  * Currently, it only handles text outside ${..} and functions in ${ ..}.
- * 
+ *
  * @author Kin-man Chung
  */
 
@@ -40,7 +40,7 @@ public class ELParser {
     private int index; // Current index of the expression
 
     private String expression; // The EL expression
-    
+
     private char type;
 
     private boolean escapeBS; // is '\' an escape char in text outside EL?
@@ -60,7 +60,7 @@ public class ELParser {
 
     /**
      * Parse an EL expression
-     * 
+     *
      * @param expression
      *            The input expression string of the form Char* ('${' Char*
      *            '}')* Char*
@@ -88,9 +88,9 @@ public class ELParser {
     /**
      * Parse an EL expression string '${...}'. Currently only separates the EL
      * into functions and everything else.
-     * 
+     *
      * @return An ELNode.Nodes representing the EL expression
-     * 
+     *
      * TODO: Can this be refactored to use the standard EL implementation?
      */
     private ELNode.Nodes parseEL() {
@@ -181,7 +181,7 @@ public class ELParser {
     /**
      * Skip until an EL expression ('${' || '#{') is reached, allowing escape
      * sequences '\\' and '\$' and '\#'.
-     * 
+     *
      * @return The text string up to the EL expression
      */
     private String skipUntilEL() {

Modified: tomcat/trunk/java/org/apache/jasper/compiler/ErrorDispatcher.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ErrorDispatcher.java?rev=1187803&r1=1187802&r2=1187803&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/ErrorDispatcher.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ErrorDispatcher.java Sat Oct 22 21:18:03 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.
@@ -33,9 +33,9 @@ import org.xml.sax.SAXException;
  *
  * This class is also responsible for localizing any error codes before they
  * are passed on to the configured error handler.
- * 
+ *
  * In the case of a Java compilation error, the compiler error message is
- * parsed into an array of JavacErrorDetail instances, which is passed on to 
+ * parsed into an array of JavacErrorDetail instances, which is passed on to
  * the configured error handler.
  *
  * @author Jan Luehe
@@ -435,9 +435,9 @@ public class ErrorDispatcher {
         StringBuilder errMsgBuf = null;
         int lineNum = -1;
         JavacErrorDetail javacError = null;
-        
+
         BufferedReader reader = new BufferedReader(new StringReader(errMsg));
-        
+
         /*
          * Parse compilation errors. Each compilation error consists of a file
          * path and error line number, followed by a number of lines describing
@@ -445,52 +445,52 @@ public class ErrorDispatcher {
          */
         String line = null;
         while ((line = reader.readLine()) != null) {
-            
+
             /*
              * Error line number is delimited by set of colons.
              * Ignore colon following drive letter on Windows (fromIndex = 2).
              * XXX Handle deprecation warnings that don't have line info
              */
-            int beginColon = line.indexOf(':', 2); 
+            int beginColon = line.indexOf(':', 2);
             int endColon = line.indexOf(':', beginColon + 1);
             if ((beginColon >= 0) && (endColon >= 0)) {
                 if (javacError != null) {
                     // add previous error to error vector
                     errors.add(javacError);
                 }
-                
+
                 String lineNumStr = line.substring(beginColon + 1, endColon);
                 try {
                     lineNum = Integer.parseInt(lineNumStr);
                 } catch (NumberFormatException e) {
                     lineNum = -1;
                 }
-                
+
                 errMsgBuf = new StringBuilder();
-                
+
                 javacError = createJavacError(fname, page, errMsgBuf, lineNum);
             }
-            
+
             // Ignore messages preceding first error
             if (errMsgBuf != null) {
                 errMsgBuf.append(line);
                 errMsgBuf.append(Constants.NEWLINE);
             }
         }
-        
+
         // Add last error to error vector
         if (javacError != null) {
             errors.add(javacError);
-        } 
-        
+        }
+
         reader.close();
-        
+
         JavacErrorDetail[] errDetails = null;
         if (errors.size() > 0) {
             errDetails = new JavacErrorDetail[errors.size()];
             errors.toArray(errDetails);
         }
-        
+
         return errDetails;
     }
 
@@ -508,8 +508,8 @@ public class ErrorDispatcher {
     throws JasperException {
         return createJavacError(fname, page, errMsgBuf, lineNum, null);
     }
-    
-    
+
+
     /**
      * @param fname
      * @param page
@@ -551,7 +551,7 @@ public class ErrorDispatcher {
         } else {
             /*
              * javac error line number cannot be mapped to JSP page
-             * line number. For example, this is the case if a 
+             * line number. For example, this is the case if a
              * scriptlet is missing a closing brace, which causes
              * havoc with the try-catch-finally block that the code
              * generator places around all generated code: As a result

Modified: tomcat/trunk/java/org/apache/jasper/compiler/ErrorHandler.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ErrorHandler.java?rev=1187803&r1=1187802&r2=1187803&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/ErrorHandler.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ErrorHandler.java Sat Oct 22 21:18:03 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.
@@ -21,7 +21,7 @@ import org.apache.jasper.JasperException
 
 /**
  * Interface for handling JSP parse and javac compilation errors.
- * 
+ *
  * An implementation of this interface may be registered with the
  * ErrorDispatcher by setting the XXX initialization parameter in the JSP
  * page compiler and execution servlet in Catalina's web.xml file to the

Modified: tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Generator.java?rev=1187803&r1=1187802&r2=1187803&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Generator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Generator.java Sat Oct 22 21:18:03 2011
@@ -89,7 +89,7 @@ class Generator {
     /* System property that controls if the requirement to have the object
      * used in jsp:getProperty action to be previously "introduced"
      * to the JSP processor (see JSP.5.3) is enforced.
-     */ 
+     */
     private static final boolean STRICT_GET_PROPERTY = Boolean.valueOf(
             System.getProperty(
                     "org.apache.jasper.compiler.Generator.STRICT_GET_PROPERTY",
@@ -104,7 +104,7 @@ class Generator {
     private ErrorDispatcher err;
 
     private BeanRepository beanInfo;
-    
+
     private Set<String> varInfoNames;
 
     private JspCompilationContext ctxt;
@@ -122,7 +122,7 @@ class Generator {
     private Vector<String> tagHandlerPoolNames;
 
     private GenBuffer charArrayBuffer;
-    
+
     private DateFormat timestampFormat;
 
     /**
@@ -297,7 +297,7 @@ class Generator {
 
                 if (!n.implementsSimpleTag()) {
                     String name = createTagHandlerPoolName(n.getPrefix(), n
-                            .getLocalName(), n.getAttributes(), 
+                            .getLocalName(), n.getAttributes(),
                             n.getNamedAttributeNodes(), n.hasEmptyBody());
                     n.setTagHandlerPoolName(name);
                     if (!names.contains(name)) {
@@ -1100,7 +1100,7 @@ class Generator {
                 msg.append(name);
                 msg.append(
                         "'. Name was not previously introduced as per JSP.5.3");
-                
+
                 throw new JasperException(msg.toString());
             }
 
@@ -1742,8 +1742,8 @@ class Generator {
                     }
                 }
             }
-            
-            
+
+
             if (n.implementsSimpleTag()) {
                 generateCustomDoTag(n, handlerInfo, tagHandlerVar);
             } else {
@@ -1794,7 +1794,7 @@ class Generator {
                 // restore previous writer
                 out = outSave;
             }
-            
+
         }
 
         private static final String DOUBLE_QUOTE = "\\\"";
@@ -2011,11 +2011,11 @@ class Generator {
                         caOut.print(quote(output));
                         caOut.println(".toCharArray();");
                     }
-    
+
                     n.setBeginJavaLine(out.getJavaLine());
                     out.printil("out.write(" + charArrayName + ");");
                     n.setEndJavaLine(out.getJavaLine());
-                    
+
                     textIndex = textIndex + len;
                 }
                 return;

Modified: tomcat/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java?rev=1187803&r1=1187802&r2=1187803&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java Sat Oct 22 21:18:03 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.
@@ -37,7 +37,7 @@ import org.apache.jasper.xmlparser.TreeN
 
 /**
  * Class responsible for generating an implicit tag library containing tag
- * handlers corresponding to the tag files in "/WEB-INF/tags/" or a 
+ * handlers corresponding to the tag files in "/WEB-INF/tags/" or a
  * subdirectory of it.
  *
  * @author Jan Luehe
@@ -108,7 +108,7 @@ class ImplicitTagLibraryInfo extends Tag
                      * of the "imaginary" <tag-file> element
                      */
                     String suffix = path.endsWith(TAG_FILE_SUFFIX) ?
-                            TAG_FILE_SUFFIX : TAGX_FILE_SUFFIX; 
+                            TAG_FILE_SUFFIX : TAGX_FILE_SUFFIX;
                     String tagName = path.substring(path.lastIndexOf("/") + 1);
                     tagName = tagName.substring(0,
                             tagName.lastIndexOf(suffix));
@@ -118,12 +118,12 @@ class ImplicitTagLibraryInfo extends Tag
                     try {
                         in = ctxt.getResourceAsStream(path);
                         if (in != null) {
-                            
+
                             // Add implicit TLD to dependency list
                             if (pi != null) {
                                 pi.addDependant(path, ctxt.getLastModified(path));
                             }
-                            
+
                             ParserUtils pu = new ParserUtils();
                             TreeNode tld = pu.parseXMLDocument(uri, in);
 
@@ -171,8 +171,8 @@ class ImplicitTagLibraryInfo extends Tag
                     }
                 }
             }
-        }        
-        
+        }
+
     }
 
     /**



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


Mime
View raw message