Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8B97071F1 for ; Sat, 22 Oct 2011 21:18:53 +0000 (UTC) Received: (qmail 76709 invoked by uid 500); 22 Oct 2011 21:18:50 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 76477 invoked by uid 500); 22 Oct 2011 21:18:50 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 76458 invoked by uid 99); 22 Oct 2011 21:18:50 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 22 Oct 2011 21:18:50 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 22 Oct 2011 21:18:36 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A26992388847 for ; Sat, 22 Oct 2011 21:18:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111022211813.A26992388847@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 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 request.getServletPath() 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 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="" */ 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 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 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 insertBefore = new HashSet(); - + static { insertBefore.add(""); insertBefore.add(""); @@ -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 false. * {@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 * <jsp:plugin> 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. - * + * *

* If not specified, defaults to the platform default encoding. *

- * + * * @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 * true 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. * /index.jsp @@ -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("