Author: markt
Date: Tue Nov 17 22:31:47 2009
New Revision: 881577
URL: http://svn.apache.org/viewvc?rev=881577&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48148
Correct JavaDoc typos. Patch provided by gingyang.xu
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/JspCompilationContext.java
tomcat/trunk/java/org/apache/jasper/Options.java
tomcat/trunk/java/org/apache/jasper/compiler/Collector.java
tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java
tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java
tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
tomcat/trunk/java/org/apache/jasper/compiler/JarScannerFactory.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/JspUtil.java
tomcat/trunk/java/org/apache/jasper/compiler/Node.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/TextOptimizer.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/tagplugin/TagPluginContext.java
tomcat/trunk/java/org/apache/jasper/runtime/BodyContentImpl.java
tomcat/trunk/java/org/apache/jasper/runtime/JspContextWrapper.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/core/Import.java
tomcat/trunk/java/org/apache/jasper/util/Enumerator.java
tomcat/trunk/java/org/apache/jasper/xmlparser/UTF8Reader.java
tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java
tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java
tomcat/trunk/java/org/apache/juli/OneLineFormatter.java
tomcat/trunk/java/org/apache/juli/logging/DirectJDKLog.java
tomcat/trunk/java/org/apache/juli/logging/Log.java
tomcat/trunk/java/org/apache/juli/logging/LogFactory.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=881577&r1=881576&r2=881577&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/Constants.java (original)
+++ tomcat/trunk/java/org/apache/jasper/Constants.java Tue Nov 17 22:31:47 2009
@@ -178,7 +178,7 @@
Arrays.asList(PRIVATE_CACHED_DTD_RESOURCE_PATHS));
/**
- * Default URLs to download the pluging for Netscape and IE.
+ * Default URLs to download the plugin for Netscape and IE.
*/
public static final String NS_PLUGIN_URL =
"http://java.sun.com/products/plugin/";;
Modified: tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java?rev=881577&r1=881576&r2=881577&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java (original)
+++ tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java Tue Nov 17
22:31:47 2009
@@ -89,7 +89,7 @@
private int checkInterval = 0;
/**
- * Is the generation of SMAP info for JSR45 debuggin suppressed?
+ * Is the generation of SMAP info for JSR45 debugging suppressed?
*/
private boolean isSmapSuppressed = false;
@@ -224,7 +224,7 @@
}
/**
- * Background JSP compile thread check intervall
+ * Background JSP compile thread check interval
*/
public int getCheckInterval() {
return checkInterval;
@@ -245,7 +245,7 @@
}
/**
- * Is the generation of SMAP info for JSR45 debuggin suppressed?
+ * Is the generation of SMAP info for JSR45 debugging suppressed?
*/
public boolean isSmapSuppressed() {
return isSmapSuppressed;
Modified: tomcat/trunk/java/org/apache/jasper/JasperException.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JasperException.java?rev=881577&r1=881576&r2=881577&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/JasperException.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JasperException.java Tue Nov 17
22:31:47 2009
@@ -19,7 +19,7 @@
/**
* Base class for all exceptions generated by the JSP engine. Makes it
- * convienient to catch just this at the top-level.
+ * convenient to catch just this at the top-level.
*
* @author Anil K. Vijendran
*/
Modified: tomcat/trunk/java/org/apache/jasper/JspC.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspC.java?rev=881577&r1=881576&r2=881577&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspC.java Tue Nov 17 22:31:47 2009
@@ -469,7 +469,7 @@
}
/**
- * Is the generation of SMAP info for JSR45 debuggin suppressed?
+ * Is the generation of SMAP info for JSR45 debugging suppressed?
*/
public boolean isSmapSuppressed() {
return smapSuppressed;
@@ -800,7 +800,7 @@
}
/**
- * Obtain JSP configuration informantion specified in web.xml.
+ * Obtain JSP configuration information specified in web.xml.
*/
public JspConfig getJspConfig() {
return jspConfig;
@@ -1381,7 +1381,7 @@
f = new File(fParent);
}
- // If there is no acceptible candidate, uriRoot will
+ // If there is no acceptable candidate, uriRoot will
// remain null to indicate to the CompilerContext to
// use the current working/user dir.
}
Modified: tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java?rev=881577&r1=881576&r2=881577&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java Tue Nov 17
22:31:47 2009
@@ -111,7 +111,7 @@
if (baseURI == null) {
baseURI = "/";
} else if (baseURI.charAt(0) != '/') {
- // strip the basde slash since it will be combined with the
+ // strip the base slash since it will be combined with the
// uriBase to generate a file
baseURI = "/" + baseURI;
}
@@ -263,7 +263,7 @@
*/
public String resolveRelativeUri(String uri) {
// sometimes we get uri's massaged from File(String), so check for
- // a root directory deperator char
+ // a root directory separator char
if (uri.startsWith("/") || uri.startsWith(File.separator)) {
return uri;
} else {
@@ -424,7 +424,7 @@
/**
* Package name for the generated class is make up of the base package
* name, which is user settable, and the derived package name. The
- * derived package name directly mirrors the file heirachy of the JSP page.
+ * derived package name directly mirrors the file hierarchy of the JSP
page.
*/
public String getServletPackageName() {
if (isTagFile()) {
Modified: tomcat/trunk/java/org/apache/jasper/Options.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/Options.java?rev=881577&r1=881576&r2=881577&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/Options.java (original)
+++ tomcat/trunk/java/org/apache/jasper/Options.java Tue Nov 17 22:31:47 2009
@@ -135,8 +135,8 @@
* The cache for the location of the TLD's
* for the various tag libraries 'exposed'
* by the web application.
- * A tag library is 'exposed' either explicitely in
- * web.xml or implicitely via the uri tag in the TLD
+ * A tag library is 'exposed' either explicitly in
+ * web.xml or implicitly via the uri tag in the TLD
* of a taglib deployed in a jar file (WEB-INF/lib).
*
* @return the instance of the TldLocationsCache
@@ -156,7 +156,7 @@
public boolean getFork();
/**
- * Obtain JSP configuration informantion specified in web.xml.
+ * Obtain JSP configuration information specified in web.xml.
*/
public JspConfig getJspConfig();
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Collector.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Collector.java?rev=881577&r1=881576&r2=881577&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Collector.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Collector.java Tue Nov 17
22:31:47 2009
@@ -20,7 +20,7 @@
import org.apache.jasper.JasperException;
/**
- * Collect info about the page and nodes, and make them availabe through
+ * Collect info about the page and nodes, and make them available through
* the PageInfo object.
*
* @author Kin-man Chung
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java?rev=881577&r1=881576&r2=881577&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java Tue Nov 17
22:31:47 2009
@@ -380,8 +380,8 @@
/**
* Determine if a compilation is necessary by checking the time stamp of
the
* JSP page with that of the corresponding .class or .java file. If the
page
- * has dependencies, the check is also extended to its dependeants, and so
- * on. This method can by overidden by a subclasses of Compiler.
+ * has dependencies, the check is also extended to its dependents, and so
+ * on. This method can by overridden by a subclasses of Compiler.
*
* @param checkClass
* If true, check against .class file, if false, check against
Modified: tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java?rev=881577&r1=881576&r2=881577&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java Tue Nov
17 22:31:47 2009
@@ -23,7 +23,7 @@
/**
* This class generates functions mappers for the EL expressions in the page.
- * Instead of a global mapper, a mapper is used for ecah call to EL
+ * Instead of a global mapper, a mapper is used for each call to EL
* evaluator, thus avoiding the prefix overlapping and redefinition
* issues.
*
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Generator.java?rev=881577&r1=881576&r2=881577&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Generator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Generator.java Tue Nov 17
22:31:47 2009
@@ -490,7 +490,7 @@
}
/**
- * Generation of static initializers in preamble. For example, dependant
+ * Generation of static initializers in preamble. For example, dependent
* list, el function map, prefix map. (shared by servlet and tag handler
* preamble generation)
*/
@@ -1335,7 +1335,7 @@
// Create bean
/*
- * Check if bean is alredy there
+ * Check if bean is already there
*/
out.printin("if (");
out.print(name);
@@ -1756,7 +1756,7 @@
out.printil(" throws Throwable {");
out.pushIndent();
- // Initilaize local variables used in this method.
+ // Initialize local variables used in this method.
if (!isTagFile) {
out
.printil("PageContext pageContext =
_jspx_page_context;");
@@ -2020,7 +2020,7 @@
StringBuilder sb = new StringBuilder("out.write(\"");
int initLength = sb.length();
int count = JspUtil.CHUNKSIZE;
- int srcLine = 0; // relative to starting srouce line
+ int srcLine = 0; // relative to starting source line
for (int i = 0; i < text.length(); i++) {
char ch = text.charAt(i);
--count;
@@ -2779,7 +2779,7 @@
/*
* Creates a tag variable name by concatenating the given prefix and
- * shortName and endcoded to make the resultant string a valid Java
+ * shortName and encoded to make the resultant string a valid Java
* Identifier.
*/
private String createTagVarName(String fullName, String prefix,
Modified: tomcat/trunk/java/org/apache/jasper/compiler/JarScannerFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JarScannerFactory.java?rev=881577&r1=881576&r2=881577&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/JarScannerFactory.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JarScannerFactory.java Tue Nov
17 22:31:47 2009
@@ -26,7 +26,7 @@
/**
* Provide a mechanism for Jasper to obtain a reference to the JarScanner
- * impementation.
+ * implementation.
*/
public class JarScannerFactory {
@@ -37,7 +37,7 @@
}
/**
- * Obtain the {...@link JarScanner} associated with the specificed
{...@link
+ * Obtain the {...@link JarScanner} associated with the specified {...@link
* ServletContext}. It is obtained via a context parameter.
*/
public static JarScanner getJarScanner(ServletContext ctxt) {
Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java?rev=881577&r1=881576&r2=881577&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java Tue Nov 17
22:31:47 2009
@@ -174,7 +174,7 @@
extension = file.substring(file.indexOf('.')+1);
}
- // The url patterns are reconstructed as the follwoing:
+ // The url patterns are reconstructed as the following:
// path != null, extension == null: / or /foo/bar.ext
// path == null, extension != null: *.ext
// path != null, extension == "*": /foo/*
Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java?rev=881577&r1=881576&r2=881577&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java Tue Nov
17 22:31:47 2009
@@ -106,7 +106,7 @@
// Nesting level of Tag dependent bodies
private int tagDependentNesting = 0;
- // Flag set to delay incrmenting tagDependentNesting until jsp:body
+ // Flag set to delay incrementing tagDependentNesting until jsp:body
// is first encountered
private boolean tagDependentPending = false;
Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspReader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspReader.java?rev=881577&r1=881576&r2=881577&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/JspReader.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspReader.java Tue Nov 17
22:31:47 2009
@@ -512,7 +512,7 @@
/**
* Unregister the source file.
* This method is used to implement file inclusion. Each included file
- * gets a uniq identifier (which is the index in the array of source
+ * gets a unique identifier (which is the index in the array of source
* files).
*
* @return The index of the now registered file.
@@ -617,7 +617,7 @@
return true;
}
// Note that although the current file is undefined here, "current"
- // is not set to null just for convience, for it maybe used to
+ // is not set to null just for convenience, for it maybe used to
// set the current (undefined) position.
return false;
}
Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java?rev=881577&r1=881576&r2=881577&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java Tue Nov
17 22:31:47 2009
@@ -47,7 +47,7 @@
* &060;%...@include file="..."%&062; directive is used.
*
* A background thread periodically checks the files a JSP page
- * is dependent upon. If a dpendent file changes the JSP page
+ * is dependent upon. If a dependent file changes the JSP page
* which included it is recompiled.
*
* Only used if a web application context is a directory.
@@ -207,7 +207,7 @@
/**
* Get the SecurityManager Policy CodeSource for this web
- * applicaiton context.
+ * application context.
*
* @return CodeSource for JSP
*/
@@ -235,7 +235,7 @@
}
/**
- * Process a "destory" event for this web application context.
+ * Process a "destroy" event for this web application context.
*/
public void destroy() {
Iterator<JspServletWrapper> servlets = jsps.values().iterator();
Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java?rev=881577&r1=881576&r2=881577&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java Tue Nov 17
22:31:47 2009
@@ -947,7 +947,7 @@
/**
* Compute the canonical name from a Class instance. Note that a simple
- * replacment of '$' with '.' of a binary name would not work, as '$' is a
+ * replacement of '$' with '.' of a binary name would not work, as '$' is a
* legal Java Identifier character.
*
* @param c
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Node.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Node.java?rev=881577&r1=881576&r2=881577&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Node.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Node.java Tue Nov 17 22:31:47
2009
@@ -44,8 +44,8 @@
import org.xml.sax.Attributes;
/**
- * An internal data representation of a JSP page or a JSP docuement (XML). Also
- * included here is a visitor class for tranversing nodes.
+ * An internal data representation of a JSP page or a JSP document (XML). Also
+ * included here is a visitor class for traversing nodes.
*
* @author Kin-man Chung
* @author Jan Luehe
@@ -445,7 +445,7 @@
/*
* Indicates whether an encoding has been explicitly specified in the
- * page's bom.
+ * page's dom.
*/
private boolean isBomPresent;
@@ -1889,7 +1889,7 @@
childInfo = new ChildInfo();
name = this.getAttributeValue("name");
if (name != null) {
- // Mandatary attribute "name" will be checked in Validator
+ // Mandatory attribute "name" will be checked in Validator
localName = name;
int index = name.indexOf(':');
if (index != -1) {
@@ -2062,7 +2062,7 @@
* Add a source to Java line mapping
*
* @param srcLine
- * The postion of the source line, relative to the line at
+ * The position of the source line, relative to the line at
* the start of this node. The corresponding java line is
* assumed to be consecutive, i.e. one more than the last.
*/
@@ -2079,7 +2079,7 @@
}
/***************************************************************************
- * Auxillary classes used in Node
+ * Auxiliary classes used in Node
*/
/**
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=881577&r1=881576&r2=881577&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java Tue Nov
17 22:31:47 2009
@@ -463,7 +463,7 @@
}
/**
- * Perform miscellean checks after the nodes are visited.
+ * Perform miscellaneous checks after the nodes are visited.
*/
void postCheck() throws JasperException {
// Check that var.name-from-attributes has valid values.
@@ -505,7 +505,7 @@
* @param path
* the path for the tagfile
* @param tagFileJarUrl
- * the url for the Jar containign the tag file
+ * the url for the Jar 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.
@@ -586,7 +586,7 @@
try {
if (tripCount > 0) {
// When tripCount is greater than zero, a circular
- // dependency exists. The circularily dependant tag
+ // dependency exists. The circularly dependent tag
// file is compiled in prototype mode, to avoid infinite
// recursion.
@@ -604,8 +604,8 @@
wrapper.decTripCount();
}
- // Add the dependants for this tag file to its parent's
- // dependant list. The only reliable dependency information
+ // Add the dependents for this tag file to its parent's
+ // Dependent list. The only reliable dependency information
// can only be obtained from the tag instance.
try {
Object tagIns = tagClazz.newInstance();
@@ -670,7 +670,7 @@
/**
* Implements a phase of the translation that compiles (if necessary) the
* tag files used in a JSP files. The directives in the tag files are
- * assumed to have been proccessed and encapsulated as TagFileInfo in the
+ * assumed to have been processed and encapsulated as TagFileInfo in the
* CustomTag nodes.
*/
public void loadTagFiles(Compiler compiler, Node.Nodes page)
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=881577&r1=881576&r2=881577&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java Tue
Nov 17 22:31:47 2009
@@ -451,7 +451,7 @@
* 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 correspoding to tag file directives
+ * @return TagInfo corresponding to tag file directives
*/
private TagFileInfo createTagFileInfo(TreeNode elem, URL jarFileUrl)
throws JasperException {
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=881577&r1=881576&r2=881577&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/TextOptimizer.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TextOptimizer.java Tue Nov 17
22:31:47 2009
@@ -46,7 +46,7 @@
}
/*
- * The following directis are ignored in text concatenation
+ * The following directives are ignored in text concatenation
*/
@Override
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=881577&r1=881576&r2=881577&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java Tue Nov
17 22:31:47 2009
@@ -113,7 +113,7 @@
private ServletContext ctxt;
//*********************************************************************
- // Constructor and Initilizations
+ // Constructor and Initializations
/*
* Initializes the set of JARs that are known not to contain any TLDs
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=881577&r1=881576&r2=881577&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Validator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Validator.java Tue Nov 17
22:31:47 2009
@@ -43,7 +43,7 @@
/**
* Performs validation on the page elements. Attributes are checked for
* mandatory presence, entry value validity, and consistency. As a side effect,
- * some page global value (such as those from page direcitves) are stored, for
+ * some page global value (such as those from page directives) are stored, for
* later use.
*
* @author Kin-man Chung
@@ -805,7 +805,7 @@
}
/*
- * The bodyconet of a SimpleTag cannot be JSP.
+ * The bodycontent of a SimpleTag cannot be JSP.
*/
if (n.implementsSimpleTag()
&& tagInfo.getBodyContent().equalsIgnoreCase(
@@ -1136,7 +1136,7 @@
}
}
if (tldAttrs[j].isDeferredValue()) {
- // The String litteral must be castable to
what is declared as type
+ // The String literal must be castable to
what is declared as type
// for the attribute
expectedType =
tldAttrs[j].getExpectedTypeName();
}
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=881577&r1=881576&r2=881577&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java
(original)
+++
tomcat/trunk/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java
Tue Nov 17 22:31:47 2009
@@ -19,7 +19,7 @@
/**
- * This interface allows the plugin author to make inqueries about the
+ * This interface allows the plugin author to make inquiries about the
* properties of the current tag, and to use Jasper resources to generate
* direct Java codes in place of tag handler invocations.
*/
@@ -49,7 +49,7 @@
/**
* Generate a declaration in the of the generated class. This can be
- * used to declare an innter class, a method, or a class variable.
+ * used to declare an inner class, a method, or a class variable.
* @param id An unique ID identifying the declaration. It is not
* part of the declaration, and is used to ensure that the
* declaration will only appear once. If this method is
@@ -78,7 +78,7 @@
String getConstantAttribute(String attribute);
/**
- * Generate codesto evaluate value of a attribute in the custom tag
+ * Generate codes to evaluate value of a attribute in the custom tag
* The codes is a Java expression.
* NOTE: Currently cannot handle attributes that are fragments.
* @param attribute The specified attribute
@@ -94,7 +94,7 @@
* Abandon optimization for this tag handler, and instruct
* Jasper to generate the tag handler calls, as usual.
* Should be invoked if errors are detected, or when the tag body
- * is deemed too compilicated for optimization.
+ * is deemed too complicated for optimization.
*/
void dontUseTagPlugin();
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=881577&r1=881576&r2=881577&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/runtime/BodyContentImpl.java (original)
+++ tomcat/trunk/java/org/apache/jasper/runtime/BodyContentImpl.java Tue Nov 17
22:31:47 2009
@@ -503,7 +503,7 @@
/**
* Clears the current contents of the buffer. Unlike clear(), this
- * mehtod will not throw an IOException if the buffer has already been
+ * method will not throw an IOException if the buffer has already been
* flushed. It merely clears the current content of the buffer and
* returns.
*
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=881577&r1=881576&r2=881577&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java Tue Nov
17 22:31:47 2009
@@ -357,7 +357,7 @@
}
/**
- * Synchronize variables before fragment invokation
+ * Synchronize variables before fragment invocation
*/
public void syncBeforeInvoke() {
copyTagToPageScope(VariableInfo.NESTED);
Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java?rev=881577&r1=881576&r2=881577&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java (original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java Tue Nov 17
22:31:47 2009
@@ -159,7 +159,7 @@
* a servlet the opportunity to call
* <code>request.setCharacterEncoding()</code> first.</p>
*
- * @param request The servlet requset we are processing
+ * @param request The servlet request we are processing
*
* @exception ServletException if an invalid parameter value for the
* <code>jsp_precompile</code> parameter name is specified
Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java?rev=881577&r1=881576&r2=881577&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java Tue Nov
17 22:31:47 2009
@@ -228,7 +228,7 @@
/**
* Compile and load a prototype for the Tag file. This is needed
- * when compiling tag files with circular dependencies. A prototpe
+ * when compiling tag files with circular dependencies. A prototype
* (skeleton) with no dependencies on other other tag files is
* generated and compiled.
*/
Modified: tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Import.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Import.java?rev=881577&r1=881576&r2=881577&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Import.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Import.java Tue
Nov 17 22:31:47 2009
@@ -100,7 +100,7 @@
ctxt.generateAttribute("charEncoding");
ctxt.generateJavaSource(";");
- //assign appropriate value tp the charset
+ //assign appropriate value to the charset
ctxt.generateJavaSource("if(null != " + charEncodingName + " " +
"&& !" + charEncodingName + ".equals(\"\")){");
ctxt.generateJavaSource(" " + charSetName + " = "
Modified: tomcat/trunk/java/org/apache/jasper/util/Enumerator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/util/Enumerator.java?rev=881577&r1=881576&r2=881577&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/util/Enumerator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/util/Enumerator.java Tue Nov 17
22:31:47 2009
@@ -32,7 +32,7 @@
* Adapter class that wraps an <code>Enumeration</code> around a Java2
* collection classes object <code>Iterator</code> so that existing APIs
* returning Enumerations can easily run on top of the new collections.
- * Constructors are provided to easliy create such wrappers.
+ * Constructors are provided to easily create such wrappers.
*
* @author Craig R. McClanahan
* @version $Revision$ $Date$
Modified: tomcat/trunk/java/org/apache/jasper/xmlparser/UTF8Reader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/xmlparser/UTF8Reader.java?rev=881577&r1=881576&r2=881577&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/xmlparser/UTF8Reader.java (original)
+++ tomcat/trunk/java/org/apache/jasper/xmlparser/UTF8Reader.java Tue Nov 17
22:31:47 2009
@@ -263,7 +263,7 @@
// NOTE: Having an offset value other than zero means that there was
// an error in the last character read. In this case, we have
// skipped the read so we don't consume any bytes past the
- // error. By signalling the error on the next block read we
+ // error. By signaling the error on the next block read we
// allow the method to return the most valid characters that
// it can on the previous block read. -Ac
else {
Modified: tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java?rev=881577&r1=881576&r2=881577&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java Tue
Nov 17 22:31:47 2009
@@ -1057,7 +1057,7 @@
* This class allows rewinding an inputStream by allowing a mark
* to be set, and the stream reset to that position. <strong>The
* class assumes that it needs to read one character per
- * invocation when it's read() method is inovked, but uses the
+ * invocation when it's read() method is invoked, but uses the
* underlying InputStream's read(char[], offset length) method--it
* won't buffer data read this way!</strong>
*
Modified: tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java?rev=881577&r1=881576&r2=881577&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java (original)
+++ tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java Tue Nov 17
22:31:47 2009
@@ -293,7 +293,7 @@
* Read configuration for the specified classloader.
*
* @param classLoader
- * @throws IOException Errot
+ * @throws IOException Error
*/
protected void readConfiguration(ClassLoader classLoader)
throws IOException {
Modified: tomcat/trunk/java/org/apache/juli/OneLineFormatter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/OneLineFormatter.java?rev=881577&r1=881576&r2=881577&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/juli/OneLineFormatter.java (original)
+++ tomcat/trunk/java/org/apache/juli/OneLineFormatter.java Tue Nov 17 22:31:47
2009
@@ -26,8 +26,8 @@
/**
* Provides same information as default log format but on a single line to make
- * it easier to grep the logs. The only excpetion is stacktraces which are
- * always preceeded by whitespace to make it simple to skip them.
+ * it easier to grep the logs. The only exception is stacktraces which are
+ * always preceded by whitespace to make it simple to skip them.
*/
/*
* Date processing based on AccessLogValve.
Modified: tomcat/trunk/java/org/apache/juli/logging/DirectJDKLog.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/logging/DirectJDKLog.java?rev=881577&r1=881576&r2=881577&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/juli/logging/DirectJDKLog.java (original)
+++ tomcat/trunk/java/org/apache/juli/logging/DirectJDKLog.java Tue Nov 17
22:31:47 2009
@@ -50,7 +50,7 @@
}
try {
Formatter
fmt=(Formatter)Class.forName(SIMPLE_FMT).newInstance();
- // it is also possible that the user modifed
jre/lib/logging.properties -
+ // it is also possible that the user modified
jre/lib/logging.properties -
// but that's really stupid in most cases
Logger root=Logger.getLogger("");
Handler handlers[]=root.getHandlers();
@@ -144,7 +144,7 @@
}
// from commons logging. This would be my number one reason why
java.util.logging
- // is bad - design by comitee can be really bad ! The impact on
performance of
+ // is bad - design by committee can be really bad ! The impact on
performance of
// using java.util.logging - and the ugliness if you need to wrap it - is
far
// worse than the unfriendly and uncommon default format for logs.
Modified: tomcat/trunk/java/org/apache/juli/logging/Log.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/logging/Log.java?rev=881577&r1=881576&r2=881577&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/juli/logging/Log.java (original)
+++ tomcat/trunk/java/org/apache/juli/logging/Log.java Tue Nov 17 22:31:47 2009
@@ -35,7 +35,7 @@
* </ol>
* The mapping of these log levels to the concepts used by the underlying
* logging system is implementation dependent.
- * The implemention should ensure, though, that this ordering behaves
+ * The implementation should ensure, though, that this ordering behaves
* as expected.</p>
*
* <p>Performance is often a logging concern.
Modified: tomcat/trunk/java/org/apache/juli/logging/LogFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/logging/LogFactory.java?rev=881577&r1=881576&r2=881577&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/juli/logging/LogFactory.java (original)
+++ tomcat/trunk/java/org/apache/juli/logging/LogFactory.java Tue Nov 17
22:31:47 2009
@@ -34,7 +34,7 @@
* that corresponds to their logger of choice. This completely avoids any
discovery
* problem, while still allowing the user to switch.
*
- * Note that this implementation is not just a wrapper arround JDK logging (
like
+ * Note that this implementation is not just a wrapper around JDK logging (
like
* the original commons-logging impl ). It adds 2 features - a simpler
configuration
* ( which is in fact a subset of log4j.properties ) and a formatter that is
* less ugly.
@@ -104,7 +104,7 @@
* <strong>Usage:</strong> Set this property when Java is invoked
* and <code>LogFactory</code> will attempt to load a new instance
* of the given implementation class.
- * For example, running the following ant scriplet:
+ * For example, running the following ant scriptlet:
* <code><pre>
* <java classname="${test.runner}" fork="yes"
failonerror="${test.failonerror}">
* ...
@@ -348,7 +348,7 @@
* <p>
* The returned string is of form "classn...@hashcode", ie is the same as
* the return value of the Object.toString() method, but works even when
- * the specified object's class has overidden the toString method.
+ * the specified object's class has overridden the toString method.
*
* @param o may be null.
* @return a string of form classn...@hashcode, or "null" if param o is
null.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
