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 7901671AD for ; Sat, 22 Oct 2011 21:18:51 +0000 (UTC) Received: (qmail 76537 invoked by uid 500); 22 Oct 2011 21:18:50 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 76474 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 76457 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 A840723888CD 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 [3/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.A840723888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java?rev=1187803&r1=1187802&r2=1187803&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java (original) +++ tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.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. @@ -42,7 +42,7 @@ import org.apache.jasper.servlet.JspServ /** * 1. Processes and extracts the directive info in a tag file. 2. Compiles and * loads tag files used in a JSP file. - * + * * @author Kin-man Chung */ @@ -240,7 +240,7 @@ class TagFileProcessor { if (deferredMethod && deferredValue) { err.jspError(n, "jsp.error.deferredmethodandvalue"); } - + String attrName = n.getAttributeValue("name"); boolean required = JspUtil.booleanValue(n .getAttributeValue("required")); @@ -267,7 +267,7 @@ class TagFileProcessor { } else { if (type == null) type = "java.lang.String"; - + if (deferredValue) { type = ValueExpression.class.getName(); } else if (deferredMethod) { @@ -280,7 +280,7 @@ class TagFileProcessor { || deferredValueSpecified || deferredValue)) { err.jspError("jsp.error.invalid.version", path); } - + TagAttributeInfo tagAttributeInfo = new TagAttributeInfo(attrName, required, type, rtexprvalue, fragment, null, deferredValue, deferredMethod, deferredValueType, deferredMethodSignature); @@ -407,14 +407,14 @@ class TagFileProcessor { /** * Reports a translation error if names specified in attributes of * directives are not unique in this translation unit. - * + * * The value of the following attributes must be unique. 1. 'name' * attribute of an attribute directive 2. 'name-given' attribute of a * variable directive 3. 'alias' attribute of variable directive 4. * 'dynamic-attributes' of a tag directive except that * 'dynamic-attributes' can (and must) have the same value when it * appears in multiple tag directives. - * + * * Also, 'name-from' attribute of a variable directive cannot have the * same value as that from another variable directive. */ @@ -475,7 +475,7 @@ class TagFileProcessor { * in it. The method is used to obtain the info on the tag file, when the * handler that it represents is referenced. The tag file is not compiled * here. - * + * * @param pc * the current ParserController used in this compilation * @param name @@ -483,7 +483,7 @@ class TagFileProcessor { * @param path * the path for the tagfile * @param jarResource - * the Jar resource containing the tag file + * the Jar resource containing the tag file * @param tagLibInfo * the TagLibraryInfo object associated with this TagInfo * @return a TagInfo object assembled from the directives in the tag file. @@ -520,7 +520,7 @@ class TagFileProcessor { JarResource tagJarResouce = null; if (tagFilePath.startsWith("/META-INF/")) { - tagJarResouce = + tagJarResouce = compiler.getCompilationContext().getTldLocation( tagInfo.getTagLibrary().getURI()).getJarResource(); } @@ -676,7 +676,7 @@ class TagFileProcessor { /** * Removed the java and class files for the tag prototype generated from the * current compilation. - * + * * @param classFileName * If non-null, remove only the class file with with this name. */ Modified: tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java?rev=1187803&r1=1187802&r2=1187803&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java (original) +++ tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.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. @@ -53,7 +53,7 @@ import org.apache.juli.logging.LogFactor /** * Implementation of the TagLibraryInfo class from the JSP spec. - * + * * @author Anil K. Vijendran * @author Mandar Raje * @author Pierre Delisle @@ -66,7 +66,7 @@ class TagLibraryInfoImpl extends TagLibr private final Log log = LogFactory.getLog(TagLibraryInfoImpl.class); private JspCompilationContext ctxt; - + private PageInfo pi; private ErrorDispatcher err; @@ -200,7 +200,7 @@ class TagLibraryInfoImpl extends TagLibr Collection coll = pi.getTaglibs(); return coll.toArray(new TagLibraryInfo[0]); } - + /* * @param ctxt The JSP compilation context @param uri The TLD's uri @param * in The TLD's input stream @param jarFileUrl The JAR file containing the @@ -297,7 +297,7 @@ class TagLibraryInfoImpl extends TagLibr /* * @param uri The uri of the TLD @param ctxt The compilation context - * + * * @return String array whose first element denotes the path to the TLD. If * the path to the TLD points to a jar file, then the second element denotes * the name of the TLD entry in the jar file, which is hardcoded to @@ -432,11 +432,11 @@ class TagLibraryInfoImpl extends TagLibr /* * Parses the tag file directives of the given TagFile and turns them into a * TagInfo. - * + * * @param elem The element in the TLD @param uri The location of * the TLD, in case the tag file is specified relative to it @param jarFile * The JAR file, in case the tag file is packaged in a JAR - * + * * @return TagInfo corresponding to tag file directives */ private TagFileInfo createTagFileInfo(TreeNode elem, JarResource jarResource) @@ -457,8 +457,8 @@ class TagLibraryInfoImpl extends TagLibr // Ignore element: Bugzilla 33538 } else if ("tag-extension".equals(tname)) { // Ignore element: Bugzilla 33538 - } else if ("icon".equals(tname) - || "display-name".equals(tname) + } else if ("icon".equals(tname) + || "display-name".equals(tname) || "description".equals(tname)) { // Ignore these elements: Bugzilla 38015 } else { @@ -576,7 +576,7 @@ class TagLibraryInfoImpl extends TagLibr // translation time) the type is fixed at java.lang.String. type = "java.lang.String"; } - + return new TagAttributeInfo(name, required, type, rtexprvalue, isFragment, null, deferredValue, deferredMethod, expectedType, methodSignature); @@ -728,7 +728,7 @@ class TagLibraryInfoImpl extends TagLibr /** * The instance (if any) for the TagLibraryValidator class. - * + * * @return The TagLibraryValidator instance, if any. */ public TagLibraryValidator getTagLibraryValidator() { @@ -739,7 +739,7 @@ class TagLibraryInfoImpl extends TagLibr * Translation-time validation of the XML document associated with the JSP * page. This is a convenience method on the associated TagLibraryValidator * class. - * + * * @param thePage * The JSP page object * @return A string indicating whether the page is valid or not. Modified: tomcat/trunk/java/org/apache/jasper/compiler/TagPluginManager.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TagPluginManager.java?rev=1187803&r1=1187802&r2=1187803&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/compiler/TagPluginManager.java (original) +++ tomcat/trunk/java/org/apache/jasper/compiler/TagPluginManager.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. @@ -68,7 +68,7 @@ public class TagPluginManager { }); } - + private void init(ErrorDispatcher err) throws JasperException { if (initialized) return; @@ -121,7 +121,7 @@ public class TagPluginManager { } /** - * Invoke tag plugin for the given custom tag, if a plugin exists for + * Invoke tag plugin for the given custom tag, if a plugin exists for * the custom tag's tag handler. * * The given custom tag node will be manipulated by the plugin. @@ -237,7 +237,7 @@ public class TagPluginManager { @Override public void generateBody() { - // Since we'll generate the body anyway, this is really a nop, + // Since we'll generate the body anyway, this is really a nop, // except for the fact that it lets us put the Java sources the // plugins produce in the correct order (w.r.t the body). curNodes = node.getAtETag(); Modified: tomcat/trunk/java/org/apache/jasper/compiler/TextOptimizer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TextOptimizer.java?rev=1187803&r1=1187802&r2=1187803&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/compiler/TextOptimizer.java (original) +++ tomcat/trunk/java/org/apache/jasper/compiler/TextOptimizer.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. @@ -81,7 +81,7 @@ public class TextOptimizer { @Override public void visit(Node.TemplateText n) throws JasperException { - if ((options.getTrimSpaces() || pageInfo.isTrimDirectiveWhitespaces()) + if ((options.getTrimSpaces() || pageInfo.isTrimDirectiveWhitespaces()) && n.isAllSpace()) { n.setText(EMPTY_TEXT); return; @@ -99,7 +99,7 @@ public class TextOptimizer { /** * This method breaks concatenation mode. As a side effect it copies - * the concatenated string to the first text node + * the concatenated string to the first text node */ private void collectText() { Modified: tomcat/trunk/java/org/apache/jasper/compiler/TldLocation.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TldLocation.java?rev=1187803&r1=1187802&r2=1187803&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/compiler/TldLocation.java (original) +++ tomcat/trunk/java/org/apache/jasper/compiler/TldLocation.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. @@ -18,18 +18,18 @@ package org.apache.jasper.compiler; public class TldLocation { - + private String entryName; private JarResource jar; - + public TldLocation(String entryName) { this(entryName, (JarResource)null); } - + public TldLocation(String entryName, String resourceUrl) { this(entryName, getJarResource(resourceUrl)); } - + public TldLocation(String entryName, JarResource jarResource) { if (entryName == null) { throw new IllegalArgumentException("Tld name is required"); @@ -37,21 +37,21 @@ public class TldLocation { this.entryName = entryName; this.jar = jarResource; } - + private static JarResource getJarResource(String resourceUrl) { return (resourceUrl != null) ? new JarURLResource(resourceUrl) : null; } - + /** * @return The name of the tag library. */ public String getName() { return entryName; } - + /** - * - * @return The jar resource the tag library is contained in. + * + * @return The jar resource the tag library is contained in. * Might return null if the tag library is not contained in jar resource. */ public JarResource getJarResource() { Modified: tomcat/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java?rev=1187803&r1=1187802&r2=1187803&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java (original) +++ tomcat/trunk/java/org/apache/jasper/compiler/TldLocationsCache.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. @@ -45,7 +45,7 @@ import org.apache.tomcat.util.scan.JarFa /** * A container for all tag libraries that are defined "globally" * for the web application. - * + * * Tag Libraries can be defined globally in one of two ways: * 1. Via elements in web.xml: * the uri and location of the tag-library are specified in @@ -112,9 +112,9 @@ public class TldLocationsCache { private volatile boolean initialized; private ServletContext ctxt; - /** Constructor. + /** Constructor. * - * @param ctxt the servlet context of the web application in which Jasper + * @param ctxt the servlet context of the web application in which Jasper * is running */ public TldLocationsCache(ServletContext ctxt) { @@ -126,8 +126,8 @@ public class TldLocationsCache { /** * Sets the list of JARs that are known not to contain any TLDs. * - * @param jarNames List of comma-separated names of JAR files that are - * known not to contain any TLDs + * @param jarNames List of comma-separated names of JAR files that are + * known not to contain any TLDs */ public static void setNoTldJars(String jarNames) { if (jarNames == null) { @@ -170,7 +170,7 @@ public class TldLocationsCache { * in the web application. 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). - * + * * @param uri The taglib uri * * @return An array of two Strings: The first element denotes the real @@ -186,7 +186,7 @@ public class TldLocationsCache { return mappings.get(uri); } - /** + /** * Returns the type of a URI: * ABS_URI * ROOT_REL_URI @@ -207,7 +207,7 @@ public class TldLocationsCache { * * This supports a Tomcat-specific extension to the TLD search * order defined in the JSP spec. It allows tag libraries packaged as JAR - * files to be shared by web applications by simply dropping them in a + * files to be shared by web applications by simply dropping them in a * location that all web applications have access to (e.g., * /lib). It also supports some of the weird and * wonderful arrangements present when Tomcat gets embedded. @@ -218,7 +218,7 @@ public class TldLocationsCache { try { tldScanWebXml(); tldScanResourcePaths(WEB_INF); - + JarScanner jarScanner = JarScannerFactory.getJarScanner(ctxt); if (jarScanner != null) { jarScanner.scan(ctxt, @@ -251,11 +251,11 @@ public class TldLocationsCache { /* * Populates taglib map described in web.xml. - * + * * This is not kept in sync with o.a.c.startup.TldConfig as the Jasper only * needs the URI to TLD mappings from scan web.xml whereas TldConfig needs * to scan the actual TLD files. - */ + */ private void tldScanWebXml() throws Exception { WebXml webXml = null; @@ -317,7 +317,7 @@ public class TldLocationsCache { * Initially, rootPath equals /WEB-INF/. The /WEB-INF/classes and * /WEB-INF/lib sub-directories are excluded from the search, as per the * JSP 2.0 spec. - * + * * Keep code in sync with o.a.c.startup.TldConfig */ private void tldScanResourcePaths(String startPath) @@ -397,7 +397,7 @@ public class TldLocationsCache { * map for any TLD that has a element. * * @param jarConn The JarURLConnection to the JAR file to scan - * + * * Keep in sync with o.a.c.startup.TldConfig */ private void tldScanJar(JarURLConnection jarConn) throws IOException { @@ -405,13 +405,13 @@ public class TldLocationsCache { Jar jar = null; InputStream is; boolean foundTld = false; - + URL resourceURL = jarConn.getJarFileURL(); String resourcePath = resourceURL.toString(); - + try { jar = JarFactory.newInstance(jarConn.getURL()); - + jar.nextEntry(); String entryName = jar.getEntryName(); while (entryName != null) { @@ -457,7 +457,7 @@ public class TldLocationsCache { /* * Scan the TLD contents in the specified input stream and add any new URIs * to the map. - * + * * @param resourcePath Path of the resource * @param entryName If the resource is a JAR file, the name of the entry * in the JAR file Modified: tomcat/trunk/java/org/apache/jasper/compiler/Validator.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Validator.java?rev=1187803&r1=1187802&r2=1187803&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/compiler/Validator.java (original) +++ tomcat/trunk/java/org/apache/jasper/compiler/Validator.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. @@ -45,7 +45,7 @@ import org.xml.sax.Attributes; * mandatory presence, entry value validity, and consistency. As a side effect, * some page global value (such as those from page directives) are stored, for * later use. - * + * * @author Kin-man Chung * @author Jan Luehe * @author Shawn Bayern @@ -320,10 +320,10 @@ class Validator { /* * Compares page encodings specified in various places, and throws * exception in case of page encoding mismatch. - * + * * @param pageDirEnc The value of the pageEncoding attribute of the page * directive @param pageDir The page directive node - * + * * @throws JasperException in case of page encoding mismatch */ private String comparePageEncodings(String thePageDirEnc, @@ -371,17 +371,17 @@ class Validator { return pageEnc; } } - + return pageDirEnc; } - + /* * Compares page encodings specified in various places, and throws * exception in case of page encoding mismatch. - * + * * @param thePageDirEnc The value of the pageEncoding attribute of the page * directive @param pageDir The page directive node - * + * * @throws JasperException in case of page encoding mismatch */ private void compareTagEncodings(String thePageDirEnc, @@ -780,7 +780,7 @@ class Validator { if (value == null) { return false; } - + int i = 0; int len = value.length(); boolean prevCharIsEscape = false; @@ -1043,19 +1043,19 @@ class Validator { /* * Make sure the given custom action does not have any invalid * attributes. - * + * * A custom action and its declared attributes always belong to the same * namespace, which is identified by the prefix name of the custom tag * invocation. For example, in this invocation: - * + * * , the action - * + * * "test" and its attributes "a", "b", and "c" all belong to the * namespace identified by the prefix "my". The above invocation would * be equivalent to: - * + * * - * + * * An action attribute may have a prefix different from that of the * action invocation only if the underlying tag handler supports dynamic * attributes, in which case the attribute with the different prefix is @@ -1074,7 +1074,7 @@ class Validator { for (int i = 0; attrs != null && i < attrs.getLength(); i++) { boolean found = false; - + boolean runtimeExpression = ((n.getRoot().isXmlSyntax() && attrs.getValue(i).startsWith("%=")) || (!n.getRoot().isXmlSyntax() && attrs.getValue(i).startsWith("<%="))); boolean elExpression = false; @@ -1122,7 +1122,7 @@ class Validator { TagAttributeInfo tldAttr = tldAttrs[j]; if (tldAttr.canBeRequestTime() || tldAttr.isDeferredMethod() || tldAttr.isDeferredValue()) { // JSP 2.1 - + if (!expression) { String expectedType = null; @@ -1202,12 +1202,12 @@ class Validator { err.jspError(n, "jsp.error.attribute.custom.non_rt_with_expr", tldAttr.getName()); } - + if (elExpression) { // El expression validateFunctions(el, n); jspAttrs[i] = new Node.JspAttribute(tldAttr, - attrs.getQName(i), attrs.getURI(i), + attrs.getQName(i), attrs.getURI(i), attrs.getLocalName(i), attrs.getValue(i), false, el, false); ELContextImpl ctx = new ELContextImpl(); @@ -1216,7 +1216,7 @@ class Validator { jspAttrs[i].validateEL(this.pageInfo.getExpressionFactory(), ctx); } catch (ELException e) { this.err.jspError(n.getStart(), - "jsp.error.invalid.expression", + "jsp.error.invalid.expression", attrs.getValue(i), e.toString()); } } else { @@ -1227,7 +1227,7 @@ class Validator { .getValue(i), n, false); } } - + } else { // Attribute does not accept any expressions. // Make sure its value does not contain any. @@ -1269,7 +1269,7 @@ class Validator { * attributes */ private void checkNamedAttributes(Node.CustomTag n, - Node.JspAttribute[] jspAttrs, int start, + Node.JspAttribute[] jspAttrs, int start, Hashtable tagDataAttrs) throws JasperException { @@ -1421,7 +1421,7 @@ class Validator { * expression. */ private boolean isExpression(Node n, String value, boolean checkDeferred) { - + boolean runtimeExpression = ((n.getRoot().isXmlSyntax() && value.startsWith("%=")) || (!n.getRoot().isXmlSyntax() && value.startsWith("<%="))); boolean elExpression = false; @@ -1434,7 +1434,7 @@ class Validator { if (node instanceof ELNode.Root) { if (((ELNode.Root) node).getType() == '$') { elExpression = true; - } else if (checkDeferred && !pageInfo.isDeferredSyntaxAllowedAsLiteral() + } else if (checkDeferred && !pageInfo.isDeferredSyntaxAllowedAsLiteral() && ((ELNode.Root) node).getType() == '#') { elExpression = true; } @@ -1599,7 +1599,7 @@ class Validator { /** * Get the parameters types from the function signature. - * + * * @return An array of parameter class names */ private String[] getParameters(ELNode.Function func) Modified: tomcat/trunk/java/org/apache/jasper/compiler/WebXml.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/WebXml.java?rev=1187803&r1=1187802&r2=1187803&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/compiler/WebXml.java (original) +++ tomcat/trunk/java/org/apache/jasper/compiler/WebXml.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,15 +37,15 @@ import org.xml.sax.InputSource; * provided and in Servlet 3.0 / JSP 2.2 environments an application's web.xml * may be the result of merging a number of web-fragment.xml files and/or * annotations with the main web.xml - * - * Clients *must* ensure that they call {@link #close()} to clean up resources. + * + * Clients *must* ensure that they call {@link #close()} to clean up resources. */ public class WebXml { private static final String FILE_PROTOCOL = "file:"; private static final String WEB_XML = "/WEB-INF/web.xml"; private final Log log = LogFactory.getLog(WebXml.class); - + private InputStream stream; private InputSource source; private String systemId; @@ -58,7 +58,7 @@ public class WebXml { source = new InputSource(new StringReader(webXml)); systemId = org.apache.tomcat.util.scan.Constants.MERGED_WEB_XML; } - + // If not available as context attribute, look for an alternative // location if (source == null) { @@ -79,7 +79,7 @@ public class WebXml { } } } - + // Finally, try the default /WEB-INF/web.xml if (source == null) { URL uri = ctxt.getResource(WEB_XML); @@ -99,7 +99,7 @@ public class WebXml { source.setSystemId(systemId); } } - + public String getSystemId() { return systemId; } Modified: tomcat/trunk/java/org/apache/jasper/compiler/tagplugin/TagPlugin.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/tagplugin/TagPlugin.java?rev=1187803&r1=1187802&r2=1187803&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/compiler/tagplugin/TagPlugin.java (original) +++ tomcat/trunk/java/org/apache/jasper/compiler/tagplugin/TagPlugin.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. Modified: tomcat/trunk/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java?rev=1187803&r1=1187802&r2=1187803&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java (original) +++ tomcat/trunk/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.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. Modified: tomcat/trunk/java/org/apache/jasper/el/ELContextImpl.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/el/ELContextImpl.java?rev=1187803&r1=1187802&r2=1187803&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/el/ELContextImpl.java (original) +++ tomcat/trunk/java/org/apache/jasper/el/ELContextImpl.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. @@ -28,7 +28,7 @@ import javax.el.VariableMapper; /** * Implementation of ELContext - * + * * @author Jacob Hookom */ public final class ELContextImpl extends ELContext { Modified: tomcat/trunk/java/org/apache/jasper/el/ELContextWrapper.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/el/ELContextWrapper.java?rev=1187803&r1=1187802&r2=1187803&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/el/ELContextWrapper.java (original) +++ tomcat/trunk/java/org/apache/jasper/el/ELContextWrapper.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. @@ -25,14 +25,14 @@ import javax.el.VariableMapper; /** * Simple ELContextWrapper for runtime evaluation of EL w/ dynamic FunctionMappers - * + * * @author jhook */ public final class ELContextWrapper extends ELContext { private final ELContext target; private final FunctionMapper fnMapper; - + public ELContextWrapper(ELContext target, FunctionMapper fnMapper) { this.target = target; this.fnMapper = fnMapper; Modified: tomcat/trunk/java/org/apache/jasper/el/ELResolverImpl.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/el/ELResolverImpl.java?rev=1187803&r1=1187802&r2=1187803&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/el/ELResolverImpl.java (original) +++ tomcat/trunk/java/org/apache/jasper/el/ELResolverImpl.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. Modified: tomcat/trunk/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java?rev=1187803&r1=1187802&r2=1187803&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java (original) +++ tomcat/trunk/java/org/apache/jasper/el/ExpressionEvaluatorImpl.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. @@ -29,7 +29,7 @@ import javax.servlet.jsp.el.VariableReso public final class ExpressionEvaluatorImpl extends ExpressionEvaluator { private final ExpressionFactory factory; - + public ExpressionEvaluatorImpl(ExpressionFactory factory) { this.factory = factory; } Modified: tomcat/trunk/java/org/apache/jasper/el/ExpressionImpl.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/el/ExpressionImpl.java?rev=1187803&r1=1187802&r2=1187803&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/el/ExpressionImpl.java (original) +++ tomcat/trunk/java/org/apache/jasper/el/ExpressionImpl.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 javax.servlet.jsp.el.VariableReso public final class ExpressionImpl extends Expression { private final ValueExpression ve; - + public ExpressionImpl(ValueExpression ve) { this.ve = ve; } Modified: tomcat/trunk/java/org/apache/jasper/el/FunctionMapperImpl.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/el/FunctionMapperImpl.java?rev=1187803&r1=1187802&r2=1187803&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/el/FunctionMapperImpl.java (original) +++ tomcat/trunk/java/org/apache/jasper/el/FunctionMapperImpl.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 javax.servlet.jsp.el.FunctionMapp @Deprecated public final class FunctionMapperImpl extends javax.el.FunctionMapper { - + private final FunctionMapper fnMapper; public FunctionMapperImpl(FunctionMapper fnMapper) { Modified: tomcat/trunk/java/org/apache/jasper/el/JspELException.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/el/JspELException.java?rev=1187803&r1=1187802&r2=1187803&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/el/JspELException.java (original) +++ tomcat/trunk/java/org/apache/jasper/el/JspELException.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. Modified: tomcat/trunk/java/org/apache/jasper/el/JspMethodExpression.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/el/JspMethodExpression.java?rev=1187803&r1=1187802&r2=1187803&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/el/JspMethodExpression.java (original) +++ tomcat/trunk/java/org/apache/jasper/el/JspMethodExpression.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. Modified: tomcat/trunk/java/org/apache/jasper/el/JspMethodNotFoundException.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/el/JspMethodNotFoundException.java?rev=1187803&r1=1187802&r2=1187803&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/el/JspMethodNotFoundException.java (original) +++ tomcat/trunk/java/org/apache/jasper/el/JspMethodNotFoundException.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. Modified: tomcat/trunk/java/org/apache/jasper/el/JspPropertyNotFoundException.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/el/JspPropertyNotFoundException.java?rev=1187803&r1=1187802&r2=1187803&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/el/JspPropertyNotFoundException.java (original) +++ tomcat/trunk/java/org/apache/jasper/el/JspPropertyNotFoundException.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. Modified: tomcat/trunk/java/org/apache/jasper/el/JspPropertyNotWritableException.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/el/JspPropertyNotWritableException.java?rev=1187803&r1=1187802&r2=1187803&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/el/JspPropertyNotWritableException.java (original) +++ tomcat/trunk/java/org/apache/jasper/el/JspPropertyNotWritableException.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. Modified: tomcat/trunk/java/org/apache/jasper/el/JspValueExpression.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/el/JspValueExpression.java?rev=1187803&r1=1187802&r2=1187803&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/el/JspValueExpression.java (original) +++ tomcat/trunk/java/org/apache/jasper/el/JspValueExpression.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. @@ -29,7 +29,7 @@ import javax.el.ValueExpression; /** * Wrapper for providing context to ValueExpressions - * + * * @author Jacob Hookom */ public final class JspValueExpression extends ValueExpression implements Modified: tomcat/trunk/java/org/apache/jasper/el/VariableResolverImpl.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/el/VariableResolverImpl.java?rev=1187803&r1=1187802&r2=1187803&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/el/VariableResolverImpl.java (original) +++ tomcat/trunk/java/org/apache/jasper/el/VariableResolverImpl.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. @@ -24,7 +24,7 @@ import javax.servlet.jsp.el.VariableReso public final class VariableResolverImpl implements VariableResolver { private final ELContext ctx; - + public VariableResolverImpl(ELContext ctx) { this.ctx = ctx; } Modified: tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=1187803&r1=1187802&r2=1187803&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties (original) +++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties Sat Oct 22 21:18:03 2011 @@ -41,12 +41,12 @@ jsp.error.not.impl.include=Internal erro jsp.error.unavailable=JSP has been marked unavailable jsp.error.usebean.missing.attribute=useBean: id attribute missing or misspelled jsp.error.usebean.missing.type=useBean ({0}): Either class or type attribute must be \ -specified: +specified: jsp.error.usebean.duplicate=useBean: Duplicate bean name: {0} jsp.error.usebean.prohibited.as.session=Can't use as session bean {0} since it is prohibited \ -by jsp directive defined earlier: -jsp.error.usebean.not.both=useBean: Can't specify both class and beanName attribute: -jsp.error.usebean.bad.type.cast=useBean ({0}): Type ({1}) is not assignable from class ({2}) +by jsp directive defined earlier: +jsp.error.usebean.not.both=useBean: Can't specify both class and beanName attribute: +jsp.error.usebean.bad.type.cast=useBean ({0}): Type ({1}) is not assignable from class ({2}) jsp.error.invalid.scope=Illegal value of \'scope\' attribute: {0} (must be one of \"page\", \"request\", \"session\", or \"application\") jsp.error.classname=Can't determine classname from .class file jsp.error.outputfolder=No output folder @@ -71,8 +71,8 @@ jsp.error.page.conflict.language=Page di jsp.error.tag.conflict.language=Tag directive: illegal to have multiple occurrences of 'language' with different values (old: {0}, new: {1}) jsp.error.page.language.nonjava=Page directive: invalid language attribute jsp.error.tag.language.nonjava=Tag directive: invalid language attribute -jsp.error.page.defafteruse.language=Page directive: can't define language after a scriptlet -jsp.error.page.nomapping.language=Page directive: No mapping for language: +jsp.error.page.defafteruse.language=Page directive: can't define language after a scriptlet +jsp.error.page.nomapping.language=Page directive: No mapping for language: jsp.error.page.conflict.extends=Page directive: illegal to have multiple occurrences of 'extends' with different values (old: {0}, new: {1}) jsp.error.page.conflict.iselignored=Page directive: illegal to have multiple occurrences of 'isELIgnored' with different values (old: {0}, new: {1}) jsp.error.tag.conflict.iselignored=Tag directive: illegal to have multiple occurrences of 'isELIgnored' with different values (old: {0}, new: {1}) @@ -84,7 +84,7 @@ jsp.error.tag.multi.pageencoding=Tag dir jsp.error.page.bad_b_and_a_combo=Page directive: Illegal combination of buffer=\"none\" && autoFlush=\"false\" jsp.error.not.impl.taglib=Internal error: Tag extensions not implemented jsp.error.include.missing.file=Missing file argument to include -jsp.error.include.bad.file=Bad file argument to include +jsp.error.include.bad.file=Bad file argument to include jsp.error.include.exception=Unable to include {0} jsp.error.stream.close.failed=Failed to close stream jsp.error.stream.closed=Stream closed @@ -153,13 +153,13 @@ jsp.error.setproperty.beanNotFound=setPr jsp.error.getproperty.beanNotFound=getProperty: Bean {0} not found jsp.error.setproperty.ClassNotFound=setProperty: Class {0} not found jsp.error.javac=Javac exception -jsp.error.javac.env=Environment: +jsp.error.javac.env=Environment: jsp.error.compilation=Error compiling file: {0} {1} jsp.error.setproperty.invalidSyntax=setProperty: can't have non-null value when property=* jsp.error.setproperty.beanInfoNotFound=setproperty: beanInfo for bean {0} not found jsp.error.setproperty.paramOrValue=setProperty: either param or value can be present jsp.error.setproperty.arrayVal=setProperty: can't set array property {0} through a string constant value -jsp.error.undeclared_namespace=A custom tag was encountered with an undeclared namespace [{0}] +jsp.error.undeclared_namespace=A custom tag was encountered with an undeclared namespace [{0}] jsp.warning.keepgen=Warning: Invalid value for the initParam keepgenerated. Will use the default value of \"false\" jsp.warning.xpoweredBy=Warning: Invalid value for the initParam xpoweredBy. Will use the default value of \"false\" jsp.warning.enablePooling=Warning: Invalid value for the initParam enablePooling. Will use the default value of \"true\" @@ -227,9 +227,9 @@ jsp.error.bad_string_char=Cannot extract jsp.warning.compiler.class.cantcreate=Can't create an instance of specified compiler plugin class {0} due to {1}. Will default to Sun Java Compiler. jsp.warning.compiler.class.notfound=Specified compiler plugin class {0} not found. Will default to Sun Java Compiler. jsp.warning.compiler.path.notfound=Specified compiler path {0} not found. Will default to system PATH. -jsp.warning.compiler.classfile.delete.fail=Failed to delete generated class file [{0}] +jsp.warning.compiler.classfile.delete.fail=Failed to delete generated class file [{0}] jsp.warning.compiler.classfile.delete.fail.unknown=Failed to delete generated class file(s) -jsp.warning.compiler.javafile.delete.fail=Failed to delete generated Java file [{0}] +jsp.warning.compiler.javafile.delete.fail=Failed to delete generated Java file [{0}] jsp.warning.compiler.javafile.delete.fail.unknown=Failed to delete generated Java file(s) jsp.error.jspc.uriroot_not_dir=The -uriroot option must specify a pre-existing directory jsp.error.jspc.missingTarget=Missing target: Must specify -webapp or -uriroot, or one or more JSP pages @@ -347,7 +347,7 @@ jsp.error.tld.fn.invalid.signature=Inval jsp.error.tld.fn.duplicate.name=Duplicate function name {0} in tag library {1} jsp.error.tld.fn.invalid.signature.commaexpected=Invalid syntax for function signature in TLD. Comma ',' expected. Tag Library: {0}, Function: {1}. jsp.error.tld.fn.invalid.signature.parenexpected=Invalid syntax for function signature in TLD. Parenthesis '(' expected. Tag Library: {0}, Function: {1}. -jsp.error.tld.mandatory.element.missing=Mandatory TLD element {0} missing or empty in TLD {1} +jsp.error.tld.mandatory.element.missing=Mandatory TLD element {0} missing or empty in TLD {1} jsp.error.dynamic.attributes.not.implemented=The {0} tag declares that it accepts dynamic attributes but does not implement the required interface jsp.error.nomatching.fragment=Cannot find an attribute directive (with name={0} and fragment=true) prior to the fragment directive. jsp.error.attribute.noequal=equal symbol expected @@ -423,7 +423,7 @@ jsp.error.xml.invalidCharInTextDecl = An jsp.error.xml.invalidCharInXMLDecl = An invalid XML character (Unicode: 0x{0}) was found in the XML declaration. jsp.error.xml.closeQuoteMissingInTextDecl = closing quote in the value following \"{0}\" in the text declaration is missing. jsp.error.xml.closeQuoteMissingInXMLDecl = closing quote in the value following \"{0}\" in the XML declaration is missing. -jsp.error.multiple.jsp = Cannot have multiple specifications of +jsp.error.multiple.jsp = Cannot have multiple specifications of jsp.error.jspoutput.conflict=<jsp:output>: illegal to have multiple occurrences of \"{0}\" with different values (old: {1}, new: {2}) jsp.error.jspoutput.doctypenamesystem=<jsp:output>: 'doctype-root-element' and 'doctype-system' attributes must appear together jsp.error.jspoutput.doctypepulicsystem=<jsp:output>: 'doctype-system' attribute must appear if 'doctype-public' attribute appears Modified: tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties?rev=1187803&r1=1187802&r2=1187803&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties (original) +++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties Sat Oct 22 21:18:03 2011 @@ -40,9 +40,9 @@ jsp.error.unavailable = JSP ha sido marc jsp.error.usebean.missing.attribute = useBean\: falta atributo id o est\u00E1 mal digitado jsp.error.usebean.missing.type = useBean ({0})\: Se debe de especificar atributo class o type\: jsp.error.usebean.duplicate = useBean\: Nombre de bean duplicado\: {0} -jsp.error.usebean.prohibited.as.session = No puedo usar como bean de sesi\u00F3n {0} ya que est\u00E1 prohibido por directiva jsp definida previamente\: -jsp.error.usebean.not.both = useBean\: No puede especificar ambos atributos class y beanName\: -jsp.error.usebean.bad.type.cast = useBean ({0})\: Tipo ({1}) no es asignable desde clase ({2}) +jsp.error.usebean.prohibited.as.session = No puedo usar como bean de sesi\u00F3n {0} ya que est\u00E1 prohibido por directiva jsp definida previamente\: +jsp.error.usebean.not.both = useBean\: No puede especificar ambos atributos class y beanName\: +jsp.error.usebean.bad.type.cast = useBean ({0})\: Tipo ({1}) no es asignable desde clase ({2}) jsp.error.invalid.scope = Valor ilegal de atributo 'scope'\: {0} (debe de ser uno de "page", "request", "session", o "application") jsp.error.classname = No pude determinar el nombre de clase desde el fichero .class jsp.error.outputfolder = no hay carpeta de salida @@ -68,7 +68,7 @@ jsp.error.tag.conflict.language = Direct jsp.error.page.language.nonjava = Directiva Page\: atributo language incorrecto jsp.error.tag.language.nonjava = Directiva Tag\: atributo language incorrecto jsp.error.page.defafteruse.language = Directiva Page\: No puedo definir lenguage tras un scriptlet -jsp.error.page.nomapping.language = Directiva Page\: No hay mapeado para language\: +jsp.error.page.nomapping.language = Directiva Page\: No hay mapeado para language\: jsp.error.page.conflict.extends = Directiva Page\: es ilegal tener m\u00FAltiples ocurrencias de 'extends' con valores distintos (viejo\: {0}, nuevo\: {1}) jsp.error.page.conflict.iselignored = Directiva Page\: es ilegal tener m\u00FAltiples ocurrencias de 'isELIgnored' con valores distintos (viejo\: {0}, nuevo\: {1}) jsp.error.tag.conflict.iselignored = Directiva Tag\: es ilegal tener m\u00FAltiples ocurrencias de 'isELIgnored' con valores distintos (viejo\: {0}, nuevo\: {1}) @@ -79,7 +79,7 @@ jsp.error.tag.conflict.attr = Directiva jsp.error.tag.multi.pageencoding = La directiva Tag no debe de tener m\u00FAltiples ocurrencias de pageencoding jsp.error.page.bad_b_and_a_combo = Directiva Page\: Combinaci\u00F3n ilegal de buffer\="none" y autoFlush\="false" jsp.error.not.impl.taglib = Error Interno\: Tag extensions no implementado -jsp.error.include.missing.file = No tiene argumento de nombre de fichero +jsp.error.include.missing.file = No tiene argumento de nombre de fichero jsp.error.include.bad.file = Argumento de nombre de fichero no v\u00E1lido jsp.error.include.exception = No se puede incluir {0} jsp.error.stream.close.failed = No pude cerrar el flujo @@ -225,9 +225,9 @@ jsp.error.bad_string_char = No puede ext jsp.warning.compiler.class.cantcreate = No puedo crear una instancia de la clase especificada {0} de plugin del compilador debido a {1}. Se usar\u00E1 el compilador Java de Sun. jsp.warning.compiler.class.notfound = No puedo encontrar una instancia de la clase {0} de plugin de compilador. Se usar\u00E1 el compilador del Java de Sun. jsp.warning.compiler.path.notfound = Trayectoria del compilador especificado {0} no encontrada. Se usar\u00E1 el PATH del sistema. -jsp.warning.compiler.classfile.delete.fail = No pude borrar el fichero generado de clase [{0}] +jsp.warning.compiler.classfile.delete.fail = No pude borrar el fichero generado de clase [{0}] jsp.warning.compiler.classfile.delete.fail.unknown = No pude borrar los ficheros generados de clase -jsp.warning.compiler.javafile.delete.fail = No pude borrar el fichero generado de Java [{0}] +jsp.warning.compiler.javafile.delete.fail = No pude borrar el fichero generado de Java [{0}] jsp.warning.compiler.javafile.delete.fail.unknown = No pude borrar los ficheros generados de Java jsp.error.jspc.uriroot_not_dir = La opci\u00F3n -uriroot debe de especificar un directorio ya existente jsp.error.jspc.missingTarget = Falta target\: Debe de especificar -webapp o -uriroot o una o m\u00E1s p\u00E1ginas JSP @@ -477,6 +477,6 @@ jsp.message.jsp_queue_update = Actualliz jsp.message.jsp_removed_excess = Quitando exceso de JSP para ruta [{0}] desde cola de contexto [{1}] jsp.message.jsp_removed_idle = Quitando JSP ocioso para ruta [{0}] en contexto [{1}] tras {2} segundos"); jsp.message.jsp_unload_check = Revisando JSPs para descaga en contexto [{0}], contador JSP\: {1} tamalo de cola\: {2} -xmlParser.skipBomFail = No pude saltar BOM al analizar flujo de entrada XML +xmlParser.skipBomFail = No pude saltar BOM al analizar flujo de entrada XML jsp.tldCache.noTldInJar = No se han hallado ficheros TLD en [{0}]. Considera a\u00F1adir el JAR a la propiedad tomcat.util.scan.DefaultJarScanner.jarsToSkip en el fichero CATALINA_BASE/conf/catalina.propeperties. jsp.tldCache.noTldSummary = Al menos un JAR, que se ha explorado buscando TLDs, a\u00FAn no conten\u00EDa TLDs. Activar historial de depuraci\u00F3n para este historiador para una completa lista de los JARs que fueron explorados y de los que nos se hall\u00F3 TLDs. Saltarse JARs no necesarios durante la exploraci\u00F3n puede dar lugar a una mejora de tiempo significativa en el arranque y compilaci\u00F3n de JSP . Modified: tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties?rev=1187803&r1=1187802&r2=1187803&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties (original) +++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties Sat Oct 22 21:18:03 2011 @@ -40,12 +40,12 @@ jsp.error.not.impl.include=Erreur intern jsp.error.unavailable=La JSP a \u00e9t\u00e9 marqu\u00e9e comme non disponible jsp.error.usebean.missing.attribute=useBean: l''identificateur d''attribut (id attribute) est manquant ou mal orthographi\u00e9 jsp.error.usebean.missing.type=useBean ({0}): La classe ou le type d''attribut doit \u00eatre\ -sp\u00e9cifi\u00e9: +sp\u00e9cifi\u00e9: jsp.error.usebean.duplicate=useBean: Nom de bean dupliqu\u00e9: {0} jsp.error.usebean.prohibited.as.session=Impossible d''utiliser comme bean de session {0} car c''est interdit\ -par la directive jsp d\u00e9finie pr\u00e9c\u00e9demment: -jsp.error.usebean.not.both=useBean: Impossible de sp\u00e9cifier \u00e0 la fois la classe et l''attribut beanName: -jsp.error.usebean.bad.type.cast=useBean ({0}): Le type ({1}) n''est pas assignable depuis la classe ({2}) +par la directive jsp d\u00e9finie pr\u00e9c\u00e9demment: +jsp.error.usebean.not.both=useBean: Impossible de sp\u00e9cifier \u00e0 la fois la classe et l''attribut beanName: +jsp.error.usebean.bad.type.cast=useBean ({0}): Le type ({1}) n''est pas assignable depuis la classe ({2}) jsp.error.classname=Impossible de d\u00e9terminer le nom de classe d''apr\u00e8s le fichier .class jsp.warning.bad.type=Attention: mauvais type dans le fichier .class jsp.error.data.file.write=Erreur lors de l''\u00e9criture du fichier de donn\u00e9es @@ -57,8 +57,8 @@ jsp.error.page.invalid.autoflush=Directi jsp.error.page.invalid.isthreadsafe=Directive de Page: valeur incorrecte pour isThreadSafe jsp.error.page.invalid.info=Directive de Page: valeur incorrecte pour info jsp.error.page.invalid.iserrorpage=Directive de Page: valeur incorrecte pour isErrorPage -jsp.error.page.defafteruse.language=Directive de Page: on ne peut d\u00e9finir language apr\u00e8s un scriptlet -jsp.error.page.nomapping.language=Directive de Page: Pas de correspondance pour language: +jsp.error.page.defafteruse.language=Directive de Page: on ne peut d\u00e9finir language apr\u00e8s un scriptlet +jsp.error.page.nomapping.language=Directive de Page: Pas de correspondance pour language: jsp.error.page.bad_b_and_a_combo=Directive de Page: combinaison ill\u00e9gale de buffer=\"none\" && autoFlush=\"false\" jsp.error.not.impl.taglib=Internal error: Tag extensions non impl\u00e9ment\u00e9s jsp.error.include.missing.file=l''argument fichier (file) pour l''inclusion (include) est absent @@ -89,7 +89,7 @@ jsp.error.file.cannot.read=Impossible de jsp.error.file.already.registered=Inclusion r\u00e9cursive du fichier {0} jsp.error.file.not.registered=Le fichier {0} n''appara\u00eet pas dans l''inclusion (include) jsp.error.quotes.unterminated=guillemets non termin\u00e9s -jsp.error.attr.quoted=La valeur de l''attribute doit \u00eatre entre guillemets +jsp.error.attr.quoted=La valeur de l''attribute doit \u00eatre entre guillemets jsp.error.attr.novalue=L''attribute {0} n''a pas de valeur jsp.error.tag.attr.unterminated=Liste de tag d''attribut non termin\u00e9e jsp.error.param.noname=Pas de nom dans le tag PARAM Modified: tomcat/trunk/java/org/apache/jasper/runtime/BodyContentImpl.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/BodyContentImpl.java?rev=1187803&r1=1187802&r2=1187803&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/runtime/BodyContentImpl.java (original) +++ tomcat/trunk/java/org/apache/jasper/runtime/BodyContentImpl.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. @@ -30,27 +30,27 @@ import org.apache.jasper.Constants; /** * Write text to a character-output stream, buffering characters so as * to provide for the efficient writing of single characters, arrays, - * and strings. + * and strings. * - * Provide support for discarding for the output that has been buffered. + * Provide support for discarding for the output that has been buffered. * * @author Rajiv Mordani * @author Jan Luehe */ public class BodyContentImpl extends BodyContent { - - private static final String LINE_SEPARATOR = + + private static final String LINE_SEPARATOR = System.getProperty("line.separator"); - private static final boolean LIMIT_BUFFER = + private static final boolean LIMIT_BUFFER = Boolean.valueOf(System.getProperty("org.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER", "false")).booleanValue(); - + private char[] cb; private int nextChar; private boolean closed; - + // Enclosed writer to which any output is written private Writer writer; - + /** * Constructor. */ @@ -61,7 +61,7 @@ public class BodyContentImpl extends Bod nextChar = 0; closed = false; } - + /** * Write a single character. */ @@ -77,7 +77,7 @@ public class BodyContentImpl extends Bod cb[nextChar++] = (char) c; } } - + /** * Write a portion of an array of characters. * @@ -99,22 +99,22 @@ public class BodyContentImpl extends Bod writer.write(cbuf, off, len); } else { ensureOpen(); - + if ((off < 0) || (off > cbuf.length) || (len < 0) || ((off + len) > cbuf.length) || ((off + len) < 0)) { throw new IndexOutOfBoundsException(); } else if (len == 0) { return; - } - + } + if (len >= bufferSize - nextChar) reAllocBuff (len); - + System.arraycopy(cbuf, off, cb, nextChar, len); nextChar+=len; } } - + /** * Write an array of characters. This method cannot be inherited from the * Writer class because it must suppress I/O exceptions. @@ -127,7 +127,7 @@ public class BodyContentImpl extends Bod write(buf, 0, buf.length); } } - + /** * Write a portion of a String. * @@ -143,12 +143,12 @@ public class BodyContentImpl extends Bod ensureOpen(); if (len >= bufferSize - nextChar) reAllocBuff(len); - + s.getChars(off, off + len, cb, nextChar); nextChar += len; } } - + /** * Write a string. This method cannot be inherited from the Writer class * because it must suppress I/O exceptions. @@ -161,7 +161,7 @@ public class BodyContentImpl extends Bod write(s, 0, s.length()); } } - + /** * Write a line separator. The line separator string is defined by the * system property line.separator, and is not necessarily a single @@ -177,7 +177,7 @@ public class BodyContentImpl extends Bod write(LINE_SEPARATOR); } } - + /** * Print a boolean value. The string produced by {@link * java.lang.String#valueOf(boolean)} is translated into bytes @@ -196,7 +196,7 @@ public class BodyContentImpl extends Bod write(b ? "true" : "false"); } } - + /** * Print a character. The character is translated into one or more bytes * according to the platform's default character encoding, and these bytes @@ -214,7 +214,7 @@ public class BodyContentImpl extends Bod write(String.valueOf(c)); } } - + /** * Print an integer. The string produced by {@link * java.lang.String#valueOf(int)} is translated into bytes according @@ -233,7 +233,7 @@ public class BodyContentImpl extends Bod write(String.valueOf(i)); } } - + /** * Print a long integer. The string produced by {@link * java.lang.String#valueOf(long)} is translated into bytes @@ -252,7 +252,7 @@ public class BodyContentImpl extends Bod write(String.valueOf(l)); } } - + /** * Print a floating-point number. The string produced by {@link * java.lang.String#valueOf(float)} is translated into bytes @@ -271,7 +271,7 @@ public class BodyContentImpl extends Bod write(String.valueOf(f)); } } - + /** * Print a double-precision floating-point number. The string produced by * {@link java.lang.String#valueOf(double)} is translated into @@ -290,7 +290,7 @@ public class BodyContentImpl extends Bod write(String.valueOf(d)); } } - + /** * Print an array of characters. The characters are converted into bytes * according to the platform's default character encoding, and these bytes @@ -310,7 +310,7 @@ public class BodyContentImpl extends Bod write(s); } } - + /** * Print a string. If the argument is null then the string * "null" is printed. Otherwise, the string's characters are @@ -330,7 +330,7 @@ public class BodyContentImpl extends Bod write(s); } } - + /** * Print an object. The string produced by the {@link * java.lang.String#valueOf(Object)} method is translated into bytes @@ -349,7 +349,7 @@ public class BodyContentImpl extends Bod write(String.valueOf(obj)); } } - + /** * Terminate the current line by writing the line separator string. The * line separator string is defined by the system property @@ -362,7 +362,7 @@ public class BodyContentImpl extends Bod public void println() throws IOException { newLine(); } - + /** * Print a boolean value and then terminate the line. This method behaves * as though it invokes {@link #print(boolean)} and then @@ -375,7 +375,7 @@ public class BodyContentImpl extends Bod print(x); println(); } - + /** * Print a character and then terminate the line. This method behaves as * though it invokes {@link #print(char)} and then @@ -388,7 +388,7 @@ public class BodyContentImpl extends Bod print(x); println(); } - + /** * Print an integer and then terminate the line. This method behaves as * though it invokes {@link #print(int)} and then @@ -401,7 +401,7 @@ public class BodyContentImpl extends Bod print(x); println(); } - + /** * Print a long integer and then terminate the line. This method behaves * as though it invokes {@link #print(long)} and then @@ -414,7 +414,7 @@ public class BodyContentImpl extends Bod print(x); println(); } - + /** * Print a floating-point number and then terminate the line. This method * behaves as though it invokes {@link #print(float)} and then @@ -427,7 +427,7 @@ public class BodyContentImpl extends Bod print(x); println(); } - + /** * Print a double-precision floating-point number and then terminate the * line. This method behaves as though it invokes {@link @@ -440,7 +440,7 @@ public class BodyContentImpl extends Bod print(x); println(); } - + /** * Print an array of characters and then terminate the line. This method * behaves as though it invokes {@link #print(char[])} and @@ -453,7 +453,7 @@ public class BodyContentImpl extends Bod print(x); println(); } - + /** * Print a String and then terminate the line. This method behaves as * though it invokes {@link #print(String)} and then @@ -466,7 +466,7 @@ public class BodyContentImpl extends Bod print(x); println(); } - + /** * Print an Object and then terminate the line. This method behaves as * though it invokes {@link #print(Object)} and then @@ -479,11 +479,11 @@ public class BodyContentImpl extends Bod print(x); println(); } - + /** * Clear the contents of the buffer. If the buffer has been already * been flushed then the clear operation shall throw an IOException - * to signal the fact that some data has already been irrevocably + * to signal the fact that some data has already been irrevocably * written to the client response stream. * * @throws IOException If an I/O error occurs @@ -500,7 +500,7 @@ public class BodyContentImpl extends Bod } } } - + /** * Clears the current contents of the buffer. Unlike clear(), this * method will not throw an IOException if the buffer has already been @@ -515,7 +515,7 @@ public class BodyContentImpl extends Bod this.clear(); } } - + /** * Close the stream, flushing it first. Once a stream has been closed, * further write() or flush() invocations will cause an IOException to be @@ -531,7 +531,7 @@ public class BodyContentImpl extends Bod closed = true; } } - + /** * This method returns the size of the buffer used by the JspWriter. * @@ -539,13 +539,13 @@ public class BodyContentImpl extends Bod */ @Override public int getBufferSize() { - // According to the spec, the JspWriter returned by + // According to the spec, the JspWriter returned by // JspContext.pushBody(java.io.Writer writer) must behave as // though it were unbuffered. This means that its getBufferSize() // must always return 0. return (writer == null) ? bufferSize : 0; } - + /** * @return the number of bytes unused in the buffer */ @@ -553,7 +553,7 @@ public class BodyContentImpl extends Bod public int getRemaining() { return (writer == null) ? bufferSize-nextChar : 0; } - + /** * Return the value of this BodyJspWriter as a Reader. * Note: this is after evaluation!! There are no scriptlets, @@ -565,7 +565,7 @@ public class BodyContentImpl extends Bod public Reader getReader() { return (writer == null) ? new CharArrayReader (cb, 0, nextChar) : null; } - + /** * Return the value of the BodyJspWriter as a String. * Note: this is after evaluation!! There are no scriptlets, @@ -577,7 +577,7 @@ public class BodyContentImpl extends Bod public String getString() { return (writer == null) ? new String(cb, 0, nextChar) : null; } - + /** * Write the contents of this BodyJspWriter into a Writer. * Subclasses are likely to do interesting things with the @@ -594,7 +594,7 @@ public class BodyContentImpl extends Bod // it doesn't allow to flush. } } - + /** * Sets the writer to which all output is written. */ @@ -629,26 +629,26 @@ public class BodyContentImpl extends Bod private void ensureOpen() throws IOException { if (closed) throw new IOException("Stream closed"); } - + /** * Reallocates buffer since the spec requires it to be unbounded. */ private void reAllocBuff(int len) { - + if (bufferSize + len <= cb.length) { bufferSize = cb.length; return; } - + if (len < cb.length) { len = cb.length; } - + char[] tmp = new char[cb.length + len]; System.arraycopy(cb, 0, tmp, 0, cb.length); cb = tmp; bufferSize = cb.length; } - - + + } Modified: tomcat/trunk/java/org/apache/jasper/runtime/HttpJspBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/HttpJspBase.java?rev=1187803&r1=1187802&r2=1187803&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/runtime/HttpJspBase.java (original) +++ tomcat/trunk/java/org/apache/jasper/runtime/HttpJspBase.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. @@ -34,21 +34,21 @@ import org.apache.jasper.compiler.Locali * @author Anil K. Vijendran */ public abstract class HttpJspBase extends HttpServlet implements HttpJspPage { - + private static final long serialVersionUID = 1L; protected HttpJspBase() { } @Override - public final void init(ServletConfig config) - throws ServletException + public final void init(ServletConfig config) + throws ServletException { super.init(config); jspInit(); _jspInit(); } - + @Override public String getServletInfo() { return Localizer.getMessage("jsp.engine.info"); @@ -64,12 +64,12 @@ public abstract class HttpJspBase extend * Entry point into service. */ @Override - public final void service(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException + public final void service(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { _jspService(request, response); } - + @Override public void jspInit() { } @@ -85,7 +85,7 @@ public abstract class HttpJspBase extend } @Override - public abstract void _jspService(HttpServletRequest request, - HttpServletResponse response) + public abstract void _jspService(HttpServletRequest request, + HttpServletResponse response) throws ServletException, IOException; } Modified: tomcat/trunk/java/org/apache/jasper/runtime/InstanceManagerFactory.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/InstanceManagerFactory.java?rev=1187803&r1=1187802&r2=1187803&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/runtime/InstanceManagerFactory.java (original) +++ tomcat/trunk/java/org/apache/jasper/runtime/InstanceManagerFactory.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. @@ -29,7 +29,7 @@ public class InstanceManagerFactory { } public static InstanceManager getInstanceManager(ServletConfig config) { - InstanceManager instanceManager = + InstanceManager instanceManager = (InstanceManager) config.getServletContext().getAttribute(InstanceManager.class.getName()); if (instanceManager == null) { throw new IllegalStateException("No org.apache.tomcat.InstanceManager set in ServletContext"); Modified: tomcat/trunk/java/org/apache/jasper/runtime/JspApplicationContextImpl.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/JspApplicationContextImpl.java?rev=1187803&r1=1187802&r2=1187803&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/runtime/JspApplicationContextImpl.java (original) +++ tomcat/trunk/java/org/apache/jasper/runtime/JspApplicationContextImpl.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. @@ -43,7 +43,7 @@ import org.apache.jasper.el.ELContextImp /** * Implementation of JspApplicationContext - * + * * @author Jacob Hookom */ public class JspApplicationContextImpl implements JspApplicationContext { @@ -128,7 +128,7 @@ public class JspApplicationContextImpl i r.add(new MapELResolver()); r.add(new ResourceBundleELResolver()); r.add(new ListELResolver()); - r.add(new ArrayELResolver()); + r.add(new ArrayELResolver()); r.add(new BeanELResolver()); r.add(new ScopedAttributeELResolver()); this.resolver = r; Modified: tomcat/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java?rev=1187803&r1=1187802&r2=1187803&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java (original) +++ tomcat/trunk/java/org/apache/jasper/runtime/JspContextWrapper.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. @@ -47,12 +47,12 @@ import org.apache.jasper.util.Enumerator /** * Implementation of a JSP Context Wrapper. - * + * * The JSP Context Wrapper is a JspContext created and maintained by a tag * handler implementation. It wraps the Invoking JSP Context, that is, the * JspContext instance passed to the tag handler by the invoking page via * setJspContext(). - * + * * @author Kin-man Chung * @author Jan Luehe * @author Jacob Hookom @@ -380,7 +380,7 @@ public class JspContextWrapper extends P /** * Copies the variables of the given scope from the virtual page scope of * this JSP context wrapper to the page scope of the invoking JSP context. - * + * * @param scope * variable scope (one of NESTED, AT_BEGIN, or AT_END) */ @@ -457,7 +457,7 @@ public class JspContextWrapper extends P /** * Checks to see if the given variable name is used as an alias, and if so, * returns the variable name for which it is used as an alias. - * + * * @param varName * The variable name to check * @return The variable name for which varName is used as an alias, or @@ -480,9 +480,9 @@ public class JspContextWrapper extends P @Override public ELContext getELContext() { // instead decorate!!! - + return this.invokingJspCtxt.getELContext(); - + /* if (this.elContext != null) { JspFactory jspFact = JspFactory.getDefaultFactory(); Modified: tomcat/trunk/java/org/apache/jasper/runtime/JspFactoryImpl.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/JspFactoryImpl.java?rev=1187803&r1=1187802&r2=1187803&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/runtime/JspFactoryImpl.java (original) +++ tomcat/trunk/java/org/apache/jasper/runtime/JspFactoryImpl.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. @@ -44,9 +44,9 @@ public class JspFactoryImpl extends JspF private final Log log = LogFactory.getLog(JspFactoryImpl.class); private static final String SPEC_VERSION = "2.1"; - private static final boolean USE_POOL = + private static final boolean USE_POOL = Boolean.valueOf(System.getProperty("org.apache.jasper.runtime.JspFactoryImpl.USE_POOL", "true")).booleanValue(); - private static final int POOL_SIZE = + private static final int POOL_SIZE = Integer.valueOf(System.getProperty("org.apache.jasper.runtime.JspFactoryImpl.POOL_SIZE", "8")).intValue(); private ThreadLocal localPool = new ThreadLocal(); @@ -109,7 +109,7 @@ public class JspFactoryImpl extends JspF } else { pc = new PageContextImpl(); } - pc.initialize(servlet, request, response, errorPageURL, + pc.initialize(servlet, request, response, errorPageURL, needsSession, bufferSize, autoflush); return pc; } catch (Throwable ex) { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org