You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2006/08/24 03:57:54 UTC
svn commit: r434283 [1/2] - in
/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache: catalina/
catalina/cluster/ catalina/connector/http/ catalina/connector/http10/
catalina/core/ catalina/deploy/ catalina/loader/ catalina/logger/
catalina/...
Author: markt
Date: Wed Aug 23 18:57:51 2006
New Revision: 434283
URL: http://svn.apache.org/viewvc?rev=434283&view=rev
Log:
Tidy up JavaDocs to fix build warnings and some easy fixes identified by Eclipse along the way.
Modified:
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/Container.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/Context.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/DefaultContext.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/Server.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/Wrapper.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/cluster/ClusterReceiver.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/cluster/ClusterSender.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/cluster/ClusterSessionBase.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/cluster/StandardCluster.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/connector/http/HttpConnector.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/connector/http/HttpProcessor.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/connector/http/SocketInputStream.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/connector/http10/HttpConnector.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/connector/http10/HttpProcessor.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/core/ContainerBase.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/core/StandardContext.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/core/StandardDefaultContext.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/core/StandardServer.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/core/StandardWrapper.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/deploy/NamingResources.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/loader/StandardClassLoader.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/logger/LoggerBase.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/DefaultContextMBean.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/NamingResourcesMBean.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/StandardContextMBean.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/realm/JDBCRealm.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/realm/UserDatabaseRealm.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/servlets/HTMLManagerServlet.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/servlets/ManagerServlet.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/session/ManagerBase.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/session/PersistentManagerBase.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/session/StandardManager.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/ssi/ByteArrayServletOutputStream.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/ssi/ResponseIncludeWrapper.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/startup/HostConfig.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/startup/WebRuleSet.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/users/AbstractUser.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/Base64.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/CGIProcessEnvironment.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/CharsetMapper.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/DOMWriter.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/DateTool.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/IOTools.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/InstanceSupport.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/ProcessEnvironment.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/ProcessHelper.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/RequestUtil.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/Strftime.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/valves/ErrorDispatcherValve.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/valves/RequestDumperValve.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/ContextAccessController.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/JndiPermission.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/NamingContext.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/ResourceEnvRef.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/TransactionRef.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/factory/ResourceLinkFactory.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/resources/ResourceAttributes.java
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/Container.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/Container.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/Container.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/Container.java Wed Aug 23 18:57:51 2006
@@ -194,7 +194,7 @@
/**
* Set the Cluster with which this Container is associated.
*
- * @param connector The Connector to be added
+ * @param cluster The Cluster to be added
*/
public void setCluster(Cluster cluster);
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/Context.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/Context.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/Context.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/Context.java Wed Aug 23 18:57:51 2006
@@ -467,7 +467,7 @@
/**
* Add a resource link for this web application.
*
- * @param resource New resource link
+ * @param resourceLink New resource link
*/
public void addResourceLink(ContextResourceLink resourceLink);
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/DefaultContext.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/DefaultContext.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/DefaultContext.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/DefaultContext.java Wed Aug 23 18:57:51 2006
@@ -123,8 +123,6 @@
/**
* Get the resources DirContext object with which this Container is
* associated.
- *
- * @param resources The new associated DirContext
*/
public DirContext getResources();
@@ -298,7 +296,7 @@
/**
* Add a resource link for this web application.
*
- * @param resource New resource link
+ * @param resourceLink New resource link
*/
public void addResourceLink(ContextResourceLink resourceLink);
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/Server.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/Server.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/Server.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/Server.java Wed Aug 23 18:57:51 2006
@@ -67,7 +67,7 @@
/**
* Set the global naming resources.
*
- * @param namingResources The new global naming resources
+ * @param globalNamingResources The new global naming resources
*/
public void setGlobalNamingResources
(NamingResources globalNamingResources);
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/Wrapper.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/Wrapper.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/Wrapper.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/Wrapper.java Wed Aug 23 18:57:51 2006
@@ -112,7 +112,7 @@
/**
* Set the run-as identity for this servlet.
*
- * @param value New run-as identity value
+ * @param runAs New run-as identity value
*/
public void setRunAs(String runAs);
@@ -163,7 +163,6 @@
*
* @param name Role name used within this servlet
* @param link Role name used within the web application
- * @param description Description of this security role reference
*/
public void addSecurityReference(String name, String link);
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/cluster/ClusterReceiver.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/cluster/ClusterReceiver.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/cluster/ClusterReceiver.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/cluster/ClusterReceiver.java Wed Aug 23 18:57:51 2006
@@ -81,7 +81,7 @@
/**
* Set the Logger for this component.
*
- * @param debug The Logger to use with this component.
+ * @param logger The Logger to use with this component.
*/
public void setLogger(Logger logger);
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/cluster/ClusterSender.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/cluster/ClusterSender.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/cluster/ClusterSender.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/cluster/ClusterSender.java Wed Aug 23 18:57:51 2006
@@ -66,7 +66,7 @@
/**
* Set the Logger for this component.
*
- * @param debug The Logger to use with this component.
+ * @param logger The Logger to use with this component.
*/
public void setLogger(Logger logger);
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/cluster/ClusterSessionBase.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/cluster/ClusterSessionBase.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/cluster/ClusterSessionBase.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/cluster/ClusterSessionBase.java Wed Aug 23 18:57:51 2006
@@ -98,7 +98,7 @@
/**
* Set the Logger for this component.
*
- * @param debug The Logger to use with this component.
+ * @param logger The Logger to use with this component.
*/
public void setLogger(Logger logger) {
this.logger = logger;
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/cluster/StandardCluster.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/cluster/StandardCluster.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/cluster/StandardCluster.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/cluster/StandardCluster.java Wed Aug 23 18:57:51 2006
@@ -152,7 +152,7 @@
* <code><description>/<version></code>.
*/
public String getInfo() {
- return(this.info);
+ return(info);
}
/**
@@ -232,7 +232,7 @@
/**
* Set the Port associated with our Cluster
*
- * @param port The Port to use
+ * @param multicastPort The Port to use
*/
public void setMulticastPort(int multicastPort) {
int oldMulticastPort = this.multicastPort;
@@ -254,7 +254,7 @@
/**
* Set the Groupaddress associated with our Cluster
*
- * @param port The Groupaddress to use
+ * @param multicastAddress The Groupaddress to use
*/
public void setMulticastAddress(String multicastAddress) {
try {
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/connector/http/HttpConnector.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/connector/http/HttpConnector.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/connector/http/HttpConnector.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/connector/http/HttpConnector.java Wed Aug 23 18:57:51 2006
@@ -306,7 +306,7 @@
/**
* Set the connection timeout for this Connector.
*
- * @param count The new connection timeout
+ * @param connectionTimeout The new connection timeout
*/
public void setConnectionTimeout(int connectionTimeout) {
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/connector/http/HttpProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/connector/http/HttpProcessor.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/connector/http/HttpProcessor.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/connector/http/HttpProcessor.java Wed Aug 23 18:57:51 2006
@@ -140,12 +140,6 @@
/**
- * The match string for identifying a session ID parameter.
- */
- private static final char[] SESSION_ID = match.toCharArray();
-
-
- /**
* The string parser we will use for parsing request lines.
*/
private StringParser parser = new StringParser();
@@ -251,12 +245,6 @@
*/
private static final byte[] ack =
(new String("HTTP/1.1 100 Continue\r\n\r\n")).getBytes();
-
-
- /**
- * CRLF.
- */
- private static final byte[] CRLF = (new String("\r\n")).getBytes();
/**
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/connector/http/SocketInputStream.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/connector/http/SocketInputStream.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/connector/http/SocketInputStream.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/connector/http/SocketInputStream.java Wed Aug 23 18:57:51 2006
@@ -163,7 +163,6 @@
// Reading the method name
int maxRead = requestLine.method.length;
- int readStart = pos;
int readCount = 0;
boolean space = false;
@@ -190,7 +189,6 @@
(sm.getString("requestStream.readline.error"));
}
pos = 0;
- readStart = 0;
}
if (buf[pos] == SP) {
space = true;
@@ -205,7 +203,6 @@
// Reading URI
maxRead = requestLine.uri.length;
- readStart = pos;
readCount = 0;
space = false;
@@ -233,7 +230,6 @@
throw new IOException
(sm.getString("requestStream.readline.error"));
pos = 0;
- readStart = 0;
}
if (buf[pos] == SP) {
space = true;
@@ -252,7 +248,6 @@
// Reading protocol
maxRead = requestLine.protocol.length;
- readStart = pos;
readCount = 0;
while (!eol) {
@@ -278,7 +273,6 @@
throw new IOException
(sm.getString("requestStream.readline.error"));
pos = 0;
- readStart = 0;
}
if (buf[pos] == CR) {
// Skip CR.
@@ -301,7 +295,7 @@
* function is meant to be used during the HTTP request header parsing.
* Do NOT attempt to read the request body using it.
*
- * @param requestLine Request line object
+ * @param header Request header
* @throws IOException If an exception occurs during the underlying socket
* read operations, or if the given buffer is not big enough to accomodate
* the whole line.
@@ -328,7 +322,6 @@
// Reading the header name
int maxRead = header.name.length;
- int readStart = pos;
int readCount = 0;
boolean colon = false;
@@ -354,7 +347,6 @@
(sm.getString("requestStream.readline.error"));
}
pos = 0;
- readStart = 0;
}
if (buf[pos] == COLON) {
colon = true;
@@ -373,11 +365,8 @@
// Reading the header value (which can be spanned over multiple lines)
maxRead = header.value.length;
- readStart = pos;
readCount = 0;
- int crPos = -2;
-
boolean eol = false;
boolean validLine = true;
@@ -398,7 +387,6 @@
throw new IOException
(sm.getString("requestStream.readline.error"));
pos = 0;
- readStart = 0;
}
if ((buf[pos] == SP) || (buf[pos] == HT)) {
pos++;
@@ -430,7 +418,6 @@
throw new IOException
(sm.getString("requestStream.readline.error"));
pos = 0;
- readStart = 0;
}
if (buf[pos] == CR) {
} else if (buf[pos] == LF) {
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/connector/http10/HttpConnector.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/connector/http10/HttpConnector.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/connector/http10/HttpConnector.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/connector/http10/HttpConnector.java Wed Aug 23 18:57:51 2006
@@ -271,7 +271,7 @@
/**
* Set the connection timeout for this Connector.
*
- * @param count The new connection timeout
+ * @param connectionTimeout The new connection timeout
*/
public void setConnectionTimeout(int connectionTimeout) {
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/connector/http10/HttpProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/connector/http10/HttpProcessor.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/connector/http10/HttpProcessor.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/connector/http10/HttpProcessor.java Wed Aug 23 18:57:51 2006
@@ -402,7 +402,7 @@
languages.put(key, v);
}
}
- Vector l = new Vector();
+
Enumeration e = languages.keys();
while (e.hasMoreElements()) {
String key = (String)e.nextElement();
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/core/ContainerBase.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/core/ContainerBase.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/core/ContainerBase.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/core/ContainerBase.java Wed Aug 23 18:57:51 2006
@@ -487,7 +487,7 @@
/**
* Set the Cluster with which this Container is associated.
*
- * @param manager The newly associated Cluster
+ * @param cluster The newly associated Cluster
*/
public synchronized void setCluster(Cluster cluster) {
// Change components if necessary
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/core/StandardContext.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/core/StandardContext.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/core/StandardContext.java Wed Aug 23 18:57:51 2006
@@ -1147,7 +1147,7 @@
* and system.err will be redirected to the logger during a servlet
* execution.
*
- * @param swallowOuptut The new value
+ * @param swallowOutput The new value
*/
public void setSwallowOutput(boolean swallowOutput) {
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/core/StandardDefaultContext.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/core/StandardDefaultContext.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/core/StandardDefaultContext.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/core/StandardDefaultContext.java Wed Aug 23 18:57:51 2006
@@ -122,13 +122,6 @@
/**
- * The Java class name of the default Mapper class for this Container.
- */
- private String mapperClass =
- "org.apache.catalina.core.StandardContextMapper";
-
-
- /**
* The associated naming resources.
*/
private NamingResources namingResources = new NamingResources();
@@ -266,7 +259,6 @@
* @param cookies The new flag
*/
public void setCookies(boolean cookies) {
- boolean oldCookies = this.cookies;
this.cookies = cookies;
}
@@ -288,7 +280,6 @@
* @param crossContext The new cross contexts flag
*/
public void setCrossContext(boolean crossContext) {
- boolean oldCrossContext = this.crossContext;
this.crossContext = crossContext;
}
@@ -322,7 +313,7 @@
* @param reloadable The new reloadable flag
*/
public void setReloadable(boolean reloadable) {
- boolean oldReloadable = this.reloadable;
+
this.reloadable = reloadable;
}
@@ -344,7 +335,7 @@
* @param swallowOutput The new swallowOutput flag
*/
public void setSwallowOutput(boolean swallowOutput) {
- boolean oldSwallowOutput = this.swallowOutput;
+
this.swallowOutput = swallowOutput;
}
@@ -387,8 +378,6 @@
/**
* Get the resources DirContext object with which this Container is
* associated.
- *
- * @param resources The new associated DirContext
*/
public DirContext getResources() {
@@ -675,7 +664,7 @@
/**
* Add a resource link for this web application.
*
- * @param resource New resource link
+ * @param resourceLink New resource link
*/
public void addResourceLink(ContextResourceLink resourceLink) {
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/core/StandardServer.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/core/StandardServer.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/core/StandardServer.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/core/StandardServer.java Wed Aug 23 18:57:51 2006
@@ -365,7 +365,7 @@
/**
* Set the global naming resources.
*
- * @param namingResources The new global naming resources
+ * @param globalNamingResources The new global naming resources
*/
public void setGlobalNamingResources
(NamingResources globalNamingResources) {
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/core/StandardWrapper.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/core/StandardWrapper.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/core/StandardWrapper.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/core/StandardWrapper.java Wed Aug 23 18:57:51 2006
@@ -388,7 +388,7 @@
* Set the maximum number of instances that will be allocated when a single
* thread model servlet is used.
*
- * @param maxInstnces New value of maxInstances
+ * @param maxInstances New value of maxInstances
*/
public void setMaxInstances(int maxInstances) {
@@ -432,7 +432,7 @@
/**
* Set the run-as identity for this servlet.
*
- * @param value New run-as identity value
+ * @param runAs New run-as identity value
*/
public void setRunAs(String runAs) {
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/deploy/NamingResources.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/deploy/NamingResources.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/deploy/NamingResources.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/deploy/NamingResources.java Wed Aug 23 18:57:51 2006
@@ -276,7 +276,7 @@
/**
* Add a resource link for this web application.
*
- * @param resource New resource link
+ * @param resourceLink New resource link
*/
public void addResourceLink(ContextResourceLink resourceLink) {
@@ -495,8 +495,6 @@
/**
* Return the resource parameters with the specified name, if any;
* otherwise return <code>null</code>.
- *
- * @param name Name of the desired resource parameters
*/
public ResourceParams[] findResourceParams() {
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/loader/StandardClassLoader.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/loader/StandardClassLoader.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/loader/StandardClassLoader.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/loader/StandardClassLoader.java Wed Aug 23 18:57:51 2006
@@ -952,7 +952,7 @@
* add read FilePermissions for the base directory (if unpacked),
* the context URL, and jar file resources.
*
- * @param CodeSource where the code was loaded from
+ * @param codeSource CodeSource where the code was loaded from
* @return PermissionCollection for CodeSource
*/
protected final PermissionCollection getPermissions(CodeSource codeSource) {
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java Wed Aug 23 18:57:51 2006
@@ -501,9 +501,9 @@
/**
- * If there is a Java SecurityManager create a Permission.
+ * If there is a Java SecurityManager add a Permission.
*
- * @param url URL for a file or directory on local system
+ * @param permission Permission to add
*/
public void addPermission(Permission permission) {
if ((securityManager != null) && (permission != null)) {
@@ -1549,7 +1549,7 @@
* directory (if unpacked),
* the context URL, and jar file resources.
*
- * @param CodeSource where the code was loaded from
+ * @param codeSource CodeSource where the code was loaded from
* @return PermissionCollection for CodeSource
*/
protected PermissionCollection getPermissions(CodeSource codeSource) {
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/logger/LoggerBase.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/logger/LoggerBase.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/logger/LoggerBase.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/logger/LoggerBase.java Wed Aug 23 18:57:51 2006
@@ -164,7 +164,7 @@
* Set the verbosity level of this logger. Messages logged with a
* higher verbosity than this level will be silently ignored.
*
- * @param verbosityLevel The new verbosity level, as a string
+ * @param verbosity The new verbosity level, as a string
*/
public void setVerbosityLevel(String verbosity) {
@@ -202,7 +202,7 @@
* log. The name and type of the servlet log is specific to the
* servlet container. This message will be logged unconditionally.
*
- * @param message A <code>String</code> specifying the message to be
+ * @param msg A <code>String</code> specifying the message to be
* written to the log file
*/
public abstract void log(String msg);
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/DefaultContextMBean.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/DefaultContextMBean.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/DefaultContextMBean.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/DefaultContextMBean.java Wed Aug 23 18:57:51 2006
@@ -258,7 +258,7 @@
/**
* Remove any environment entry with the specified name.
*
- * @param name Name of the environment entry to remove
+ * @param envName Name of the environment entry to remove
*/
public void removeEnvironment(String envName) {
@@ -300,7 +300,7 @@
/**
* Remove any resource link with the specified name.
*
- * @param resourceName Name of the resource reference to remove
+ * @param resourceLinkName Name of the resource reference to remove
*/
public void removeResourceLink(String resourceLinkName) {
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java Wed Aug 23 18:57:51 2006
@@ -1119,8 +1119,6 @@
*
* @param name MBean Name of the comonent to remove
*
- * @param serviceName Service name of the connector to remove
- *
* @exception Exception if a component cannot be removed
*/
public void removeConnector(String name) throws Exception {
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java Wed Aug 23 18:57:51 2006
@@ -893,10 +893,10 @@
/**
* Create an <code>ObjectName</code> for this
- * <code>Context</code> object.
+ * <code>Wrapper</code> object.
*
* @param domain Domain in which this name is to be created
- * @param context The Context to be named
+ * @param wrapper The Wrapper to be named
*
* @exception MalformedObjectNameException if a name cannot be created
*/
@@ -926,10 +926,10 @@
/**
* Create an <code>ObjectName</code> for this
- * <code>Service</code> object.
+ * <code>ContextEnvironment</code> object.
*
* @param domain Domain in which this name is to be created
- * @param context The ContextEnvironment to be named
+ * @param environment The ContextEnvironment to be named
*
* @exception MalformedObjectNameException if a name cannot be created
*/
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/NamingResourcesMBean.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/NamingResourcesMBean.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/NamingResourcesMBean.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/NamingResourcesMBean.java Wed Aug 23 18:57:51 2006
@@ -255,7 +255,7 @@
/**
* Remove any environment entry with the specified name.
*
- * @param name Name of the environment entry to remove
+ * @param envName Name of the environment entry to remove
*/
public void removeEnvironment(String envName) {
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/StandardContextMBean.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/StandardContextMBean.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/StandardContextMBean.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/StandardContextMBean.java Wed Aug 23 18:57:51 2006
@@ -257,7 +257,7 @@
/**
* Remove any environment entry with the specified name.
*
- * @param name Name of the environment entry to remove
+ * @param envName Name of the environment entry to remove
*/
public void removeEnvironment(String envName) {
@@ -299,7 +299,7 @@
/**
* Remove any resource link with the specified name.
*
- * @param resourceName Name of the resource reference to remove
+ * @param resourceLinkName Name of the resource reference to remove
*/
public void removeResourceLink(String resourceLinkName) {
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/realm/JDBCRealm.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/realm/JDBCRealm.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/realm/JDBCRealm.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/realm/JDBCRealm.java Wed Aug 23 18:57:51 2006
@@ -655,7 +655,7 @@
/**
* Release our use of this connection so that it can be recycled.
*
- * @param dbConnnection The connection to be released
+ * @param dbConnection The connection to be released
*/
protected void release(Connection dbConnection) {
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java Wed Aug 23 18:57:51 2006
@@ -1163,7 +1163,7 @@
* retrieved from the directory.
*
* @param context The directory context
- * @param user The User to be authenticated
+ * @param info The User to be authenticated
* @param credentials Authentication credentials
*
* @exception NamingException if a directory server error occurs
@@ -1726,7 +1726,7 @@
* \ -> \5c
* \0 -> \00
* @param inString string to escape according to RFC 2254 guidelines
- * @return
+ * @return The escaped string
*/
protected String doRFC2254Encoding(String inString) {
StringBuffer buf = new StringBuffer(inString.length());
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/realm/UserDatabaseRealm.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/realm/UserDatabaseRealm.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/realm/UserDatabaseRealm.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/realm/UserDatabaseRealm.java Wed Aug 23 18:57:51 2006
@@ -32,11 +32,11 @@
/**
- * <p>Implementation of {@link Realm} that is based on an implementation of
- * {@link UserDatabase} made available through the global JNDI resources
- * configured for this instance of Catalina. Set the <code>resourceName</code>
- * parameter to the global JNDI resources name for the configured instance
- * of <code>UserDatabase</code> that we should consult.</p>
+ * <p>Implementation of {@link org.apache.catalina.Realm} that is based on an
+ * implementation of {@link UserDatabase} made available through the global JNDI
+ * resources configured for this instance of Catalina. Set the
+ * <code>resourceName</code> parameter to the global JNDI resources name for the
+ * configured instance of <code>UserDatabase</code> that we should consult.</p>
*
* @author Craig R. McClanahan
* @version $Revision$ $Date$
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java Wed Aug 23 18:57:51 2006
@@ -835,7 +835,9 @@
*<p>
* cgiPathPrefix is defined by setting
* this servlet's cgiPathPrefix init parameter
- *
+ *</p>
+ *<p>
+ * Written by Martin Dengler [root@martindengler.com]
*</p>
*
* @param pathInfo String from HttpServletRequest.getPathInfo()
@@ -871,7 +873,6 @@
* cgi script, or null if no cgi was found
* </ul>
*
- * @author Martin Dengler [root@martindengler.com]
* @since Tomcat 4.0
*/
protected String[] findCGI(String pathInfo, String webAppRootDir,
@@ -943,8 +944,7 @@
* Constructs the CGI environment to be supplied to the invoked CGI
* script; relies heavliy on Servlet API methods and findCGI
*
- * @param HttpServletRequest request associated with the CGI
- * invokation
+ * @param req Request associated with the CGI invokation
*
* @return true if environment was set OK, false if there
* was a problem and no environment was set
@@ -1343,7 +1343,7 @@
/**
* Converts null strings to blank strings ("")
*
- * @param string to be converted if necessary
+ * @param s String to be converted if necessary
* @return a non-null string, either the original or the empty string
* ("") if the original was <code>null</code>
*/
@@ -1356,8 +1356,8 @@
/**
* Converts null strings to another string
*
- * @param string to be converted if necessary
- * @param string to return instead of a null string
+ * @param couldBeNull String to be converted if necessary
+ * @param subForNulls String to return instead of a null string
* @return a non-null string, either the original or the substitute
* string if the original was <code>null</code>
*/
@@ -1371,8 +1371,8 @@
/**
* Converts blank strings to another string
*
- * @param string to be converted if necessary
- * @param string to return instead of a blank string
+ * @param couldBeBlank String to be converted if necessary
+ * @param subForBlanks String to return instead of a blank string
* @return a non-null string, either the original or the substitute
* string if the original was <code>null</code> or empty ("")
*/
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java Wed Aug 23 18:57:51 2006
@@ -515,8 +515,8 @@
/**
* Process a POST request for the specified resource.
*
- * @param request The servlet request we are processing
- * @param response The servlet response we are creating
+ * @param req The servlet request we are processing
+ * @param resp The servlet response we are creating
*
* @exception IOException if an input/output error occurs
* @exception ServletException if a servlet-specified error occurs
@@ -662,8 +662,8 @@
/**
* Process a POST request for the specified resource.
*
- * @param request The servlet request we are processing
- * @param response The servlet response we are creating
+ * @param req The servlet request we are processing
+ * @param resp The servlet response we are creating
*
* @exception IOException if an input/output error occurs
* @exception ServletException if a servlet-specified error occurs
@@ -741,8 +741,6 @@
* Get the ETag associated with a file.
*
* @param resourceInfo File object
- * @param strong True if we want a strong ETag, in which case a checksum
- * of the file has to be calculated
*/
protected String getETag(ResourceInfo resourceInfo) {
if (resourceInfo.strongETag != null) {
@@ -2211,7 +2209,7 @@
/**
* Constructor.
*
- * @param pathname Path name of the file
+ * @param path Path name of the file
*/
public ResourceInfo(String path, DirContext resources) {
set(path, resources);
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/servlets/HTMLManagerServlet.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/servlets/HTMLManagerServlet.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/servlets/HTMLManagerServlet.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/servlets/HTMLManagerServlet.java Wed Aug 23 18:57:51 2006
@@ -292,7 +292,6 @@
* Render a HTML list of the currently active Contexts in our virtual host,
* and memory and server status information.
*
- * @param writer Writer to render to
* @param message a message to display
*/
public void list(HttpServletRequest request,
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/servlets/ManagerServlet.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/servlets/ManagerServlet.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/servlets/ManagerServlet.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/servlets/ManagerServlet.java Wed Aug 23 18:57:51 2006
@@ -56,7 +56,6 @@
import org.apache.catalina.Session;
import org.apache.catalina.UserDatabase;
import org.apache.catalina.Wrapper;
-import org.apache.catalina.core.StandardHost;
import org.apache.catalina.core.StandardServer;
import org.apache.catalina.startup.HostConfig;
import org.apache.catalina.util.RequestUtil;
@@ -1378,7 +1377,7 @@
* specified file location.
*
* @param request The servlet request we are processing
- * @param file The file into which we should store the uploaded WAR
+ * @param war The file into which we should store the uploaded WAR
*
* @exception IOException if an I/O error occurs during processing
*/
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java Wed Aug 23 18:57:51 2006
@@ -68,7 +68,6 @@
// -------------------------------------------------------------- Constants
- private static final String METHOD_HEAD = "HEAD";
private static final String METHOD_PROPFIND = "PROPFIND";
private static final String METHOD_PROPPATCH = "PROPPATCH";
private static final String METHOD_MKCOL = "MKCOL";
@@ -715,8 +714,8 @@
/**
* Process a POST request for the specified resource.
*
- * @param request The servlet request we are processing
- * @param response The servlet response we are creating
+ * @param req The servlet request we are processing
+ * @param resp The servlet response we are creating
*
* @exception IOException if an input/output error occurs
* @exception ServletException if a servlet-specified error occurs
@@ -2701,20 +2700,6 @@
}
-
- }
-
-
- // --------------------------------------------------- Property Inner Class
-
-
- private class Property {
-
- public String name;
- public String value;
- public String namespace;
- public String namespaceAbbrev;
- public int status = WebdavStatus.SC_OK;
}
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/session/ManagerBase.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/session/ManagerBase.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/session/ManagerBase.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/session/ManagerBase.java Wed Aug 23 18:57:51 2006
@@ -787,10 +787,9 @@
return sessionCounter;
}
- /** Number of duplicated session IDs generated by the random source.
- * Anything bigger than 0 means problems.
- *
- * @return
+ /**
+ * Number of duplicated session IDs generated by the random source.
+ * Anything bigger than 0 means problems.
*/
public int getDuplicates() {
return duplicates;
@@ -800,17 +799,15 @@
this.duplicates = duplicates;
}
- /** Returns the number of active sessions
- *
- * @return number of sessions active
+ /**
+ * Returns the number of active sessions
*/
public int getActiveSessions() {
return sessions.size();
}
- /** Max number of concurent active sessions
- *
- * @return
+ /**
+ * Max number of concurent active sessions
*/
public int getMaxActive() {
return maxActive;
@@ -820,8 +817,8 @@
this.maxActive = maxActive;
}
- /** For debugging: return a list of all session ids currently active
- *
+ /**
+ * For debugging: return a list of all session ids currently active
*/
public String listSessionIds() {
StringBuffer sb=new StringBuffer();
@@ -832,11 +829,8 @@
return sb.toString();
}
- /** For debugging: get a session attribute
- *
- * @param sessionId
- * @param key
- * @return
+ /**
+ * For debugging: get a session attribute
*/
public String getSessionAttribute( String sessionId, String key ) {
Session s=(Session)sessions.get(sessionId);
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/session/PersistentManagerBase.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/session/PersistentManagerBase.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/session/PersistentManagerBase.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/session/PersistentManagerBase.java Wed Aug 23 18:57:51 2006
@@ -427,8 +427,8 @@
* false, any sessions found in the Store may still be picked up when
* the Manager is started again.
*
- * @param save true if sessions should be saved on restart, false if
- * they should be ignored.
+ * @param saveOnRestart true if sessions should be saved on restart, false
+ * if they should be ignored.
*/
public void setSaveOnRestart(boolean saveOnRestart) {
@@ -885,7 +885,6 @@
// Validate the source of this event
if (!(event.getSource() instanceof Context))
return;
- Context context = (Context) event.getSource();
// Process a relevant property change
if (event.getPropertyName().equals("sessionTimeout")) {
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/session/StandardManager.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/session/StandardManager.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/session/StandardManager.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/session/StandardManager.java Wed Aug 23 18:57:51 2006
@@ -209,9 +209,8 @@
}
- /** Number of session creations that failed due to maxActiveSessions
- *
- * @return
+ /**
+ * Number of session creations that failed due to maxActiveSessions.
*/
public int getRejectedSessions() {
return rejectedSessions;
@@ -221,9 +220,8 @@
this.rejectedSessions = rejectedSessions;
}
- /** Number of sessions that expired.
- *
- * @return
+ /**
+ * Number of sessions that expired.
*/
public int getExpiredSessions() {
return expiredSessions;
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/ssi/ByteArrayServletOutputStream.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/ssi/ByteArrayServletOutputStream.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/ssi/ByteArrayServletOutputStream.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/ssi/ByteArrayServletOutputStream.java Wed Aug 23 18:57:51 2006
@@ -45,7 +45,6 @@
/**
* Write our stream to the <code>OutputStream</code> provided.
*
- * @param out the OutputStream to write this stream to
* @exception IOException if an input/output error occurs
*/
public byte[] toByteArray() {
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/ssi/ResponseIncludeWrapper.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/ssi/ResponseIncludeWrapper.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/ssi/ResponseIncludeWrapper.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/ssi/ResponseIncludeWrapper.java Wed Aug 23 18:57:51 2006
@@ -42,7 +42,7 @@
* and ServletOutputStream.
*
* @param res The HttpServletResponse to use
- * @param out The ServletOutputStream' to use
+ * @param originalServletOutputStream The ServletOutputStream to use
*/
public ResponseIncludeWrapper(HttpServletResponse res,
ServletOutputStream originalServletOutputStream) {
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/startup/HostConfig.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/startup/HostConfig.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/startup/HostConfig.java Wed Aug 23 18:57:51 2006
@@ -501,7 +501,7 @@
/**
- * Used by digester to add a context in {@link getContextPath}.
+ * Used by digester to add a context in {@link #getContextPath}.
*/
public void addChild(Container child) {
context = (Context) child;
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/startup/WebRuleSet.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/startup/WebRuleSet.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/startup/WebRuleSet.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/startup/WebRuleSet.java Wed Aug 23 18:57:51 2006
@@ -404,7 +404,6 @@
public void begin(Attributes attributes) throws Exception {
- Context context = (Context) digester.peek(digester.getCount() - 1);
Object top = digester.peek();
Class paramClasses[] = new Class[1];
paramClasses[0] = "String".getClass();
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/users/AbstractUser.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/users/AbstractUser.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/users/AbstractUser.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/users/AbstractUser.java Wed Aug 23 18:57:51 2006
@@ -121,7 +121,7 @@
/**
* Return the logon username of this user, which must be unique
- * within the scope of a {@link UserDatabase}.
+ * within the scope of a {@link org.apache.catalina.UserDatabase}.
*/
public String getUsername() {
@@ -132,7 +132,7 @@
/**
* Set the logon username of this user, which must be unique within
- * the scope of a {@link UserDatabase}.
+ * the scope of a {@link org.apache.catalina.UserDatabase}.
*
* @param username The new logon username
*/
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/Base64.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/Base64.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/Base64.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/Base64.java Wed Aug 23 18:57:51 2006
@@ -33,7 +33,6 @@
static private final int TWENTYFOURBITGROUP = 24;
static private final int EIGHTBIT = 8;
static private final int SIXTEENBIT = 16;
- static private final int SIXBIT = 6;
static private final int FOURBYTE = 4;
static private final int SIGN = -128;
static private final byte PAD = (byte) '=';
@@ -202,7 +201,7 @@
/**
* Decodes Base64 data into octects
*
- * @param binaryData Byte array containing Base64 data
+ * @param base64Data Byte array containing Base64 data
* @return Array containing decoded data.
*/
public static byte[] decode( byte[] base64Data )
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/CGIProcessEnvironment.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/CGIProcessEnvironment.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/CGIProcessEnvironment.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/CGIProcessEnvironment.java Wed Aug 23 18:57:51 2006
@@ -133,7 +133,7 @@
/**
* Constructs the CGI environment to be supplied to the invoked CGI
* script; relies heavliy on Servlet API methods and findCGI
- * @param HttpServletRequest request associated with the CGI invokation
+ * @param req Request associated with the CGI invokation
* @return true if environment was set OK, false if there was a problem
* and no environment was set
*/
@@ -302,6 +302,9 @@
* cgiPathPrefix is usually set by the calling servlet to the servlet's
* cgiPathPrefix init parameter
* </p>
+ * <p>
+ * Written by Martin Dengler [root@martindengler.com]
+ * </p>
*
* @param pathInfo String from HttpServletRequest.getPathInfo()
* @param webAppRootDir String from context.getRealPath("/")
@@ -322,7 +325,7 @@
* the cgi script, or null if no cgi
* was found
* </ul>
- * @author Martin Dengler [root@martindengler.com]
+ *
* @since Tomcat 4.0
*/
protected String[] findCGI(String pathInfo, String webAppRootDir,
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/CharsetMapper.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/CharsetMapper.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/CharsetMapper.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/CharsetMapper.java Wed Aug 23 18:57:51 2006
@@ -39,7 +39,7 @@
* your own version for a particular web application.
*
* @author Craig R. McClanahan
- * @revision $Date$ $Version$
+ * @version $Date$ $Version$
*/
public class CharsetMapper {
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/DOMWriter.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/DOMWriter.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/DOMWriter.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/DOMWriter.java Wed Aug 23 18:57:51 2006
@@ -327,18 +327,4 @@
} // normalize(String):String
- private static void printValidJavaEncoding() {
- System.err.println( " ENCODINGS:" );
- System.err.print( " " );
- for( int i = 0;
- i < MIME2JAVA_ENCODINGS.length; i++) {
- System.err.print( MIME2JAVA_ENCODINGS[i] + " " );
- if( (i % 7 ) == 0 ){
- System.err.println();
- System.err.print( " " );
- }
- }
-
- } // printJavaEncoding()
-
}
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/DateTool.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/DateTool.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/DateTool.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/DateTool.java Wed Aug 23 18:57:51 2006
@@ -30,9 +30,6 @@
*/
public class DateTool {
- private static StringManager sm =
- StringManager.getManager("org.apache.catalina.util");
-
/** US locale - all HTTP dates are in english
*/
public final static Locale LOCALE_US = Locale.US;
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/IOTools.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/IOTools.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/IOTools.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/IOTools.java Wed Aug 23 18:57:51 2006
@@ -51,7 +51,7 @@
}
/**
- * @see flow( Reader, Writer, char[] )
+ * @see #flow( Reader, Writer, char[] )
*/
public static void flow( Reader reader, Writer writer )
throws IOException {
@@ -63,9 +63,9 @@
* Read input from input stream and write it to output stream
* until there is no more input from input stream.
*
- * @param input stream the input stream to read from.
- * @param output stream the output stream to write to.
- * @param buf the byte array to use as a buffer
+ * @param is Input stream the input stream to read from.
+ * @param os Output stream the output stream to write to.
+ * @param buf The byte array to use as a buffer
*/
public static void flow( InputStream is, OutputStream os, byte[] buf )
throws IOException {
@@ -76,7 +76,7 @@
}
/**
- * @see flow( Reader, Writer, byte[] )
+ * @see #flow( InputStream, OutputStream, byte[] )
*/
public static void flow( InputStream is, OutputStream os )
throws IOException {
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/InstanceSupport.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/InstanceSupport.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/InstanceSupport.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/InstanceSupport.java Wed Aug 23 18:57:51 2006
@@ -45,7 +45,7 @@
* Construct a new InstanceSupport object associated with the specified
* Instance component.
*
- * @param lifecycle The Instance component that will be the source
+ * @param wrapper The Instance component that will be the source
* of events that we fire
*/
public InstanceSupport(Wrapper wrapper) {
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/ProcessEnvironment.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/ProcessEnvironment.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/ProcessEnvironment.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/ProcessEnvironment.java Wed Aug 23 18:57:51 2006
@@ -172,7 +172,7 @@
/**
* Sets the desired command string
- * @param String command as desired
+ * @param command String command as desired
* @return command string
*/
protected String setCommand(String command) {
@@ -181,7 +181,7 @@
/**
- * Gets this process' derived working directory
+ * Gets this process's derived working directory
* @return working directory
*/
public File getWorkingDirectory() {
@@ -200,7 +200,7 @@
/**
* Sets process' environment
- * @param process' environment
+ * @param env Process's environment
* @return Hashtable to which the process' environment was set
*/
public Hashtable setEnvironment(Hashtable env) {
@@ -220,7 +220,7 @@
/**
* Converts null strings to blank strings ("")
- * @param string to be converted if necessary
+ * @param s String to be converted if necessary
* @return a non-null string, either the original or the empty string
* ("") if the original was <code>null</code>
*/
@@ -231,8 +231,8 @@
/**
* Converts null strings to another string
- * @param string to be converted if necessary
- * @param string to return instead of a null string
+ * @param couldBeNull String to be converted if necessary
+ * @param subForNulls String to return instead of a null string
* @return a non-null string, either the original or the substitute
* string if the original was <code>null</code>
*/
@@ -243,8 +243,8 @@
/**
* Converts blank strings to another string
- * @param string to be converted if necessary
- * @param string to return instead of a blank string
+ * @param couldBeBlank String to be converted if necessary
+ * @param subForBlanks String to return instead of a blank string
* @return a non-null string, either the original or the substitute
* string if the original was <code>null</code> or empty ("")
*/
@@ -267,8 +267,7 @@
* Should be overriden by subclasses to perform useful setup.
* </p>
*
- * @param HttpServletRequest request associated with the
- * Process' invocation
+ * @param req Request associated with the Process's invocation
* @return true if environment was set OK, false if there was a problem
* and no environment was set
*/
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/ProcessHelper.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/ProcessHelper.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/ProcessHelper.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/ProcessHelper.java Wed Aug 23 18:57:51 2006
@@ -101,10 +101,6 @@
* @param env Hashtable with the desired script environment
* @param wd File with the script's desired working directory
* @param params Hashtable with the script's query parameters
- *
- * @param res HttpServletResponse object for setting headers
- * based on CGI script output
- *
*/
public ProcessHelper(String command, Hashtable env, File wd,
Hashtable params) {
@@ -347,7 +343,7 @@
+ stdin.available() + "]");
}
try {
- Thread.currentThread().sleep(iClientInputTimeout);
+ Thread.sleep(iClientInputTimeout);
} catch (InterruptedException ignored) {
}
}
@@ -438,7 +434,7 @@
while ((bufRead = commandsStdOut.read(cBuf)) != -1) {
if (servletContainerStdout != null) {
if (debug >= 4) {
- log("runCGI: write(\"" + cBuf + "\")");
+ log("runCGI: write(\"" + cBuf.toString() + "\")");
}
servletContainerStdout.write(cBuf, 0, bufRead);
}
@@ -454,7 +450,7 @@
} catch (IllegalThreadStateException e) {
try {
- Thread.currentThread().sleep(500);
+ Thread.sleep(500);
} catch (InterruptedException ignored) {
}
}
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/RequestUtil.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/RequestUtil.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/RequestUtil.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/RequestUtil.java Wed Aug 23 18:57:51 2006
@@ -72,7 +72,6 @@
buf.append("\"");
}
- long age = cookie.getMaxAge();
if (cookie.getMaxAge() >= 0) {
buf.append("; Max-Age=\"");
buf.append(cookie.getMaxAge());
@@ -275,7 +274,6 @@
*
* @param map Map that accumulates the resulting parameters
* @param data Input string containing request parameters
- * @param urlParameters true if we're parsing parameters on the URL
*
* @exception IllegalArgumentException if the data is malformed
*/
@@ -460,7 +458,6 @@
throws UnsupportedEncodingException {
if (data != null && data.length > 0) {
- int pos = 0;
int ix = 0;
int ox = 0;
String key = null;
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/Strftime.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/Strftime.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/Strftime.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/util/Strftime.java Wed Aug 23 18:57:51 2006
@@ -119,8 +119,8 @@
/**
* Create an instance of this date formatting class
*
- * @param origFormat the strftime-style formatting string
- * @param the locale to use for locale-specific conversions
+ * @param origFormat The strftime-style formatting string
+ * @param locale The locale to use for locale-specific conversions
*/
public Strftime( String origFormat, Locale locale ) {
String convertedFormat = convertDateFormat( origFormat );
@@ -149,7 +149,7 @@
/**
* Change the timezone used to format dates
*
- * @see java.util.TimeZone#setTimeZone
+ * @see java.util.TimeZone
*/
public void setTimeZone( TimeZone timeZone ) {
simpleDateFormat.setTimeZone( timeZone );
@@ -224,7 +224,7 @@
* try to get the Java Date/Time formating associated with
* the C standard provided
*
- * @param c The C equivalent to translate
+ * @param pattern The C equivalent to translate
* @return The Java formatting rule to use
*/
protected boolean translateCommand( StringBuffer buf, String pattern, int index, boolean oldInside ) {
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/valves/ErrorDispatcherValve.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/valves/ErrorDispatcherValve.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/valves/ErrorDispatcherValve.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/valves/ErrorDispatcherValve.java Wed Aug 23 18:57:51 2006
@@ -155,7 +155,7 @@
*
* @param request The request being processed
* @param response The response being generated
- * @param exception The exception that occurred (which possibly wraps
+ * @exception The exception that occurred (which possibly wraps
* a root cause exception
*/
protected void throwable(Request request, Response response,
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java Wed Aug 23 18:57:51 2006
@@ -175,7 +175,7 @@
*
* @param request The request being processed
* @param response The response being generated
- * @param exception The exception that occurred (which possibly wraps
+ * @exception exception The exception that occurred (which possibly wraps
* a root cause exception
*/
protected void report(Request request, Response response,
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/valves/RequestDumperValve.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/valves/RequestDumperValve.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/valves/RequestDumperValve.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/valves/RequestDumperValve.java Wed Aug 23 18:57:51 2006
@@ -23,7 +23,6 @@
import javax.servlet.ServletException;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import org.apache.catalina.HttpRequest;
import org.apache.catalina.HttpResponse;
import org.apache.catalina.Logger;
@@ -109,8 +108,6 @@
HttpResponse hresponse = (HttpResponse) response;
HttpServletRequest hreq =
(HttpServletRequest) hrequest.getRequest();
- HttpServletResponse hres =
- (HttpServletResponse) hresponse.getResponse();
// Log pre-service information
log("REQUEST URI =" + hreq.getRequestURI());
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/ContextAccessController.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/ContextAccessController.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/ContextAccessController.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/ContextAccessController.java Wed Aug 23 18:57:51 2006
@@ -51,7 +51,7 @@
* Set a security token for a context. Can be set only once.
*
* @param name Name of the context
- * @param context Security token
+ * @param token Security token
*/
public static void setSecurityToken(Object name, Object token) {
if ((!securityTokens.containsKey(name)) && (token != null)) {
@@ -64,7 +64,7 @@
* Remove a security token for a context.
*
* @param name Name of the context
- * @param context Security token
+ * @param token Security token
*/
public static void unsetSecurityToken(Object name, Object token) {
if (checkSecurityToken(name, token)) {
@@ -79,7 +79,7 @@
* context, then returns true.
*
* @param name Name of the context
- * @param context Submitted security token
+ * @param token Submitted security token
*/
public static boolean checkSecurityToken
(Object name, Object token) {
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/JndiPermission.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/JndiPermission.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/JndiPermission.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/JndiPermission.java Wed Aug 23 18:57:51 2006
@@ -42,7 +42,7 @@
/**
* Creates a new JndiPermission with no actions
*
- * @param String - JNDI resource path name
+ * @param name JNDI resource path name
*/
public JndiPermission(String name) {
super(name);
@@ -51,8 +51,8 @@
/**
* Creates a new JndiPermission with actions
*
- * @param String - JNDI resource path name
- * @param String - JNDI actions (none defined)
+ * @param name JNDI resource path name
+ * @param actions JNDI actions (none defined)
*/
public JndiPermission(String name, String actions) {
super(name,actions);
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/NamingContext.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/NamingContext.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/NamingContext.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/NamingContext.java Wed Aug 23 18:57:51 2006
@@ -811,7 +811,7 @@
* must already exist.
*
* @param name the name to bind; may not be empty
- * @param object the object to bind; possibly null
+ * @param obj the object to bind; possibly null
* @param rebind if true, then perform a rebind (ie, overwrite)
* @exception NameAlreadyBoundException if name is already bound
* @exception InvalidAttributesException if object did not supply all
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/ResourceEnvRef.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/ResourceEnvRef.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/ResourceEnvRef.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/ResourceEnvRef.java Wed Aug 23 18:57:51 2006
@@ -47,7 +47,7 @@
/**
* Resource env reference.
*
- * @param type Type
+ * @param resourceType Type
*/
public ResourceEnvRef(String resourceType) {
super(resourceType);
@@ -57,7 +57,7 @@
/**
* Resource env reference.
*
- * @param type Type
+ * @param resourceType Type
*/
public ResourceEnvRef(String resourceType, String factory,
String factoryLocation) {
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/TransactionRef.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/TransactionRef.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/TransactionRef.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/TransactionRef.java Wed Aug 23 18:57:51 2006
@@ -46,10 +46,6 @@
/**
* Resource Reference.
- *
- * @param resourceClass Resource class
- * @param scope Resource scope
- * @param auth Resource authetication
*/
public TransactionRef() {
this(null, null);
@@ -58,10 +54,6 @@
/**
* Resource Reference.
- *
- * @param resourceClass Resource class
- * @param scope Resource scope
- * @param auth Resource authetication
*/
public TransactionRef(String factory, String factoryLocation) {
super("javax.transaction.UserTransaction", factory, factoryLocation);
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/factory/ResourceLinkFactory.java
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/factory/ResourceLinkFactory.java?rev=434283&r1=434282&r2=434283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/factory/ResourceLinkFactory.java (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/factory/ResourceLinkFactory.java Wed Aug 23 18:57:51 2006
@@ -83,8 +83,6 @@
// Can we process this request?
Reference ref = (Reference) obj;
- String type = ref.getClassName();
-
// Read the global ref addr
String globalName = null;
RefAddr refAddr = ref.get(ResourceLinkRef.GLOBALNAME);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org