yoavs 2004/08/29 10:14:42
Modified: coyote/src/java/org/apache/coyote/tomcat3
Tomcat3Adapter.java
coyote/src/java/org/apache/coyote/tomcat4
CoyoteConnector.java CoyoteResponse.java
jk/java/org/apache/ajp Ajp13Packet.java
jk/java/org/apache/jk/config ApacheConfig.java
BaseJkConfig.java IISConfig.java NSConfig.java
util/java/org/apache/tomcat/util IntrospectionUtils.java
util/java/org/apache/tomcat/util/buf Base64.java
ByteChunk.java CharChunk.java MessageBytes.java
UEncoder.java
util/java/org/apache/tomcat/util/compat Jdk14Compat.java
JdkCompat.java
util/java/org/apache/tomcat/util/digester
CallMethodRule.java NodeCreateRule.java
util/java/org/apache/tomcat/util/http/mapper Mapper.java
util/java/org/apache/tomcat/util/net
TcpConnectionHandler.java
util/java/org/apache/tomcat/util/net/jsse
JSSESocketFactory.java
util/java/org/apache/tomcat/util/res StringManager.java
util/java/org/apache/tomcat/util/threads ThreadPool.java
Log:
A few JavaDoc fixes. Many more needed ;(
Revision Changes Path
1.8 +2 -1
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat3/Tomcat3Adapter.java
Index: Tomcat3Adapter.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat3/Tomcat3Adapter.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Tomcat3Adapter.java 24 Feb 2004 08:54:30 -0000 1.7
+++ Tomcat3Adapter.java 29 Aug 2004 17:14:41 -0000 1.8
@@ -24,7 +24,8 @@
* This class handles the task of passing of an individual request to
* Tomcat to handle. Also some of the connection-specific methods are
* delegated to here.
- * @Author Bill Barker
+ *
+ * @author Bill Barker
*/
public class Tomcat3Adapter implements Adapter {
ContextManager cm;
1.35 +4 -4
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java
Index: CoyoteConnector.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- CoyoteConnector.java 24 Feb 2004 08:54:29 -0000 1.34
+++ CoyoteConnector.java 29 Aug 2004 17:14:41 -0000 1.35
@@ -365,7 +365,7 @@
/**
* Set the connection linger for this Connector.
*
- * @param count The new connection linge
+ * @param connectionLinger The new connection linger
*/
public void setConnectionLinger(int connectionLinger) {
@@ -387,7 +387,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) {
@@ -431,7 +431,7 @@
/**
* Set the server socket timeout for this Connector.
*
- * @param connectionUploadTimeout The new server socket timeout
+ * @param serverSocketTimeout The new server socket timeout
*/
public void setServerSocketTimeout(int serverSocketTimeout) {
1.40 +2 -2
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteResponse.java
Index: CoyoteResponse.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteResponse.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- CoyoteResponse.java 29 Aug 2004 15:33:45 -0000 1.39
+++ CoyoteResponse.java 29 Aug 2004 17:14:41 -0000 1.40
@@ -129,7 +129,7 @@
/**
* Set the Coyote response.
*
- * @param response The Coyote response
+ * @param coyoteResponse The Coyote response
*/
public void setCoyoteResponse(Response coyoteResponse) {
this.coyoteResponse = coyoteResponse;
1.14 +3 -3
jakarta-tomcat-connectors/jk/java/org/apache/ajp/Ajp13Packet.java
Index: Ajp13Packet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/ajp/Ajp13Packet.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Ajp13Packet.java 24 Feb 2004 08:48:43 -0000 1.13
+++ Ajp13Packet.java 29 Aug 2004 17:14:41 -0000 1.14
@@ -29,7 +29,7 @@
* Can be used (somewhat confusingly) for both incoming and outgoing
* packets.
*
- * @see Ajp14/Ajp13Packet
+ * See Ajp14/Ajp13Packet.
*
* @author Henri Gomez [EMAIL PROTECTED]
* @author Dan Milstein [EMAIL PROTECTED]
@@ -267,7 +267,7 @@
*
* @param b The array from which to copy bytes.
* @param off The offset into the array at which to start copying
- * @param len The number of bytes to copy.
+ * @param numBytes The number of bytes to copy.
*/
public void appendBytes( byte b[], int off, int numBytes ) {
appendInt( numBytes );
@@ -307,7 +307,7 @@
*
* @param b The array from which to copy bytes.
* @param off The offset into the array at which to start copying
- * @param len The number of bytes to copy.
+ * @param numBytes The number of bytes to copy.
*/
public void appendXBytes(byte[] b, int off, int numBytes) {
if( pos + numBytes > buff.length ) {
1.4 +2 -2
jakarta-tomcat-connectors/jk/java/org/apache/jk/config/ApacheConfig.java
Index: ApacheConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/config/ApacheConfig.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ApacheConfig.java 26 May 2004 19:31:58 -0000 1.3
+++ ApacheConfig.java 29 Aug 2004 17:14:41 -0000 1.4
@@ -162,7 +162,7 @@
then it will be resolved absolutely against
the getConfigHome() path.
<p>
- @param <b>path</b> String path to a file
+ @param path String path to a file
*/
public void setJkConfig(String path){
jkConfig= (path==null)?null:new File(path);
@@ -170,7 +170,7 @@
/**
set the path to the mod_jk Apache Module
- @param <b>path</b> String path to a file
+ @param path String path to a file
*/
public void setModJk(String path){
modJk=( path==null?null:new File(path));
1.3 +9 -9
jakarta-tomcat-connectors/jk/java/org/apache/jk/config/BaseJkConfig.java
Index: BaseJkConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/config/BaseJkConfig.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BaseJkConfig.java 24 Feb 2004 08:48:43 -0000 1.2
+++ BaseJkConfig.java 29 Aug 2004 17:14:41 -0000 1.3
@@ -212,8 +212,8 @@
executes the ApacheConfig interceptor. This method generates apache
configuration files for use with mod_jk.
<p>
- @param <b>context</b> a Context object.
- @param <b>mod_jk</b> Writer for output.
+ @param context a Context object.
+ @param mod_jk Writer for output.
*/
public void executeContext(Context context, PrintWriter mod_jk){
@@ -289,7 +289,7 @@
<p>
If not set, execute() will set this to TOMCAT_HOME.
<p>
- @param <b>dir</b> - path to a directory
+ @param dir - path to a directory
*/
public void setConfigHome(String dir){
if( dir==null ) return;
@@ -304,7 +304,7 @@
/**
set a path to the workers.properties file.
- @param <b>path</b> String path to workers.properties file
+ @param path String path to workers.properties file
*/
public void setWorkersConfig(String path){
workersConfig= (path==null?null:new File(path));
@@ -312,10 +312,10 @@
/**
set the path to the log file
- @param <b>path</b> String path to a file
+ @param path String path to a file
*/
public void setJkLog(String path){
- jkLog= ( path==null?null:new File(path));
+ jkLog = ( path==null ? null : new File(path));
}
/** Set the verbosity level
@@ -326,8 +326,8 @@
}
/**
- set the Ajp protocal
- @param <b>protocal</b> String protocol, "ajp12" or "ajp13"
+ Sets the JK worker.
+ @param worker The worker
*/
public void setJkWorker(String worker){
jkWorker = worker;
1.3 +2 -2
jakarta-tomcat-connectors/jk/java/org/apache/jk/config/IISConfig.java
Index: IISConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/config/IISConfig.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IISConfig.java 24 Feb 2004 08:48:43 -0000 1.2
+++ IISConfig.java 29 Aug 2004 17:14:41 -0000 1.3
@@ -114,7 +114,7 @@
then getRegConfig() will resolve it absolutely against
the getConfigHome() path.
<p>
- @param <b>path</b> String path to a file
+ @param path String path to a file
*/
public void setRegConfig(String path){
regConfig= (path==null)?null:new File(path);
@@ -122,7 +122,7 @@
/**
set a path to the uriworkermap.properties file.
- @param <b>path</b> String path to uriworkermap.properties file
+ @param path String path to uriworkermap.properties file
*/
public void setUriConfig(String path){
uriConfig= (path==null?null:new File(path));
1.3 +3 -3
jakarta-tomcat-connectors/jk/java/org/apache/jk/config/NSConfig.java
Index: NSConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/config/NSConfig.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NSConfig.java 24 Feb 2004 08:48:43 -0000 1.2
+++ NSConfig.java 29 Aug 2004 17:14:41 -0000 1.3
@@ -131,7 +131,7 @@
then getRegConfig() will resolve it absolutely against
the getConfigHome() path.
<p>
- @param <b>path</b> String path to a file
+ @param path String path to a file
*/
public void setObjConfig(String path) {
objConfig= (path==null)?null:new File(path);
@@ -139,7 +139,7 @@
/**
set the path to the nsapi plugin module
- @param <b>path</b> String path to a file
+ @param path String path to a file
*/
public void setNsapiJk(String path) {
nsapiJk=( path==null?null:new File(path));
@@ -148,7 +148,7 @@
/**
Set the name for the Object that implements the
jk_service call.
- @param <b>name</b> Name of the obj.conf Object
+ @param name Name of the obj.conf Object
*/
public void setObjectName(String name) {
objectName = name;
1.9 +7 -6
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/IntrospectionUtils.java
Index: IntrospectionUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/IntrospectionUtils.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- IntrospectionUtils.java 5 Aug 2004 14:02:24 -0000 1.8
+++ IntrospectionUtils.java 29 Aug 2004 17:14:41 -0000 1.9
@@ -439,7 +439,7 @@
/**
* Replace ${NAME} with the property value
*
- * @deprecated. Use the explicit method
+ * @deprecated Use the explicit method
*/
public static String replaceProperties(String value, Object getter) {
if (getter instanceof Hashtable)
@@ -611,14 +611,15 @@
}
/**
- * add elements from the classpath <i>cp </i> to a Vector <i>jars </i> as
+ * Add elements from the classpath <i>cp </i> to a Vector <i>jars </i> as
* file URLs (We use Vector for JDK 1.1 compat).
* <p>
*
- * @param <b>cp
- * </b> a String classpath of directory or jar file elements
- * separated by path.separator delimiters.
- * @return a Vector of URLs.
+ * @param jars The jar list
+ * @param cp a String classpath of directory or jar file elements
+ * separated by path.separator delimiters.
+ * @throws IOException If an I/O error occurs
+ * @throws MalformedURLException Doh ;)
*/
public static void addJarsFromClassPath(Vector jars, String cp)
throws IOException, MalformedURLException {
1.4 +2 -2
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/buf/Base64.java
Index: Base64.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/buf/Base64.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Base64.java 24 Feb 2004 08:50:06 -0000 1.3
+++ Base64.java 29 Aug 2004 17:14:41 -0000 1.4
@@ -165,7 +165,7 @@
/**
* Decodes Base64 data into octects
*
- * @param binaryData Byte array containing Base64 data
+ * @param base64Data Byte array containing Base64 data
* @return Array containind decoded data.
*/
public byte[] decode( byte[] base64Data ) {
1.21 +6 -4
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/buf/ByteChunk.java
Index: ByteChunk.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/buf/ByteChunk.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ByteChunk.java 12 Aug 2004 21:46:41 -0000 1.20
+++ ByteChunk.java 29 Aug 2004 17:14:41 -0000 1.21
@@ -613,6 +613,7 @@
/**
* Returns true if the message bytes starts with the specified string.
* @param s the string
+ * @param pos The position
*/
public boolean startsWithIgnoreCase(String s, int pos) {
byte[] b = buff;
@@ -684,7 +685,8 @@
/**
* Returns true if the message bytes starts with the specified string.
- * @param s the string
+ * @param c the character
+ * @param starting The start position
*/
public int indexOf(char c, int starting) {
int ret = indexOf( buff, start+starting, end, c);
@@ -704,7 +706,7 @@
}
/** Find a character, no side effects.
- * @returns index of char if found, -1 if not
+ * @return index of char if found, -1 if not
*/
public static int findChar( byte buf[], int start, int end, char c ) {
byte b=(byte)c;
@@ -719,7 +721,7 @@
}
/** Find a character, no side effects.
- * @returns index of char if found, -1 if not
+ * @return index of char if found, -1 if not
*/
public static int findChars( byte buf[], int start, int end, byte c[] ) {
int clen=c.length;
@@ -735,7 +737,7 @@
}
/** Find the first character != c
- * @returns index of char if found, -1 if not
+ * @return index of char if found, -1 if not
*/
public static int findNotChars( byte buf[], int start, int end, byte c[] )
{
1.15 +1 -1
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/buf/CharChunk.java
Index: CharChunk.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/buf/CharChunk.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- CharChunk.java 15 Jul 2004 14:35:39 -0000 1.14
+++ CharChunk.java 29 Aug 2004 17:14:41 -0000 1.15
@@ -645,7 +645,7 @@
/**
* Returns true if the message bytes starts with the specified string.
- * @param s the string
+ * @param c the character
*/
public int indexOf(char c, int starting) {
int ret = indexOf( buff, start+starting, end, c );
1.19 +5 -3
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/buf/MessageBytes.java
Index: MessageBytes.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/buf/MessageBytes.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- MessageBytes.java 22 Aug 2004 21:46:19 -0000 1.18
+++ MessageBytes.java 29 Aug 2004 17:14:41 -0000 1.19
@@ -67,8 +67,8 @@
/**
* Creates a new, uninitialized MessageBytes object.
- * @deprecated. Use static newInstance() in order to allow
- * future hooks.
+ * @deprecated Use static newInstance() in order to allow
+ * future hooks.
*/
public MessageBytes() {
}
@@ -369,6 +369,7 @@
/**
* Returns true if the message bytes starts with the specified string.
* @param s the string
+ * @param pos The start position
*/
public boolean startsWithIgnoreCase(String s, int pos) {
switch (type) {
@@ -471,7 +472,8 @@
/**
* Returns true if the message bytes starts with the specified string.
- * @param s the string
+ * @param c the character
+ * @param starting The start position
*/
public int indexOf(char c, int starting) {
switch (type) {
1.5 +4 -4
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/buf/UEncoder.java
Index: UEncoder.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/buf/UEncoder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- UEncoder.java 24 Feb 2004 08:50:06 -0000 1.4
+++ UEncoder.java 29 Aug 2004 17:14:41 -0000 1.5
@@ -56,10 +56,10 @@
/** URL Encode string, using a specified encoding.
- * @param s string to be encoded
- * @param enc character encoding, for chars >%80 ( use UTF8 if not set,
- * as recommended in RFCs)
- * @param reserved extra characters to preserve ( "/" - if s is a URL )
+ *
+ * @param buf The writer
+ * @param s string to be encoded
+ * @throws IOException If an I/O error occurs
*/
public void urlEncode( Writer buf, String s )
throws IOException
1.13 +3 -2
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/Jdk14Compat.java
Index: Jdk14Compat.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/Jdk14Compat.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Jdk14Compat.java 26 Jun 2004 21:37:52 -0000 1.12
+++ Jdk14Compat.java 29 Aug 2004 17:14:41 -0000 1.13
@@ -51,8 +51,9 @@
* Return the URI for the given file. Originally created for
* o.a.c.loader.WebappClassLoader
*
- * @param File to wrap into URI
- * @return A URI as a URL
+ * @param file The file to wrap into URI
+ * @return A URI as a URL
+ * @throws MalformedURLException Doh ;)
*/
public URL getURI(File file)
throws MalformedURLException {
1.17 +3 -2
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/JdkCompat.java
Index: JdkCompat.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/JdkCompat.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- JdkCompat.java 26 Jun 2004 21:37:52 -0000 1.16
+++ JdkCompat.java 29 Aug 2004 17:14:41 -0000 1.17
@@ -142,8 +142,9 @@
* Return the URI for the given file. Originally created for
* o.a.c.loader.WebappClassLoader
*
- * @param File to wrap into URI
- * @return A URI as a URL
+ * @param file The file to wrap into URI
+ * @return A URI as a URL
+ * @throws MalformedURLException Doh ;)
*/
public URL getURI(File file)
throws MalformedURLException {
1.3 +4 -3
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/CallMethodRule.java
Index: CallMethodRule.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/CallMethodRule.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CallMethodRule.java 23 Jul 2004 15:57:33 -0000 1.2
+++ CallMethodRule.java 29 Aug 2004 17:14:42 -0000 1.3
@@ -37,10 +37,11 @@
* using <code>org.apache.commons.beanutils.ConvertUtils</code>.
* </p>
*
- * <p>This rule now uses [EMAIL PROTECTED] MethodUtils#invokeMethod} by default.
+ * <p>This rule now uses [EMAIL PROTECTED]
org.apache.commons.beanutils.MethodUtils#invokeMethod}
+ * by default.
* This increases the kinds of methods successfully and allows primitives
* to be matched by passing in wrapper classes.
- * There are rare cases when [EMAIL PROTECTED] MethodUtils#invokeExactMethod}
+ * There are rare cases when [EMAIL PROTECTED]
org.apache.commons.beanutils.MethodUtils#invokeExactMethod}
* (the old defualt) is required.
* This method is much stricter in it's reflection.
* Setting the <code>UseExactMatch</code> to true reverts to the use of this
1.2 +2 -2
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/NodeCreateRule.java
Index: NodeCreateRule.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/NodeCreateRule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NodeCreateRule.java 26 Jun 2004 17:41:30 -0000 1.1
+++ NodeCreateRule.java 29 Aug 2004 17:14:42 -0000 1.2
@@ -373,7 +373,7 @@
/**
* Implemented to replace the content handler currently in use by a
- * [EMAIL PROTECTED] NodeBuilder NodeCreateRule.NodeBuilder}.
+ * [EMAIL PROTECTED] #NodeBuilder NodeCreateRule.NodeBuilder}.
*
* @param namespaceURI the namespace URI of the matching element, or an
* empty string if the parser is not namespace aware or the element has
1.43 +2 -2
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/mapper/Mapper.java
Index: Mapper.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/mapper/Mapper.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- Mapper.java 25 Aug 2004 21:28:35 -0000 1.42
+++ Mapper.java 29 Aug 2004 17:14:42 -0000 1.43
@@ -72,7 +72,7 @@
/**
* Set default host.
*
- * @param name Default host name
+ * @param defaultHostName Default host name
*/
public void setDefaultHostName(String defaultHostName) {
this.defaultHostName = defaultHostName;
@@ -244,7 +244,7 @@
/**
* Return all contexts, in //HOST/PATH form
*
- * @return
+ * @return The context names
*/
public String[] getContextNames() {
List list=new ArrayList();
1.4 +4 -3
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/TcpConnectionHandler.java
Index: TcpConnectionHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/TcpConnectionHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TcpConnectionHandler.java 24 Feb 2004 08:50:05 -0000 1.3
+++ TcpConnectionHandler.java 29 Aug 2004 17:14:42 -0000 1.4
@@ -36,9 +36,10 @@
public void setServer(Object manager);
- /** Used to pass config informations to the handler
- * @deprecated. This has nothing to do with Tcp,
- * was used as a workaround
+ /** Used to pass config informations to the handler.
+ *
+ * @deprecated This has nothing to do with Tcp,
+ * was used as a workaround.
*/
public void setAttribute(String name, Object value );
1.17 +1 -1
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
Index: JSSESocketFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- JSSESocketFactory.java 2 Jul 2004 03:27:39 -0000 1.16
+++ JSSESocketFactory.java 29 Aug 2004 17:14:42 -0000 1.17
@@ -341,7 +341,7 @@
* Configure Client authentication for this version of JSSE. The
* JSSE included in Java 1.4 supports the 'want' value. Prior
* versions of JSSE will treat 'want' as 'false'.
- * @param ssocket the SSLSocket
+ * @param socket the SSLSocket
*/
abstract protected void configureClientAuth(SSLSocket socket);
1.8 +5 -6
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/res/StringManager.java
Index: StringManager.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/res/StringManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- StringManager.java 11 May 2004 22:11:01 -0000 1.7
+++ StringManager.java 29 Aug 2004 17:14:42 -0000 1.8
@@ -242,9 +242,8 @@
* a package already exists, it will be reused, else a new
* StringManager will be created and returned.
*
- * @param packageName
+ * @param packageName The package name
*/
-
public synchronized static StringManager getManager(String packageName) {
StringManager mgr = (StringManager)managers.get(packageName);
if (mgr == null) {
@@ -259,7 +258,7 @@
* a package already exists, it will be reused, else a new
* StringManager will be created and returned.
*
- * @param packageName
+ * @param bundle The resource bundle
*/
public synchronized static StringManager getManager(ResourceBundle bundle) {
return new StringManager( bundle );
@@ -270,8 +269,8 @@
* a package already exists, it will be reused, else a new
* StringManager will be created for that Locale and returned.
*
- *
- * @param packageName
+ * @param packageName The package name
+ * @param loc The locale
*/
public synchronized static StringManager getManager(String packageName,Locale
loc) {
1.27 +6 -5
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/threads/ThreadPool.java
Index: ThreadPool.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/threads/ThreadPool.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ThreadPool.java 28 May 2004 02:49:35 -0000 1.26
+++ ThreadPool.java 29 Aug 2004 17:14:42 -0000 1.27
@@ -769,10 +769,11 @@
}
}
- /** Debug display of the stage of each thread. The return is html style,
- * for display in the console ( it can be easily parsed too )
+ /**
+ * Debug display of the stage of each thread. The return is html style,
+ * for display in the console ( it can be easily parsed too ).
*
- * @return
+ * @return The thread status display
*/
public String threadStatusString() {
StringBuffer sb=new StringBuffer();
@@ -795,7 +796,7 @@
* whatever the thread is doing ( if the application using TP provide
* this info )
*
- * @return
+ * @return The status of all threads
*/
public String[] getThreadStatus() {
String status[]=new String[ threads.size()];
@@ -811,7 +812,7 @@
/** Return an array with the current "param" ( XXX better name ? )
* of each thread. This is typically the last request.
*
- * @return
+ * @return The params of all threads
*/
public String[] getThreadParam() {
String status[]=new String[ threads.size()];
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
