Author: markt
Date: Tue Nov 17 22:13:30 2009
New Revision: 881567
URL: http://svn.apache.org/viewvc?rev=881567&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48143
Javadoc updates. Patch provide by sebb.
Modified:
tomcat/trunk/java/javax/servlet/SessionCookieConfig.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java
tomcat/trunk/java/org/apache/catalina/core/StandardContextValve.java
tomcat/trunk/java/org/apache/catalina/core/StandardEngineValve.java
tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
tomcat/trunk/java/org/apache/catalina/ha/ClusterManager.java
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
tomcat/trunk/java/org/apache/catalina/manager/StatusTransformer.java
tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java
tomcat/trunk/java/org/apache/catalina/realm/LockOutRealm.java
tomcat/trunk/java/org/apache/catalina/startup/Embedded.java
tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java
tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
tomcat/trunk/java/org/apache/catalina/tribes/io/ChannelData.java
tomcat/trunk/java/org/apache/catalina/tribes/io/ObjectReader.java
tomcat/trunk/java/org/apache/catalina/tribes/io/ReplicationStream.java
tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java
tomcat/trunk/java/org/apache/catalina/tribes/membership/Membership.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/LinkObject.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java
tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java
tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
tomcat/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
tomcat/trunk/java/org/apache/naming/HandlerRef.java
tomcat/trunk/java/org/apache/naming/ServiceRef.java
tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java
tomcat/trunk/java/org/apache/tomcat/buildutil/Txt2Html.java
tomcat/trunk/java/org/apache/tomcat/util/digester/SetPropertiesRule.java
tomcat/trunk/java/org/apache/tomcat/util/digester/SetPropertyRule.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
tomcat/trunk/java/org/apache/tomcat/util/net/SSLSessionManager.java
Modified: tomcat/trunk/java/javax/servlet/SessionCookieConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/SessionCookieConfig.java?rev=881567&r1=881566&r2=881567&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/SessionCookieConfig.java (original)
+++ tomcat/trunk/java/javax/servlet/SessionCookieConfig.java Tue Nov 17
22:13:30 2009
@@ -79,8 +79,9 @@
public boolean isSecure();
/**
+ * Sets the maximum age.
*
- * @param maxAge
+ * @param MaxAge the maximum age to set
* @throws IllegalStateException
*/
public void setMaxAge(int MaxAge);
Modified:
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java?rev=881567&r1=881566&r2=881567&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
Tue Nov 17 22:13:30 2009
@@ -95,7 +95,7 @@
}
/**
- * @param classLoader The classLoader to set.
+ * @param classLoaderName The classLoader to set.
*/
public void setClassLoader(String classLoaderName) {
this.classLoader = classLoaderName;
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java?rev=881567&r1=881566&r2=881567&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java Tue
Nov 17 22:13:30 2009
@@ -324,13 +324,10 @@
/**
- * Invoke the next filter in this chain, passing the specified request
- * and response. If there are no more filters in this chain, invoke
- * the <code>service()</code> method of the servlet itself.
- *
- * @param request The servlet request we are processing
- * @param response The servlet response we are creating
- *
+ * Process the event, using the security manager if the option is enabled.
+ *
+ * @param event the event to process
+ *
* @exception IOException if an input/output error occurs
* @exception ServletException if a servlet exception occurs
*/
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContextValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContextValve.java?rev=881567&r1=881566&r2=881567&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContextValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContextValve.java Tue
Nov 17 22:13:30 2009
@@ -112,7 +112,6 @@
*
* @param request Request to be processed
* @param response Response to be produced
- * @param valveContext Valve context used to forward to the next Valve
*
* @exception IOException if an input/output error occurred
* @exception ServletException if a servlet error occurred
@@ -230,7 +229,7 @@
*
* @param request Request to be processed
* @param response Response to be produced
- * @param valveContext Valve context used to forward to the next Valve
+ * @param event
*
* @exception IOException if an input/output error occurred
* @exception ServletException if a servlet error occurred
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardEngineValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardEngineValve.java?rev=881567&r1=881566&r2=881567&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardEngineValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardEngineValve.java Tue Nov
17 22:13:30 2009
@@ -93,7 +93,6 @@
*
* @param request Request to be processed
* @param response Response to be produced
- * @param valveContext Valve context used to forward to the next Valve
*
* @exception IOException if an input/output error occurred
* @exception ServletException if a servlet error occurred
@@ -126,7 +125,7 @@
*
* @param request Request to be processed
* @param response Response to be produced
- * @param valveContext Valve context used to forward to the next Valve
+ * @param event the event
*
* @exception IOException if an input/output error occurred
* @exception ServletException if a servlet error occurred
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java?rev=881567&r1=881566&r2=881567&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java Tue Nov
17 22:13:30 2009
@@ -105,7 +105,6 @@
*
* @param request Request to be processed
* @param response Response to be produced
- * @param valveContext Valve context used to forward to the next Valve
*
* @exception IOException if an input/output error occurred
* @exception ServletException if a servlet error occurred
@@ -167,7 +166,7 @@
*
* @param request Request to be processed
* @param response Response to be produced
- * @param valveContext Valve context used to forward to the next Valve
+ * @param event the event
*
* @exception IOException if an input/output error occurred
* @exception ServletException if a servlet error occurred
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java?rev=881567&r1=881566&r2=881567&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java Tue
Nov 17 22:13:30 2009
@@ -86,7 +86,6 @@
*
* @param request Request to be processed
* @param response Response to be produced
- * @param valveContext Valve context used to forward to the next Valve
*
* @exception IOException if an input/output error occurred
* @exception ServletException if a servlet error occurred
Modified: tomcat/trunk/java/org/apache/catalina/ha/ClusterManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/ClusterManager.java?rev=881567&r1=881566&r2=881567&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/ClusterManager.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/ClusterManager.java Tue Nov 17
22:13:30 2009
@@ -86,7 +86,7 @@
public boolean doDomainReplication();
/**
- * @param sendClusterDomainOnly Flag value.
+ * @param domainReplication Flag value.
* @since 5.5.10
*/
public void setDomainReplication(boolean domainReplication);
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java?rev=881567&r1=881566&r2=881567&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java Tue Nov
17 22:13:30 2009
@@ -98,16 +98,16 @@
// ----------------------------------------------------------- Constructors
+ public DeltaSession() {
+ this(null);
+ }
+
/**
* Construct a new Session associated with the specified Manager.
*
* @param manager
* The manager with which this Session is associated
*/
- public DeltaSession() {
- this(null);
- }
-
public DeltaSession(Manager manager) {
super(manager);
this.resetDeltaRequest();
Modified: tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java?rev=881567&r1=881566&r2=881567&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java Tue Nov
17 22:13:30 2009
@@ -884,7 +884,7 @@
* notify all listeners from receiving a new message is not ClusterMessage
* emit Failure Event to LifecylceListener
*
- * @param message
+ * @param msg
* received Message
*/
public boolean accept(Serializable msg, Member sender) {
Modified: tomcat/trunk/java/org/apache/catalina/manager/StatusTransformer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/StatusTransformer.java?rev=881567&r1=881566&r2=881567&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/StatusTransformer.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/StatusTransformer.java Tue
Nov 17 22:13:30 2009
@@ -18,7 +18,6 @@
package org.apache.catalina.manager;
-import java.io.IOException;
import java.io.PrintWriter;
import java.lang.reflect.Method;
import java.text.MessageFormat;
@@ -31,7 +30,6 @@
import javax.management.MBeanServer;
import javax.management.ObjectInstance;
import javax.management.ObjectName;
-import javax.servlet.ServletException;
import javax.servlet.http.HttpServletResponse;
import org.apache.catalina.util.RequestUtil;
@@ -62,13 +60,11 @@
/**
- * Process a GET request for the specified resource.
+ * Write an HTML or XML header.
*
- * @param request The servlet request we are processing
- * @param response The servlet response we are creating
+ * @param writer the PrintWriter to use
+ * @param mode - 0 = HTML header, 1 = XML declaration
*
- * @exception IOException if an input/output error occurs
- * @exception ServletException if a servlet-specified error occurs
*/
public static void writeHeader(PrintWriter writer, int mode) {
if (mode == 0){
Modified: tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java?rev=881567&r1=881566&r2=881567&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java Tue Nov 17
22:13:30 2009
@@ -125,15 +125,15 @@
*
* @param username Username of the Principal to look up
* @param clientDigest Digest which has been submitted by the client
- * @param nOnce Unique (or supposedly unique) token which has been used
+ * @param nonce Unique (or supposedly unique) token which has been used
* for this request
- * @param realm Realm name
+ * @param realmName Realm name
* @param md5a2 Second MD5 digest used to calculate the digest :
* MD5(Method + ":" + uri)
*/
@Override
public Principal authenticate(String username, String clientDigest,
- String once, String nc, String cnonce, String qop,
+ String nonce, String nc, String cnonce, String qop,
String realmName, String md5a2) {
Principal authenticatedUser = null;
@@ -142,7 +142,7 @@
log.debug(sm.getString("combinedRealm.authStart", username,
realm.getInfo()));
}
- authenticatedUser = realm.authenticate(username, clientDigest,
once,
+ authenticatedUser = realm.authenticate(username, clientDigest,
nonce,
nc, cnonce, qop, realmName, md5a2);
if (authenticatedUser == null) {
Modified: tomcat/trunk/java/org/apache/catalina/realm/LockOutRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/LockOutRealm.java?rev=881567&r1=881566&r2=881567&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/LockOutRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/LockOutRealm.java Tue Nov 17
22:13:30 2009
@@ -149,15 +149,15 @@
*
* @param username Username of the Principal to look up
* @param clientDigest Digest which has been submitted by the client
- * @param nOnce Unique (or supposedly unique) token which has been used
+ * @param nonce Unique (or supposedly unique) token which has been used
* for this request
- * @param realm Realm name
+ * @param realmName Realm name
* @param md5a2 Second MD5 digest used to calculate the digest :
* MD5(Method + ":" + uri)
*/
@Override
public Principal authenticate(String username, String clientDigest,
- String once, String nc, String cnonce, String qop,
+ String nonce, String nc, String cnonce, String qop,
String realmName, String md5a2) {
if (isLocked(username)) {
@@ -169,7 +169,7 @@
}
Principal authenticatedUser = super.authenticate(username,
clientDigest,
- once, nc, cnonce, qop, realmName, md5a2);
+ nonce, nc, cnonce, qop, realmName, md5a2);
if (authenticatedUser == null) {
registerAuthFailure(username);
Modified: tomcat/trunk/java/org/apache/catalina/startup/Embedded.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Embedded.java?rev=881567&r1=881566&r2=881567&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Embedded.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Embedded.java Tue Nov 17
22:13:30 2009
@@ -237,9 +237,9 @@
/**
- * Enables or disables naming support.
+ * Enables or disables redirection.
*
- * @param useNaming The new use naming value
+ * @param redirectStreams The new redirection value
*/
public void setRedirectStreams(boolean redirectStreams) {
Modified: tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java?rev=881567&r1=881566&r2=881567&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java Tue Nov 17
22:13:30 2009
@@ -1013,7 +1013,7 @@
* no namespace
* @param name the local name if the parser is namespace aware, or just
* the element name otherwise
- * @param bodyText The body text of this element
+ * @param text The body text of this element
*/
@Override
public void body(String namespace, String name, String text)
@@ -1048,7 +1048,7 @@
* no namespace
* @param name the local name if the parser is namespace aware, or just
* the element name otherwise
- * @param bodyText The body text of this element
+ * @param text The body text of this element
*/
@Override
public void body(String namespace, String name, String text)
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java?rev=881567&r1=881566&r2=881567&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
Tue Nov 17 22:13:30 2009
@@ -72,8 +72,7 @@
* Send a message to one or more members in the cluster
* @param destination Member[] - the destinations, null or zero length
means all
* @param msg ClusterMessage - the message to send
- * @param options int - sender options, see class documentation
- * @return ClusterMessage[] - the replies from the members, if any.
+ * @param payload TBA
*/
@Override
public void sendMessage(Member[] destination, ChannelMessage msg,
InterceptorPayload payload) throws ChannelException {
Modified: tomcat/trunk/java/org/apache/catalina/tribes/io/ChannelData.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/io/ChannelData.java?rev=881567&r1=881566&r2=881567&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/io/ChannelData.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/io/ChannelData.java Tue Nov 17
22:13:30 2009
@@ -136,7 +136,9 @@
return options;
}
/**
- * @param sets the message options
+ * Sets the message options.
+ *
+ * @param options the message options
*/
public void setOptions(int options) {
this.options = options;
@@ -215,7 +217,7 @@
/**
* Deserializes a ChannelData object from a byte array
- * @param b byte[]
+ * @param xbuf byte[]
* @return ChannelData
*/
public static ChannelData getDataFromPackage(XByteBuffer xbuf) {
Modified: tomcat/trunk/java/org/apache/catalina/tribes/io/ObjectReader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/io/ObjectReader.java?rev=881567&r1=881566&r2=881567&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/io/ObjectReader.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/io/ObjectReader.java Tue Nov
17 22:13:30 2009
@@ -89,9 +89,9 @@
* Append new bytes to buffer.
* @see XByteBuffer#countPackages()
* @param data new transfer buffer
- * @param off offset
* @param len length in buffer
- * @return number of messages that was sent to callback
+ * @param count whether to return the count
+ * @return number of messages that was sent to callback (or -1 if count ==
false)
* @throws java.io.IOException
*/
public int append(ByteBuffer data, int len, boolean count) throws
java.io.IOException {
Modified: tomcat/trunk/java/org/apache/catalina/tribes/io/ReplicationStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/io/ReplicationStream.java?rev=881567&r1=881566&r2=881567&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/io/ReplicationStream.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/io/ReplicationStream.java Tue
Nov 17 22:13:30 2009
@@ -48,7 +48,7 @@
* Construct a new instance of CustomObjectInputStream
*
* @param stream The input stream we will read from
- * @param classLoader The class loader used to instantiate objects
+ * @param classLoaders The class loader array used to instantiate objects
*
* @exception IOException if an input/output error occurs
*/
Modified: tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java?rev=881567&r1=881566&r2=881567&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java Tue Nov 17
22:13:30 2009
@@ -145,7 +145,6 @@
* Appends the data to the buffer. If the data is incorrectly formatted,
ie, the data should always start with the
* header, false will be returned and the data will be discarded.
* @param b - bytes to be appended
- * @param off - the offset to extract data from
* @param len - the number of bytes to append.
* @return true if the data was appended correctly. Returns false if the
package is incorrect, ie missing header or something, or the length of data is 0
*/
@@ -330,8 +329,7 @@
/**
* Creates a complete data package
- * @param indata - the message data to be contained within the package
- * @param compressed - compression flag for the indata buffer
+ * @param cdata - the message data to be contained within the package
* @return - a full package (header,size,data,footer)
*
*/
@@ -423,9 +421,9 @@
/**
- * Converts an integer to four bytes
- * @param n - the integer
- * @return - four bytes in an array
+ * Converts a boolean to a 1-byte array
+ * @param bool - the integer
+ * @return - 1-byte array
* @deprecated use toBytes(boolean,byte[],int)
*/
@Deprecated
@@ -440,11 +438,6 @@
return data;
}
- /**
- *
- * @param <any> long
- * @return use
- */
public static boolean toBoolean(byte[] b, int offset) {
return b[offset] != 0;
}
@@ -582,8 +575,7 @@
/**
* Serializes a message into cluster data
* @param msg ClusterMessage
- * @param compress boolean
- * @return
+ * @return serialized content as byte[] array
* @throws IOException
*/
public static byte[] serialize(Serializable msg) throws IOException {
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java?rev=881567&r1=881566&r2=881567&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
Tue Nov 17 22:13:30 2009
@@ -160,7 +160,7 @@
* @param bind - the bind address (not sure this is used yet)
* @param mcastAddress - the mcast address
* @param service - the callback service
- * @param disableLoopbackMode - disable loopbackMode
+ * @param localLoopbackDisabled - disable loopbackMode
* @throws IOException
*/
public McastServiceImpl(
@@ -465,7 +465,7 @@
/**
* Send a ping
- * @throws Exception
+ * @throws IOException
*/
public void send(boolean checkexpired) throws IOException{
send(checkexpired,null);
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java?rev=881567&r1=881566&r2=881567&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java Tue
Nov 17 22:13:30 2009
@@ -75,7 +75,7 @@
*/
protected int msgCount = 0;
/**
- * The number of milliseconds since this members was
+ * The number of milliseconds since this member was
* created, is kept track of using the start time
*/
protected long memberAliveTime = 0;
@@ -122,10 +122,9 @@
/**
* Construct a new member object
- * @param name - the name of this member, cluster unique
- * @param domain - the cluster domain name of this member
* @param host - the tcp listen host
* @param port - the tcp listen port
+ * @param aliveTime - the number of milliseconds since this member was
created
*/
public MemberImpl(String host,
int port,
@@ -164,7 +163,6 @@
* Create a data package to send over the wire representing this member.
* This is faster than serialization.
* @return - the bytes for this member deserialized
- * @throws Exception
*/
public byte[] getData() {
return getData(true);
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/Membership.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/Membership.java?rev=881567&r1=881566&r2=881567&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/membership/Membership.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/membership/Membership.java Tue
Nov 17 22:13:30 2009
@@ -77,7 +77,8 @@
/**
* Constructs a new membership
- * @param name - has to be the name of the local member. Used to filter
the local member from the cluster membership
+ * @param local - has to be the name of the local member. Used to filter
the local member from the cluster membership
+ * @param includeLocal - TBA
*/
public Membership(MemberImpl local, boolean includeLocal) {
this.local = local;
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/LinkObject.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/LinkObject.java?rev=881567&r1=881566&r2=881567&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/LinkObject.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/LinkObject.java
Tue Nov 17 22:13:30 2009
@@ -46,7 +46,8 @@
* Construct a new element from the data object.
* Sets the pointer to null.
*
- * @param key The key
+ * @param msg the message
+ * @param destination TBA
* @param payload The data object.
*/
public LinkObject(ChannelMessage msg, Member[] destination,
InterceptorPayload payload) {
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java?rev=881567&r1=881566&r2=881567&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
Tue Nov 17 22:13:30 2009
@@ -89,7 +89,7 @@
/**
* start cluster receiver
- * @throws Exception
+ * @throws IOException
* @see org.apache.catalina.tribes.ClusterReceiver#start()
*/
@Override
Modified: tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java?rev=881567&r1=881566&r2=881567&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java Tue Nov
17 22:13:30 2009
@@ -205,7 +205,7 @@
/**
* Setting the readonly status of the user database
*
- * @param pathname The new pathname
+ * @param readonly the new status
*/
public void setReadonly(boolean readonly) {
Modified: tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java?rev=881567&r1=881566&r2=881567&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java Tue Nov 17
22:13:30 2009
@@ -691,7 +691,7 @@
* Default value : <code>X-Forwarded-For</code>
* </p>
*
- * @param remoteIPHeader
+ * @param remoteIpHeader
*/
public void setRemoteIpHeader(String remoteIpHeader) {
this.remoteIpHeader = remoteIpHeader;
@@ -699,7 +699,7 @@
/**
* <p>
- * Comma delimited list of proxies that are trusted when they appear in
the {...@link #remoteIPHeader} header. Can be expressed as a
+ * Comma delimited list of proxies that are trusted when they appear in
the {...@link #remoteIpHeader} header. Can be expressed as a
* regular expression.
* </p>
* <p>
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=881567&r1=881566&r2=881567&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Tue Nov 17
22:13:30 2009
@@ -139,7 +139,7 @@
/**
* Process pipelined HTTP requests on the specified socket.
*
- * @param socket Socket from which the HTTP requests will be read
+ * @param socketWrapper Socket from which the HTTP requests will be read
* and the HTTP responses will be written.
*
* @throws IOException error during an I/O operation
Modified: tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java?rev=881567&r1=881566&r2=881567&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java Tue Nov
17 22:13:30 2009
@@ -126,7 +126,7 @@
*
* @param inFileName The path to the resource to be included.
* @param parent The parent node of the include directive.
- * @param jarFile The JAR file from which to read the included resource,
+ * @param jarFileUrl The JAR file from which to read the included resource,
* or null of the included resource is to be read from the filesystem
*/
public Node.Nodes parse(String inFileName, Node parent,
Modified: tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java?rev=881567&r1=881566&r2=881567&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java Tue Nov
17 22:13:30 2009
@@ -502,7 +502,7 @@
* the current ParserController used in this compilation
* @param name
* the tag name as specified in the TLD
- * @param tagfile
+ * @param path
* the path for the tagfile
* @param tagFileJarUrl
* the url for the Jar containign the tag file
Modified: tomcat/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java?rev=881567&r1=881566&r2=881567&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java Tue Nov
17 22:13:30 2009
@@ -185,11 +185,6 @@
*
* @param ctxt the servlet context of the web application in which Jasper
* is running
- * @param redeployMode if true, then the compiler will allow redeploying
- * a tag library from the same jar, at the expense of slowing down the
- * server a bit. Note that this may only work on JDK 1.3.1_01a and later,
- * because of JDK bug 4211817 fixed in this release.
- * If redeployMode is false, a faster but less capable mode will be used.
*/
public TldLocationsCache(ServletContext ctxt) {
this.ctxt = ctxt;
Modified: tomcat/trunk/java/org/apache/naming/HandlerRef.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/HandlerRef.java?rev=881567&r1=881566&r2=881567&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/HandlerRef.java (original)
+++ tomcat/trunk/java/org/apache/naming/HandlerRef.java Tue Nov 17 22:13:30 2009
@@ -96,21 +96,11 @@
// ----------------------------------------------------------- Constructors
- /**
- * Service Reference.
- *
- * @param serviceClass Service class
- */
public HandlerRef(String refname, String handlerClass) {
this(refname, handlerClass, null, null);
}
- /**
- * Service Reference.
- *
- * @param serviceClass Service class
- */
public HandlerRef(String refname, String handlerClass,
String factory, String factoryLocation) {
super(refname, factory, factoryLocation);
Modified: tomcat/trunk/java/org/apache/naming/ServiceRef.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/ServiceRef.java?rev=881567&r1=881566&r2=881567&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/ServiceRef.java (original)
+++ tomcat/trunk/java/org/apache/naming/ServiceRef.java Tue Nov 17 22:13:30 2009
@@ -91,24 +91,12 @@
// ----------------------------------------------------------- Constructors
-
- /**
- * Service Reference.
- *
- * @param serviceClass Service class
- */
public ServiceRef(String refname, String serviceInterface, String[]
serviceQname,
String wsdl, String jaxrpcmapping) {
this(refname, serviceInterface, serviceQname, wsdl, jaxrpcmapping,
null, null);
}
-
- /**
- * Service Reference.
- *
- * @param serviceClass Service class
- */
public ServiceRef(String refname, String serviceInterface, String[]
serviceQname,
String wsdl, String jaxrpcmapping,
String factory, String factoryLocation) {
Modified: tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java?rev=881567&r1=881566&r2=881567&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java Tue Nov
17 22:13:30 2009
@@ -341,7 +341,7 @@
* Return the real path for a given virtual path, if possible; otherwise
* return <code>null</code>.
*
- * @param path The path to the desired resource
+ * @param name The path to the desired resource
*/
public String getRealPath(String name) {
if (!aliases.isEmpty()) {
Modified: tomcat/trunk/java/org/apache/tomcat/buildutil/Txt2Html.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/buildutil/Txt2Html.java?rev=881567&r1=881566&r2=881567&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/buildutil/Txt2Html.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/buildutil/Txt2Html.java Tue Nov 17
22:13:30 2009
@@ -63,7 +63,7 @@
/**
* Sets the files to be converted into HTML
*
- * @param fileset The fileset to be converted.
+ * @param fs The fileset to be converted.
*/
public void addFileset( FileSet fs ) {
filesets.add( fs );
@@ -72,7 +72,7 @@
/**
* Perform the conversion
*
- * @param BuildException Thrown if an error occurs during execution of
+ * @throws BuildException if an error occurs during execution of
* this task.
*/
@Override
Modified:
tomcat/trunk/java/org/apache/tomcat/util/digester/SetPropertiesRule.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/SetPropertiesRule.java?rev=881567&r1=881566&r2=881567&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/digester/SetPropertiesRule.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/SetPropertiesRule.java
Tue Nov 17 22:13:30 2009
@@ -154,7 +154,7 @@
* @param namespace the namespace URI of the matching element, or an
* empty string if the parser is not namespace aware or the element has
* no namespace
- * @param name the local name if the parser is namespace aware, or just
+ * @param theName the local name if the parser is namespace aware, or just
* the element name otherwise
* @param attributes The attribute list for this element
*/
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/SetPropertyRule.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/SetPropertyRule.java?rev=881567&r1=881566&r2=881567&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/digester/SetPropertyRule.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/SetPropertyRule.java Tue
Nov 17 22:13:30 2009
@@ -95,7 +95,7 @@
* @param namespace the namespace URI of the matching element, or an
* empty string if the parser is not namespace aware or the element has
* no namespace
- * @param name the local name if the parser is namespace aware, or just
+ * @param theName the local name if the parser is namespace aware, or just
* the element name otherwise
* @param attributes The attribute list for this element
*
Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java?rev=881567&r1=881566&r2=881567&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java Tue
Nov 17 22:13:30 2009
@@ -926,23 +926,23 @@
// ------------------------------------------------ PersistentMBean Methods
- /**
- * Instantiates this MBean instance from data found in the persistent
- * store. The data loaded could include attribute and operation values.
- * This method should be called during construction or initialization
- * of the instance, and before the MBean is registered with the
- * <code>MBeanServer</code>.
- *
- * <p><strong>IMPLEMENTATION NOTE</strong> - This implementation does
- * not support persistence.</p>
- *
- * @exception InstanceNotFoundException if the managed resource object
- * cannot be found
- * @exception MBeanException if the initializer of the object throws
- * an exception
- * @exception RuntimeOperationsException if an exception is reported
- * by the persistence mechanism
- */
+// /**
+// * Instantiates this MBean instance from data found in the persistent
+// * store. The data loaded could include attribute and operation values.
+// * This method should be called during construction or initialization
+// * of the instance, and before the MBean is registered with the
+// * <code>MBeanServer</code>.
+// *
+// * <p><strong>IMPLEMENTATION NOTE</strong> - This implementation does
+// * not support persistence.</p>
+// *
+// * @exception InstanceNotFoundException if the managed resource object
+// * cannot be found
+// * @exception MBeanException if the initializer of the object throws
+// * an exception
+// * @exception RuntimeOperationsException if an exception is reported
+// * by the persistence mechanism
+// */
// public void load() throws InstanceNotFoundException,
// MBeanException, RuntimeOperationsException {
// // XXX If a context was set, use it to load the data
@@ -953,22 +953,22 @@
// }
- /**
- * Capture the current state of this MBean instance and write it out
- * to the persistent store. The state stored could include attribute
- * and operation values. If one of these methods of persistence is not
- * supported, a "service not found" exception will be thrown.
- *
- * <p><strong>IMPLEMENTATION NOTE</strong> - This implementation does
- * not support persistence.</p>
- *
- * @exception InstanceNotFoundException if the managed resource object
- * cannot be found
- * @exception MBeanException if the initializer of the object throws
- * an exception, or persistence is not supported
- * @exception RuntimeOperationsException if an exception is reported
- * by the persistence mechanism
- */
+// /**
+// * Capture the current state of this MBean instance and write it out
+// * to the persistent store. The state stored could include attribute
+// * and operation values. If one of these methods of persistence is not
+// * supported, a "service not found" exception will be thrown.
+// *
+// * <p><strong>IMPLEMENTATION NOTE</strong> - This implementation does
+// * not support persistence.</p>
+// *
+// * @exception InstanceNotFoundException if the managed resource object
+// * cannot be found
+// * @exception MBeanException if the initializer of the object throws
+// * an exception, or persistence is not supported
+// * @exception RuntimeOperationsException if an exception is reported
+// * by the persistence mechanism
+// */
// public void store() throws InstanceNotFoundException,
// MBeanException, RuntimeOperationsException {
//
@@ -981,20 +981,20 @@
// -------------------- BaseModelMBean methods --------------------
- /** Set the type of the mbean. This is used as a key to locate
- * the description in the Registry.
- *
- * @param type the type of classname of the modeled object
- */
+// /** Set the type of the mbean. This is used as a key to locate
+// * the description in the Registry.
+// *
+// * @param type the type of classname of the modeled object
+// */
// void setModeledType( String type ) {
// initModelInfo(type);
// createResource();
// }
- /** Set the type of the mbean. This is used as a key to locate
- * the description in the Registry.
- *
- * @param type the type of classname of the modeled object
- */
+// /** Set the type of the mbean. This is used as a key to locate
+// * the description in the Registry.
+// *
+// * @param type the type of classname of the modeled object
+// */
// void initModelInfo( String type ) {
// try {
// if( log.isDebugEnabled())
@@ -1024,9 +1024,9 @@
// }
// }
- /** Set the type of the mbean. This is used as a key to locate
- * the description in the Registry.
- */
+// /** Set the type of the mbean. This is used as a key to locate
+// * the description in the Registry.
+// */
// protected void createResource() {
// try {
//
//Thread.currentThread().setContextClassLoader(BaseModelMBean.class.getClassLoader());
@@ -1079,9 +1079,9 @@
// ------------------------------------------------------ Protected Methods
- /**
- * Create and return a default <code>ModelMBeanInfo</code> object.
- */
+// /**
+// * Create and return a default <code>ModelMBeanInfo</code> object.
+// */
// protected ModelMBeanInfo createDefaultModelMBeanInfo() {
//
// return (new ModelMBeanInfoSupport(this.getClass().getName(),
@@ -1090,15 +1090,15 @@
//
// }
- /**
- * Is the specified <code>ModelMBeanInfo</code> instance valid?
- *
- * <p><strong>IMPLEMENTATION NOTE</strong> - This implementation
- * does not check anything, but this method can be overridden
- * as required.</p>
- *
- * @param info The <code>ModelMBeanInfo object to check
- */
+// /**
+// * Is the specified <code>ModelMBeanInfo</code> instance valid?
+// *
+// * <p><strong>IMPLEMENTATION NOTE</strong> - This implementation
+// * does not check anything, but this method can be overridden
+// * as required.</p>
+// *
+// * @param info The <code>ModelMBeanInfo object to check
+// */
// protected boolean isModelMBeanInfoValid(ModelMBeanInfo info) {
// return (true);
// }
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java?rev=881567&r1=881566&r2=881567&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java Tue
Nov 17 22:13:30 2009
@@ -137,7 +137,6 @@
* take up a lot of CPU cycles.
* @param buf ByteBuffer - the buffer containing the data, we will read as
until we have read at least one byte or we timed out
* @param socket SocketChannel - the socket to write data to
- * @param selector Selector - the selector to use for blocking, if null
then a busy read will be initiated
* @param readTimeout long - the timeout for this read operation in
milliseconds, -1 means no timeout
* @return int - returns the number of bytes read
* @throws EOFException if read returns -1
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SSLSessionManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLSessionManager.java?rev=881567&r1=881566&r2=881567&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLSessionManager.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLSessionManager.java Tue Nov
17 22:13:30 2009
@@ -25,8 +25,7 @@
*/
public interface SSLSessionManager {
/**
- * Invalidate the specified SSL session
- * @param sessionId The ID of the session to invalidate.
+ * Invalidate the SSL session
*/
public void invalidateSession();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
