tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r981816 [1/2] - in /tomcat/trunk: java/javax/servlet/ java/javax/servlet/http/ java/org/apache/catalina/ java/org/apache/catalina/core/ java/org/apache/catalina/filters/ java/org/apache/catalina/ha/tcp/ java/org/apache/catalina/manager/host...
Date Tue, 03 Aug 2010 10:45:01 GMT
Author: markt
Date: Tue Aug  3 10:44:58 2010
New Revision: 981816

URL: http://svn.apache.org/viewvc?rev=981816&view=rev
Log:
Fix the remaining Javadocs except the external links to JAX-RPC

Modified:
    tomcat/trunk/java/javax/servlet/FilterRegistration.java
    tomcat/trunk/java/javax/servlet/Registration.java
    tomcat/trunk/java/javax/servlet/ServletContext.java
    tomcat/trunk/java/javax/servlet/ServletRegistration.java
    tomcat/trunk/java/javax/servlet/ServletRequest.java
    tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java
    tomcat/trunk/java/javax/servlet/http/HttpServletResponse.java
    tomcat/trunk/java/org/apache/catalina/Context.java
    tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
    tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
    tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
    tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
    tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
    tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
    tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java
    tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
    tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
    tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
    tomcat/trunk/java/org/apache/catalina/startup/Embedded.java
    tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
    tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.java
    tomcat/trunk/java/org/apache/catalina/tribes/io/DirectByteArrayOutputStream.java
    tomcat/trunk/java/org/apache/catalina/tribes/io/ObjectReader.java
    tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java
    tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
    tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
    tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
    tomcat/trunk/java/org/apache/catalina/tribes/transport/AbstractSender.java
    tomcat/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java
    tomcat/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
    tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
    tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java
    tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java
    tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java
    tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java
    tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java
    tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
    tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java
    tomcat/trunk/java/org/apache/coyote/ActionCode.java
    tomcat/trunk/java/org/apache/coyote/OutputBuffer.java
    tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
    tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
    tomcat/trunk/java/org/apache/el/lang/ELSupport.java
    tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java
    tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AttributeReader.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
    tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
    tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileItem.java
    tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUpload.java
    tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java
    tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ParameterParser.java
    tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java
    tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItemFactory.java
    tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/package.html
    tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/servlet/ServletFileUpload.java
    tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/util/Streams.java
    tomcat/trunk/java/org/apache/tomcat/util/net/NioChannel.java
    tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
    tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
    tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
    tomcat/trunk/test/org/apache/catalina/tribes/demos/EchoRpcTest.java
    tomcat/trunk/test/org/apache/catalina/tribes/demos/LoadTest.java

Modified: tomcat/trunk/java/javax/servlet/FilterRegistration.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/FilterRegistration.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/FilterRegistration.java (original)
+++ tomcat/trunk/java/javax/servlet/FilterRegistration.java Tue Aug  3 10:44:58 2010
@@ -38,7 +38,7 @@ public interface FilterRegistration exte
             boolean isMatchAfter, String... servletNames);
     /**
      * 
-     * @return
+     * @return TODO
      */
     public Collection<String> getServletNameMappings();
     
@@ -56,7 +56,7 @@ public interface FilterRegistration exte
 
     /**
      * 
-     * @return
+     * @return TODO
      */
     public Collection<String> getUrlPatternMappings();
     

Modified: tomcat/trunk/java/javax/servlet/Registration.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/Registration.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/Registration.java (original)
+++ tomcat/trunk/java/javax/servlet/Registration.java Tue Aug  3 10:44:58 2010
@@ -34,7 +34,7 @@ public interface Registration {
      * 
      * @param name
      * @param value
-     * @return
+     * @return TODO
      * @throws IllegalArgumentException
      * @throws IllegalStateException
      */
@@ -45,7 +45,7 @@ public interface Registration {
     /**
      * 
      * @param initParameters
-     * @return
+     * @return TODO
      * @throws IllegalArgumentException
      * @throws IllegalStateException
      */

Modified: tomcat/trunk/java/javax/servlet/ServletContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletContext.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/ServletContext.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletContext.java Tue Aug  3 10:44:58 2010
@@ -104,14 +104,14 @@ public interface ServletContext {
     public int getMinorVersion();
 
     /**
-     * @return
+     * @return TODO
      * @throws UnsupportedOperationException
      * @since Servlet 3.0 TODO SERVLET3 - Add comments
      */
     public int getEffectiveMajorVersion();
 
     /**
-     * @return
+     * @return TODO
      * @throws UnsupportedOperationException
      * @since Servlet 3.0 TODO SERVLET3 - Add comments
      */
@@ -431,7 +431,7 @@ public interface ServletContext {
     /**
      * @param name
      * @param value
-     * @return
+     * @return TODO
      * @throws IllegalStateException
      * @throws UnsupportedOperationException
      * @since Servlet 3.0 TODO SERVLET3 - Add comments
@@ -519,6 +519,7 @@ public interface ServletContext {
     /**
      * @param servletName
      * @param className
+     * @return TODO
      * @throws IllegalStateException
      *             If the context has already been initialised
      * @since Servlet 3.0 TODO SERVLET3 - Add comments
@@ -529,6 +530,7 @@ public interface ServletContext {
     /**
      * @param servletName
      * @param servlet
+     * @return TODO
      * @throws IllegalStateException
      *             If the context has already been initialised
      * @since Servlet 3.0 TODO SERVLET3 - Add comments
@@ -539,6 +541,7 @@ public interface ServletContext {
     /**
      * @param servletName
      * @param servletClass
+     * @return TODO
      * @throws IllegalStateException
      *             If the context has already been initialised
      * @since Servlet 3.0 TODO SERVLET3 - Add comments
@@ -548,7 +551,7 @@ public interface ServletContext {
 
     /**
      * @param c
-     * @return
+     * @return TODO
      * @throws ServletException
      * @since Servlet 3.0 TODO SERVLET3 - Add comments
      */
@@ -557,14 +560,14 @@ public interface ServletContext {
 
     /**
      * @param servletName
-     * @return
+     * @return TODO
      * @throws UnsupportedOperationException
      * @since Servlet 3.0 TODO SERVLET3 - Add comments
      */
     public ServletRegistration getServletRegistration(String servletName);
 
     /**
-     * @return
+     * @return TODO
      * @throws UnsupportedOperationException
      * @since Servlet 3.0 TODO SERVLET3 - Add comments
      */
@@ -573,6 +576,7 @@ public interface ServletContext {
     /**
      * @param filterName
      * @param className
+     * @return TODO
      * @throws IllegalStateException
      *             If the context has already been initialised
      * @since Servlet 3.0 TODO SERVLET3 - Add comments
@@ -583,6 +587,7 @@ public interface ServletContext {
     /**
      * @param filterName
      * @param filter
+     * @return TODO
      * @throws IllegalStateException
      *             If the context has already been initialised
      * @since Servlet 3.0 TODO SERVLET3 - Add comments
@@ -592,6 +597,7 @@ public interface ServletContext {
     /**
      * @param filterName
      * @param filterClass
+     * @return TODO
      * @throws IllegalStateException
      *             If the context has already been initialised
      * @since Servlet 3.0 TODO SERVLET3 - Add comments
@@ -601,7 +607,7 @@ public interface ServletContext {
 
     /**
      * @param c
-     * @return
+     * @return TODO
      * @throws ServletException
      * @since Servlet 3.0 TODO SERVLET3 - Add comments
      */
@@ -610,21 +616,21 @@ public interface ServletContext {
 
     /**
      * @param filterName
-     * @return
+     * @return TODO
      * @throws UnsupportedOperationException
      * @since Servlet 3.0 TODO SERVLET3 - Add comments
      */
     public FilterRegistration getFilterRegistration(String filterName);
 
     /**
-     * @return
+     * @return TODO
      * @throws UnsupportedOperationException
      * @since Servlet 3.0 TODO SERVLET3 - Add comments
      */
     public Map<String, ? extends FilterRegistration> getFilterRegistrations();
 
     /**
-     * @return
+     * @return TODO
      * @throws UnsupportedOperationException
      * @since Servlet 3.0 TODO SERVLET3 - Add comments
      */
@@ -646,13 +652,13 @@ public interface ServletContext {
             throws IllegalStateException, IllegalArgumentException;
 
     /**
-     * @return
+     * @return TODO
      * @since Servlet 3.0 TODO SERVLET3 - Add comments
      */
     public Set<SessionTrackingMode> getDefaultSessionTrackingModes();
 
     /**
-     * @return
+     * @return TODO
      * @since Servlet 3.0 TODO SERVLET3 - Add comments
      */
     public Set<SessionTrackingMode> getEffectiveSessionTrackingModes();
@@ -672,6 +678,7 @@ public interface ServletContext {
     /**
      * @param <T>
      * @param t
+     * @return TODO
      * @since Servlet 3.0 TODO SERVLET3 - Add comments
      */
     public <T extends EventListener> void addListener(T t);
@@ -679,7 +686,7 @@ public interface ServletContext {
     /**
      * @param <T>
      * @param c
-     * @return
+     * @return TODO
      * @throws ServletException
      * @since Servlet 3.0 TODO SERVLET3 - Add comments
      */
@@ -696,7 +703,7 @@ public interface ServletContext {
     public void declareRoles(String... roleNames);
 
     /**
-     * @return
+     * @return TODO
      * @throws UnsupportedOperationException
      * @throws SecurityException
      * @since Servlet 3.0 TODO SERVLET3 - Add comments
@@ -704,7 +711,7 @@ public interface ServletContext {
     public ClassLoader getClassLoader();
 
     /**
-     * @return
+     * @return TODO
      * @throws UnsupportedOperationException
      * @since Servlet 3.0 TODO SERVLET3 - Add comments
      */

Modified: tomcat/trunk/java/javax/servlet/ServletRegistration.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletRegistration.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/ServletRegistration.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletRegistration.java Tue Aug  3 10:44:58 2010
@@ -29,7 +29,7 @@ public interface ServletRegistration ext
     /**
      * 
      * @param urlPatterns
-     * @return
+     * @return TODO
      * @throws IllegalArgumentException if urlPattern is null or empty
      * @throws IllegalStateException if the associated ServletContext has
      *                                  already been initialised

Modified: tomcat/trunk/java/javax/servlet/ServletRequest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletRequest.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/ServletRequest.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletRequest.java Tue Aug  3 10:44:58 2010
@@ -427,13 +427,13 @@ public interface ServletRequest {
     public int getLocalPort();
 
     /**
-     * @return
+     * @return TODO
      * @since Servlet 3.0 TODO SERVLET3 - Add comments
      */
     public ServletContext getServletContext();
 
     /**
-     * @return
+     * @return TODO
      * @throws java.lang.IllegalStateException
      *             If async is not supported for this request
      * @since Servlet 3.0 TODO SERVLET3 - Add comments
@@ -443,7 +443,7 @@ public interface ServletRequest {
     /**
      * @param servletRequest
      * @param servletResponse
-     * @return
+     * @return TODO
      * @throws java.lang.IllegalStateException
      * @since Servlet 3.0 TODO SERVLET3 - Add comments
      */
@@ -451,26 +451,26 @@ public interface ServletRequest {
             ServletResponse servletResponse);
 
     /**
-     * @return
+     * @return TODO
      * @since Servlet 3.0 TODO SERVLET3 - Add comments
      */
     public boolean isAsyncStarted();
 
     /**
-     * @return
+     * @return TODO
      * @since Servlet 3.0 TODO SERVLET3 - Add comments
      */
     public boolean isAsyncSupported();
 
     /**
-     * @return
+     * @return TODO
      * @throws java.lang.IllegalStateException
      * @since Servlet 3.0 TODO SERVLET3 - Add comments
      */
     public AsyncContext getAsyncContext();
 
     /**
-     * @return
+     * @return TODO
      * @since Servlet 3.0 TODO SERVLET3 - Add comments
      */
     public DispatcherType getDispatcherType();

Modified: tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java (original)
+++ tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java Tue Aug  3 10:44:58 2010
@@ -424,7 +424,7 @@ public interface HttpServletRequest exte
 
     /**
      * @param response
-     * @return
+     * @return TODO
      * @throws IOException
      * @throws ServletException
      * @since Servlet 3.0 TODO SERVLET3 - Add comments
@@ -455,7 +455,7 @@ public interface HttpServletRequest exte
     /**
      * Return a collection of all uploaded Parts.
      * 
-     * @return
+     * @return A collection of all uploaded Parts.
      * @throws IOException
      *             if an I/O error occurs
      * @throws IllegalStateException
@@ -472,7 +472,7 @@ public interface HttpServletRequest exte
      * of all Parts.
      * 
      * @param name
-     * @return
+     * @return The named Part or null if the Part does not exist
      * @throws IOException
      *             if an I/O error occurs
      * @throws IllegalStateException

Modified: tomcat/trunk/java/javax/servlet/http/HttpServletResponse.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpServletResponse.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/http/HttpServletResponse.java (original)
+++ tomcat/trunk/java/javax/servlet/http/HttpServletResponse.java Tue Aug  3 10:44:58 2010
@@ -301,27 +301,27 @@ public interface HttpServletResponse ext
     public void setStatus(int sc, String sm);
 
     /**
-     * @return
+     * @return TODO
      * @since Servlet 3.0 TODO SERVLET3 - Add comments
      */
     public int getStatus();
 
     /**
      * @param name
-     * @return
+     * @return TODO
      * @since Servlet 3.0 TODO SERVLET3 - Add comments
      */
     public String getHeader(String name);
 
     /**
      * @param name
-     * @return
+     * @return TODO
      * @since Servlet 3.0 TODO SERVLET3 - Add comments
      */
     public Collection<String> getHeaders(String name);
 
     /**
-     * @return
+     * @return TODO
      * @since Servlet 3.0 TODO SERVLET3 - Add comments
      */
     public Collection<String> getHeaderNames();

Modified: tomcat/trunk/java/org/apache/catalina/Context.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Context.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/Context.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Context.java Tue Aug  3 10:44:58 2010
@@ -1215,8 +1215,6 @@ public interface Context extends Contain
     
     /**
      * Is this Context paused whilst it is reloaded?
-     * 
-     * @return
      */
     public boolean getPaused();
 

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardHost.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardHost.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardHost.java Tue Aug  3 10:44:58 2010
@@ -223,7 +223,6 @@ public class StandardHost extends Contai
     /**
      * Returns true if the Host will attempt to create directories for appBase and xmlBase
      * unless they already exist.
-     * @return
      */
     public boolean getCreateDirs() {
         return createDirs;

Modified: tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java Tue Aug  3 10:44:58 2010
@@ -1139,7 +1139,6 @@ public class ExpiresFilter extends Filte
      *            can be <code>null</code>
      * @param separator
      *            can be <code>null</code>
-     * @return
      */
     protected static String substringBefore(String str, String separator) {
         if (str == null || str.isEmpty() || separator == null) {

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=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java Tue Aug  3 10:44:58 2010
@@ -555,7 +555,7 @@ public class SimpleTcpCluster extends Li
     /**
      * @param name
      * @param manager
-     * @return
+     * @return TODO
      */
     public String getManagerName(String name, Manager manager) {
         String clusterName = name ;

Modified: tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java Tue Aug  3 10:44:58 2010
@@ -56,7 +56,7 @@ import org.apache.catalina.util.ServerIn
 * @author Glenn L. Nielsen
 * @author Peter Rossbach
 * @version $Id$
-* @see ManagerServlet
+* @see org.apache.catalina.manager.ManagerServlet
 */
 
 public final class HTMLHostManagerServlet extends HostManagerServlet {
@@ -166,7 +166,6 @@ public final class HTMLHostManagerServle
     /**
      * Remove the specified host.
      *
-     * @param writer Writer to render results to
      * @param name host name
      */
     protected String remove(String name) {

Modified: tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java Tue Aug  3 10:44:58 2010
@@ -267,12 +267,11 @@ public class HostManagerServlet
 
 
     /**
-     * extract boolean value from checkbox with default
+     * Extract boolean value from checkbox with default.
      * @param request
      * @param parameter
      * @param theDefault
      * @param htmlMode
-     * @return
      */
     protected boolean booleanParameter(HttpServletRequest request,
             String parameter, boolean theDefault, boolean htmlMode) {

Modified: tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java Tue Aug  3 10:44:58 2010
@@ -639,8 +639,6 @@ public class MBeanFactory {
      * @param deployOnStartup Deploy on server startup?
      * @param deployXML Should we deploy Context XML config files property?
      * @param unpackWARs Should we unpack WARs when auto deploying?
-     * @param xmlNamespaceAware Should we turn on/off XML namespace awareness?
-     * @param xmlValidation Should we turn on/off XML validation?        
      *
      * @exception Exception if an MBean cannot be created or registered
      */

Modified: tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java Tue Aug  3 10:44:58 2010
@@ -1623,7 +1623,6 @@ public class MBeanUtils {
      * Service.
      * 
      * @param service 
-     * @return
      */
     public static String getDomain(Service service) {
         
@@ -1656,7 +1655,6 @@ public class MBeanUtils {
      * Container.
      * 
      * @param container
-     * @return
      */
     public static String getDomain(Container container) {
         

Modified: tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java Tue Aug  3 10:44:58 2010
@@ -1142,7 +1142,7 @@ public class JNDIRealm extends RealmBase
      *
      * @exception NamingException if a directory server error occurs
      *
-     * @see #getUser(DirContext, String, int)
+     * @see #getUser(DirContext, String, String, int)
      */
     protected User getUser(DirContext context, String username, String credentials)
         throws NamingException {

Modified: tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Tue Aug  3 10:44:58 2010
@@ -1576,7 +1576,7 @@ public class DefaultServlet
      *
      * @param request The servlet request we are processing
      * @param response The servlet response we are creating
-     * @param resourceInfo File object
+     * @param resourceAttributes File object
      * @return boolean true if the resource meets the specified condition,
      * and false if the condition is not satisfied, in which case request
      * processing is stopped
@@ -1621,7 +1621,7 @@ public class DefaultServlet
      *
      * @param request The servlet request we are processing
      * @param response The servlet response we are creating
-     * @param resourceInfo File object
+     * @param resourceAttributes File object
      * @return boolean true if the resource meets the specified condition,
      * and false if the condition is not satisfied, in which case request
      * processing is stopped
@@ -1659,7 +1659,7 @@ public class DefaultServlet
      *
      * @param request The servlet request we are processing
      * @param response The servlet response we are creating
-     * @param resourceInfo File object
+     * @param resourceAttributes File object
      * @return boolean true if the resource meets the specified condition,
      * and false if the condition is not satisfied, in which case request
      * processing is stopped
@@ -1717,7 +1717,7 @@ public class DefaultServlet
      *
      * @param request The servlet request we are processing
      * @param response The servlet response we are creating
-     * @param resourceInfo File object
+     * @param resourceAttributes File object
      * @return boolean true if the resource meets the specified condition,
      * and false if the condition is not satisfied, in which case request
      * processing is stopped
@@ -1750,7 +1750,8 @@ public class DefaultServlet
      * output stream, and ensure that both streams are closed before returning
      * (even in the face of an exception).
      *
-     * @param resourceInfo The resource information
+     * @param cacheEntry The cache entry for the source resource
+     * @param is The input stream to read the source resource from   
      * @param ostream The output stream to write to
      *
      * @exception IOException if an input/output error occurs
@@ -1796,7 +1797,8 @@ public class DefaultServlet
      * output stream, and ensure that both streams are closed before returning
      * (even in the face of an exception).
      *
-     * @param resourceInfo The resource info
+     * @param cacheEntry The cache entry for the source resource
+     * @param is The input stream to read the source resource from   
      * @param writer The writer to write to
      *
      * @exception IOException if an input/output error occurs
@@ -1839,7 +1841,7 @@ public class DefaultServlet
      * output stream, and ensure that both streams are closed before returning
      * (even in the face of an exception).
      *
-     * @param resourceInfo The ResourceInfo object
+     * @param cacheEntry The cache entry for the source resource
      * @param ostream The output stream to write to
      * @param range Range the client wanted to retrieve
      * @exception IOException if an input/output error occurs
@@ -1870,7 +1872,7 @@ public class DefaultServlet
      * output stream, and ensure that both streams are closed before returning
      * (even in the face of an exception).
      *
-     * @param resourceInfo The ResourceInfo object
+     * @param cacheEntry The cache entry for the source resource
      * @param writer The writer to write to
      * @param range Range the client wanted to retrieve
      * @exception IOException if an input/output error occurs
@@ -1908,7 +1910,7 @@ public class DefaultServlet
      * output stream, and ensure that both streams are closed before returning
      * (even in the face of an exception).
      *
-     * @param resourceInfo The ResourceInfo object
+     * @param cacheEntry The cache entry for the source resource
      * @param ostream The output stream to write to
      * @param ranges Enumeration of the ranges the client wanted to retrieve
      * @param contentType Content type of the resource
@@ -1961,7 +1963,7 @@ public class DefaultServlet
      * output stream, and ensure that both streams are closed before returning
      * (even in the face of an exception).
      *
-     * @param resourceInfo The ResourceInfo object
+     * @param cacheEntry The cache entry for the source resource
      * @param writer The writer to write to
      * @param ranges Enumeration of the ranges the client wanted to retrieve
      * @param contentType Content type of the resource

Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Tue Aug  3 10:44:58 2010
@@ -1554,7 +1554,6 @@ public class ContextConfig
      * @param filename  Name of the file (possibly with one or more leading path
      *                  segments) to read
      * @param path      Location that filename is relative to 
-     * @return
      */
     protected InputSource getWebXmlSource(String filename, String path) {
         File file = new File(filename);

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=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Embedded.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Embedded.java Tue Aug  3 10:44:58 2010
@@ -96,7 +96,7 @@ import org.apache.tomcat.util.log.System
  * To initiate a normal shutdown, call the <code>stop()</code> method of
  * this object.
  * <p>
- * @see org.apache.catalina.startup.Catalina#main For a complete example
+ * @see org.apache.catalina.startup.Bootstrap#main For a complete example
  * of how Tomcat is set up and launched as an Embedded application.
  *
  * @author Craig R. McClanahan

Modified: tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java Tue Aug  3 10:44:58 2010
@@ -84,7 +84,7 @@ import org.apache.catalina.session.Stand
  * see setters for doc. It can be used for simple tests and
  * demo.
  * 
- * @see TestTomcat for examples on how to use this
+ * @see <a href="http://svn.apache.org/repos/asf/tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java">TestTomcat</a>
  * @author Costin Manolache
  */
 public class Tomcat {

Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.java Tue Aug  3 10:44:58 2010
@@ -80,7 +80,7 @@ public class GzipInterceptor extends Cha
     }
     
     /**
-     * @todo Fix to create an automatically growing buffer.
+     * TODO Fix to create an automatically growing buffer.
      * @param data byte[]
      * @return byte[]
      * @throws IOException

Modified: tomcat/trunk/java/org/apache/catalina/tribes/io/DirectByteArrayOutputStream.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/io/DirectByteArrayOutputStream.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/io/DirectByteArrayOutputStream.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/io/DirectByteArrayOutputStream.java Tue Aug  3 10:44:58 2010
@@ -41,7 +41,7 @@ public class DirectByteArrayOutputStream
      * @throws IOException if an I/O error occurs. In particular, an
      *   <code>IOException</code> may be thrown if the output stream has
      *   been closed.
-     * @todo Implement this java.io.OutputStream method
+     * TODO Implement this java.io.OutputStream method
      */
     @Override
     public void write(int b) throws IOException {

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=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/io/ObjectReader.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/io/ObjectReader.java Tue Aug  3 10:44:58 2010
@@ -114,7 +114,7 @@ public class ObjectReader {
      * Send buffer to cluster listener (callback).
      * Is message complete receiver send message to callback?
      *
-     * @see org.apache.catalina.tribes.transport.ClusterReceiverBase#messageDataReceived(ChannelMessage)
+     * @see org.apache.catalina.tribes.transport.ReceiverBase#messageDataReceived(ChannelMessage)
      * @see XByteBuffer#doesPackageExist()
      * @see XByteBuffer#extractPackage(boolean)
      *

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=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java Tue Aug  3 10:44:58 2010
@@ -83,7 +83,7 @@ public class XByteBuffer
     /**
      * Constructs a new XByteBuffer
      * @param size - the initial size of the byte buffer
-     * @todo use a pool of byte[] for performance
+     * TODO use a pool of byte[] for performance
      */
     public XByteBuffer(int size, boolean discard) {
         buf = new byte[size];

Modified: tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java Tue Aug  3 10:44:58 2010
@@ -483,7 +483,7 @@ public abstract class AbstractReplicated
     }
 
     /**
-     * @todo implement state transfer
+     * TODO implement state transfer
      * @param msg Serializable
      * @return Serializable - null if no reply should be sent
      */

Modified: tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java Tue Aug  3 10:44:58 2010
@@ -60,7 +60,7 @@ import org.apache.juli.logging.LogFactor
  * 
  * <br><br><b>REMBER TO CALL <code>breakdown()</code> or <code>finalize()</code> when you are done with the map to 
  * avoid memory leaks.<br><br>
- * @todo implement periodic sync/transfer thread
+ * TODO implement periodic sync/transfer thread
  * @author Filip Hanik
  * @version 1.0
  */

Modified: tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java Tue Aug  3 10:44:58 2010
@@ -39,11 +39,11 @@ import org.apache.catalina.tribes.Member
  *
  * <br><br><b>REMBER TO CALL <code>breakdown()</code> or <code>finalize()</code> when you are done with the map to
  * avoid memory leaks.<br><br>
- * @todo implement periodic sync/transfer thread
+ * TODO implement periodic sync/transfer thread
  * @author Filip Hanik
  * @version 1.0
  * 
- * @todo memberDisappeared, should do nothing except change map membership
+ * TODO memberDisappeared, should do nothing except change map membership
  *       by default it relocates the primary objects
  */
 public class ReplicatedMap extends AbstractReplicatedMap {

Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/AbstractSender.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/AbstractSender.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/AbstractSender.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/AbstractSender.java Tue Aug  3 10:44:58 2010
@@ -99,14 +99,14 @@ public abstract class AbstractSender imp
      * connect
      *
      * @throws IOException
-     * @todo Implement this org.apache.catalina.tribes.transport.DataSender method
+     * TODO Implement this org.apache.catalina.tribes.transport.DataSender method
      */
     public abstract void connect() throws IOException;
 
     /**
      * disconnect
      *
-     * @todo Implement this org.apache.catalina.tribes.transport.DataSender method
+     * TODO Implement this org.apache.catalina.tribes.transport.DataSender method
      */
     public abstract void disconnect();
 
@@ -114,7 +114,7 @@ public abstract class AbstractSender imp
      * keepalive
      *
      * @return boolean
-     * @todo Implement this org.apache.catalina.tribes.transport.DataSender method
+     * TODO Implement this org.apache.catalina.tribes.transport.DataSender method
      */
     public boolean keepalive() {
         boolean disconnect = false;

Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java Tue Aug  3 10:44:58 2010
@@ -106,7 +106,7 @@ public abstract class ReceiverBase imple
      * getMessageListener
      *
      * @return MessageListener
-     * @todo Implement this org.apache.catalina.tribes.ChannelReceiver method
+     * TODO Implement this org.apache.catalina.tribes.ChannelReceiver method
      */
     public MessageListener getMessageListener() {
         return listener;
@@ -115,7 +115,7 @@ public abstract class ReceiverBase imple
     /**
      *
      * @return The port
-     * @todo Implement this org.apache.catalina.tribes.ChannelReceiver method
+     * TODO Implement this org.apache.catalina.tribes.ChannelReceiver method
      */
     public int getPort() {
         return port;
@@ -142,7 +142,7 @@ public abstract class ReceiverBase imple
      * setMessageListener
      *
      * @param listener MessageListener
-     * @todo Implement this org.apache.catalina.tribes.ChannelReceiver method
+     * TODO Implement this org.apache.catalina.tribes.ChannelReceiver method
      */
     public void setMessageListener(MessageListener listener) {
         this.listener = listener;
@@ -239,7 +239,7 @@ public abstract class ReceiverBase imple
      * @param socket
      * @param portstart
      * @param retries
-     * @return
+     * @return int
      * @throws IOException
      */
     protected int bindUdp(DatagramSocket socket, int portstart, int retries) throws IOException {

Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java Tue Aug  3 10:44:58 2010
@@ -72,7 +72,7 @@ public class ReplicationTransmitter impl
     
     /**
      * Send data to one member
-     * @see org.apache.catalina.tribes.ClusterSender#sendMessage(org.apache.catalina.tribes.ClusterMessage, org.apache.catalina.tribes.Member)
+     * @see org.apache.catalina.tribes.ChannelSender#sendMessage(org.apache.catalina.tribes.ChannelMessage, org.apache.catalina.tribes.Member[])
      */
     public void sendMessage(ChannelMessage message, Member[] destination) throws ChannelException {
         MultiPointSender sender = getTransport();
@@ -83,16 +83,16 @@ public class ReplicationTransmitter impl
     /**
      * start the sender and register transmitter mbean
      * 
-     * @see org.apache.catalina.tribes.ClusterSender#start()
+     * @see org.apache.catalina.tribes.ChannelSender#start()
      */
     public void start() throws java.io.IOException {
         getTransport().connect();
     }
 
-    /*
+    /**
      * stop the sender and deregister mbeans (transmitter, senders)
      * 
-     * @see org.apache.catalina.tribes.ClusterSender#stop()
+     * @see org.apache.catalina.tribes.ChannelSender#stop()
      */
     public synchronized void stop() {
         getTransport().disconnect();
@@ -101,9 +101,9 @@ public class ReplicationTransmitter impl
     /**
      * Call transmitter to check for sender socket status
      * 
-     * @see SimpleTcpCluster#backgroundProcess()
+     * @see org.apache.catalina.ha.tcp.SimpleTcpCluster#backgroundProcess()
      */
-
+    @Override
     public void heartbeat() {
         if (getTransport()!=null) getTransport().keepalive();
     }
@@ -112,7 +112,7 @@ public class ReplicationTransmitter impl
      * add new cluster member and create sender ( s. replicationMode) transfer
      * current properties to sender
      * 
-     * @see org.apache.catalina.tribes.ClusterSender#add(org.apache.catalina.tribes.Member)
+     * @see org.apache.catalina.tribes.ChannelSender#add(org.apache.catalina.tribes.Member)
      */
     public synchronized void add(Member member) {
         getTransport().add(member);
@@ -121,7 +121,7 @@ public class ReplicationTransmitter impl
     /**
      * remove sender from transmitter. ( deregister mbean and disconnect sender )
      * 
-     * @see org.apache.catalina.tribes.ClusterSender#remove(org.apache.catalina.tribes.Member)
+     * @see org.apache.catalina.tribes.ChannelSender#remove(org.apache.catalina.tribes.Member)
      */
     public synchronized void remove(Member member) {
         getTransport().remove(member);

Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java Tue Aug  3 10:44:58 2010
@@ -45,7 +45,7 @@ public class BioReceiver extends Receive
     /**
      *
      * @throws IOException
-     * @todo Implement this org.apache.catalina.tribes.ChannelReceiver method
+     * TODO Implement this org.apache.catalina.tribes.ChannelReceiver method
      */
     @Override
     public void start() throws IOException {
@@ -83,7 +83,7 @@ public class BioReceiver extends Receive
 
     /**
      *
-     * @todo Implement this org.apache.catalina.tribes.ChannelReceiver method
+     * TODO Implement this org.apache.catalina.tribes.ChannelReceiver method
      */
     @Override
     public void stop() {

Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java Tue Aug  3 10:44:58 2010
@@ -141,8 +141,7 @@ public class BioReplicationTask extends 
 
     /**
      * send a reply-acknowledgment (6,2,3)
-     * @param key
-     * @param channel
+     * @param command
      */
     protected void sendAck(byte[] command) {
         try {

Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java Tue Aug  3 10:44:58 2010
@@ -28,7 +28,6 @@ import org.apache.catalina.tribes.Remote
 import org.apache.catalina.tribes.io.XByteBuffer;
 import org.apache.catalina.tribes.transport.AbstractSender;
 import org.apache.catalina.tribes.transport.Constants;
-import org.apache.catalina.tribes.transport.DataSender;
 import org.apache.catalina.tribes.transport.SenderState;
 import org.apache.catalina.tribes.util.StringManager;
 
@@ -89,7 +88,7 @@ public class BioSender extends AbstractS
 
     /**
      * Connect other cluster member receiver 
-     * @see org.apache.catalina.tribes.transport.IDataSender#connect()
+     * @see org.apache.catalina.tribes.transport.DataSender#connect()
      */
     @Override
     public  void connect() throws IOException {
@@ -100,7 +99,7 @@ public class BioSender extends AbstractS
     /**
      * disconnect and close socket
      * 
-     * @see IDataSender#disconnect()
+     * @see org.apache.catalina.tribes.transport.DataSender#disconnect()
      */
     @Override
     public  void disconnect() {
@@ -114,10 +113,7 @@ public class BioSender extends AbstractS
     }
 
     /**
-     * Send message
-     * 
-     * @see org.apache.catalina.tribes.transport.IDataSender#sendMessage(,
-     *      ChannelMessage)
+     * Send message.
      */
     public  void sendMessage(byte[] data, boolean waitForAck) throws IOException {
         IOException exception = null;
@@ -197,10 +193,9 @@ public class BioSender extends AbstractS
      }
 
     /**
-     * close socket
+     * Close socket.
      * 
-     * @see DataSender#disconnect()
-     * @see DataSender#closeSocket()
+     * @see #disconnect()
      */
     protected void closeSocket() {
         if(isConnected()) {
@@ -232,7 +227,7 @@ public class BioSender extends AbstractS
      * 
      * @see #closeSocket()
      * @see #openSocket()
-     * @see #writeData(ChannelMessage)
+     * @see #sendMessage(byte[], boolean)
      * 
      * @param data
      *            data to send
@@ -251,9 +246,8 @@ public class BioSender extends AbstractS
     }
     
     /**
-     * Wait for Acknowledgment from other server
+     * Wait for Acknowledgement from other server.
      * FIXME Please, not wait only for three characters, better control that the wait ack message is correct.
-     * @param timeout
      * @throws java.io.IOException
      * @throws java.net.SocketTimeoutException
      */

Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java Tue Aug  3 10:44:58 2010
@@ -44,6 +44,7 @@ public class MultipointBioSender extends
     protected HashMap<Member, BioSender> bioSenders =
         new HashMap<Member, BioSender>();
 
+    @Override
     public synchronized void sendMessage(Member[] destination, ChannelMessage msg) throws ChannelException {
         byte[] data = XByteBuffer.createDataPackage((ChannelData)msg);
         BioSender[] senders = setupForSend(destination);

Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java Tue Aug  3 10:44:58 2010
@@ -61,7 +61,7 @@ public class PooledMultiSender extends P
      * getNewDataSender
      *
      * @return DataSender
-     * @todo Implement this org.apache.catalina.tribes.transport.PooledSender
+     * TODO Implement this org.apache.catalina.tribes.transport.PooledSender
      *   method
      */
     @Override

Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java Tue Aug  3 10:44:58 2010
@@ -144,11 +144,6 @@ public class FastQueue {
         lock.setRemoveWaitTimeout(removeWaitTimeout);
     }
 
-    /**
-     * get Max Queue length
-     * 
-     * @see org.apache.catalina.tribes.util.IQueue#getMaxQueueLength()
-     */
     public int getMaxQueueLength() {
         return maxQueueLength;
     }
@@ -236,8 +231,8 @@ public class FastQueue {
     }
 
     /**
-     * Add new data to the queue
-     * @see org.apache.catalina.tribes.util.IQueue#add(java.lang.String, java.lang.Object)
+     * Add new data to the queue.
+     * 
      * FIXME extract some method
      */
     public boolean add(ChannelMessage msg, Member[] destination, InterceptorPayload payload) {
@@ -307,8 +302,7 @@ public class FastQueue {
     }
 
     /**
-     * remove the complete queued object list
-     * @see org.apache.catalina.tribes.util.IQueue#remove()
+     * Remove the complete queued object list.
      * FIXME extract some method
      */
     public LinkObject remove() {

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=981816&r1=981815&r2=981816&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 Aug  3 10:44:58 2010
@@ -91,7 +91,7 @@ public class NioReceiver extends Receive
     /**
      * start cluster receiver
      * @throws IOException
-     * @see org.apache.catalina.tribes.ClusterReceiver#start()
+     * @see org.apache.catalina.tribes.ChannelReceiver#start()
      */
     @Override
     public void start() throws IOException {
@@ -345,7 +345,7 @@ public class NioReceiver extends Receive
     /**
      * Close Selector.
      *
-     * @see org.apache.catalina.tribes.transport.ClusterReceiverBase#stopListening()
+     * @see org.apache.catalina.tribes.transport.ReceiverBase#stop()
      */
     protected void stopListening() {
         setListen(false);

Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java Tue Aug  3 10:44:58 2010
@@ -211,7 +211,7 @@ public class NioSender extends AbstractS
      * connect - blocking in this operation
      *
      * @throws IOException
-     * @todo Implement this org.apache.catalina.tribes.transport.IDataSender method
+     * TODO Implement this org.apache.catalina.tribes.transport.IDataSender method
      */
     @Override
     public synchronized void connect() throws IOException {
@@ -256,7 +256,7 @@ public class NioSender extends AbstractS
     /**
      * disconnect
      *
-     * @todo Implement this org.apache.catalina.tribes.transport.IDataSender method
+     * TODO Implement this org.apache.catalina.tribes.transport.IDataSender method
      */
     @Override
     public void disconnect() {
@@ -328,7 +328,7 @@ public class NioSender extends AbstractS
     *
     * @param data ChannelMessage
     * @throws IOException
-    * @todo Implement this org.apache.catalina.tribes.transport.IDataSender method
+    * TODO Implement this org.apache.catalina.tribes.transport.IDataSender method
     */
    public synchronized void setMessage(byte[] data) throws IOException {
        setMessage(data,0,data.length);

Modified: tomcat/trunk/java/org/apache/coyote/ActionCode.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ActionCode.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ActionCode.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ActionCode.java Tue Aug  3 10:44:58 2010
@@ -171,7 +171,7 @@ public final class ActionCode {
      */
     public static final ActionCode ACTION_ASYNC_COMPLETE = new ActionCode(27);
     /**
-     * Callback for an async call to {@link javax.servlet.ServletRequest#setAsyncTimeout(long)}
+     * Callback for an async call to {@link javax.servlet.AsyncContext#setTimeout(long)}
      */
     public static final ActionCode ACTION_ASYNC_SETTIMEOUT = new ActionCode(28);
     

Modified: tomcat/trunk/java/org/apache/coyote/OutputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/OutputBuffer.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/OutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/OutputBuffer.java Tue Aug  3 10:44:58 2010
@@ -33,11 +33,11 @@ import org.apache.tomcat.util.buf.ByteCh
 public interface OutputBuffer {
 
 
-    /** Write the response. The caller ( tomcat ) owns the chunks.
+    /**
+     * Write the response. The caller ( tomcat ) owns the chunks.
      *
      * @param chunk data to write
      * @param response used to allow buffers that can be shared by multiple responses.
-     * @return
      * @throws IOException
      */
     public int doWrite(ByteChunk chunk, Response response)

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=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Tue Aug  3 10:44:58 2010
@@ -1053,7 +1053,6 @@ public class Http11Processor extends Abs
 
     /**
      * Set the socket buffer flag.
-     * @Override
      */
     @Override
     public void setSocketBuffer(int socketBuffer) {

Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java Tue Aug  3 10:44:58 2010
@@ -199,7 +199,7 @@ public class InternalNioOutputBuffer ext
      * @param flip boolean
      * @return int
      * @throws IOException
-     * @todo Fix non blocking write properly
+     * TODO Fix non blocking write properly
      */
     private synchronized int writeToSocket(ByteBuffer bytebuffer, boolean block, boolean flip) throws IOException {
         if ( flip ) bytebuffer.flip();

Modified: tomcat/trunk/java/org/apache/el/lang/ELSupport.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/ELSupport.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/lang/ELSupport.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/ELSupport.java Tue Aug  3 10:44:58 2010
@@ -173,11 +173,6 @@ public class ELSupport {
         }
     }
 
-    /**
-     * @param obj
-     * @param type
-     * @return
-     */
     public final static Enum<?> coerceToEnum(final Object obj, Class type) {
         if (obj == null || "".equals(obj)) {
             return null;

Modified: tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java (original)
+++ tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java Tue Aug  3 10:44:58 2010
@@ -50,9 +50,6 @@ public class ReflectionUtil {
             byte.class, char.class, double.class, float.class, int.class,
             long.class, short.class, Void.TYPE };
 
-    /**
-     * 
-     */
     private ReflectionUtil() {
         super();
     }
@@ -87,7 +84,6 @@ public class ReflectionUtil {
     /**
      * Converts an array of Class names to Class types
      * @param s
-     * @return
      * @throws ClassNotFoundException
      */
     public static Class<?>[] toTypeArray(String[] s) throws ClassNotFoundException {
@@ -103,7 +99,6 @@ public class ReflectionUtil {
     /**
      * Converts an array of Class types to Class names
      * @param c
-     * @return
      */
     public static String[] toTypeNameArray(Class<?>[] c) {
         if (c == null)
@@ -300,13 +295,6 @@ public class ReflectionUtil {
         return null;
     }
 
-    /**
-     * @param base
-     * @param property
-     * @return
-     * @throws ELException
-     * @throws PropertyNotFoundException
-     */
     public static PropertyDescriptor getPropertyDescriptor(Object base,
             Object property) throws ELException, PropertyNotFoundException {
         String name = ELSupport.coerceToString(property);

Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java Tue Aug  3 10:44:58 2010
@@ -897,7 +897,6 @@ public class JspUtil {
      * 'int[]' -> 'int[].class'
      * 
      * @param type
-     * @return
      */
     public static String toJavaSourceTypeFromTld(String type) {
         if (type == null || "void".equals(type)) {

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java Tue Aug  3 10:44:58 2010
@@ -25,34 +25,28 @@ package org.apache.tomcat.util.bcel;
  */
 public interface Constants {
 
-    /** One of the access flags for fields, methods, or classes.
-   *  @see #ACC_PUBLIC
+  /** One of the access flags for fields, methods, or classes.
    */
   public final static short ACC_FINAL        = 0x0010;
 
   /** One of the access flags for fields, methods, or classes.
-   *  @see #ACC_PUBLIC
    */
   public final static short ACC_INTERFACE    = 0x0200;
 
   /** One of the access flags for fields, methods, or classes.
-   *  @see #ACC_PUBLIC
    */
   public final static short ACC_ABSTRACT     = 0x0400;
 
   /** One of the access flags for fields, methods, or classes.
-   *  @see #ACC_PUBLIC
    */
   public final static short ACC_ENUM         = 0x4000;
 
   // Applies to classes compiled by new compilers only
   /** One of the access flags for fields, methods, or classes.
-   *  @see #ACC_PUBLIC
    */
   public final static short ACC_SUPER        = 0x0020;
 
   /** One of the access flags for fields, methods, or classes.
-   *  @see #ACC_PUBLIC
    */
   public final static short MAX_ACC_FLAG     = ACC_ENUM;
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java Tue Aug  3 10:44:58 2010
@@ -49,7 +49,6 @@ public class AnnotationEntry implements 
      * @param file
      * @param constant_pool
      * @param isRuntimeVisible
-     * @return
      * @throws IOException
      */
     public static AnnotationEntry read(DataInputStream file, ConstantPool constant_pool, boolean isRuntimeVisible) throws IOException {

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AttributeReader.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AttributeReader.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AttributeReader.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AttributeReader.java Tue Aug  3 10:44:58 2010
@@ -51,8 +51,6 @@ public interface AttributeReader {
      @return The user-defined AttributeReader should take this data and use
      it to construct an attribute.  In the case of errors, a null can be
      returned which will cause the parsing of the class file to fail.
-
-     @see Attribute#addAttributeReader( String, AttributeReader )
      */
     public Attribute createAttribute( int name_index, int length, java.io.DataInputStream file,
             ConstantPool constant_pool );

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java Tue Aug  3 10:44:58 2010
@@ -89,7 +89,6 @@ public class JavaClass extends AccessFla
      * @param fields Class fields
      * @param methods Class methods
      * @param attributes Class attributes
-     * @param source Read from file or generated in memory?
      */
     public JavaClass(int class_name_index, int superclass_name_index, String file_name, int major,
             int minor, int access_flags, ConstantPool constant_pool, int[] interfaces,

Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java Tue Aug  3 10:44:58 2010
@@ -828,7 +828,7 @@ public final class ByteChunk implements 
      * @param bytes The byte array to search
      * @param start The point to start searching from in the byte array
      * @param end   The point to stop searching in the byte array
-     * @param c     The list of bytes to search for 
+     * @param b     The list of bytes to search for 
      * @return      The position of the first instance a byte that is not
      *                  in the list of bytes to search for or -1 if no such byte
      *                  is found.

Modified: tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileItem.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileItem.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileItem.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileItem.java Tue Aug  3 10:44:58 2010
@@ -28,8 +28,8 @@ import java.io.UnsupportedEncodingExcept
  * <code>multipart/form-data</code> POST request.
  *
  * <p> After retrieving an instance of this class from a {@link
- * org.apache.commons.fileupload.FileUpload FileUpload} instance (see
- * {@link org.apache.commons.fileupload.FileUpload
+ * org.apache.tomcat.util.http.fileupload.FileUpload FileUpload} instance (see
+ * {@link org.apache.tomcat.util.http.fileupload.FileUpload
  * #parseRequest(javax.servlet.http.HttpServletRequest)}), you may
  * either request all contents of the file at once using {@link #get()} or
  * request an {@link java.io.InputStream InputStream} with

Modified: tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUpload.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUpload.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUpload.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUpload.java Tue Aug  3 10:44:58 2010
@@ -23,8 +23,8 @@ package org.apache.tomcat.util.http.file
  * <p>This class handles multiple files per single HTML widget, sent using
  * <code>multipart/mixed</code> encoding type, as specified by
  * <a href="http://www.ietf.org/rfc/rfc1867.txt">RFC 1867</a>.  Use {@link
- * #parseRequest(javax.servlet.http.HttpServletRequest)} to acquire a list
- * of {@link org.apache.commons.fileupload.FileItem FileItems} associated
+ * #parseRequest(RequestContext)} to acquire a list
+ * of {@link org.apache.tomcat.util.http.fileupload.FileItem FileItems} associated
  * with a given HTML widget.</p>
  *
  * <p>How the data for individual parts is stored is determined by the factory

Modified: tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java Tue Aug  3 10:44:58 2010
@@ -41,8 +41,8 @@ import org.apache.tomcat.util.http.fileu
  * <p>This class handles multiple files per single HTML widget, sent using
  * <code>multipart/mixed</code> encoding type, as specified by
  * <a href="http://www.ietf.org/rfc/rfc1867.txt">RFC 1867</a>.  Use {@link
- * #parseRequest(HttpServletRequest)} to acquire a list of {@link
- * org.apache.commons.fileupload.FileItem}s associated with a given HTML
+ * #parseRequest(RequestContext)} to acquire a list of {@link
+ * org.apache.tomcat.util.http.fileupload.FileItem}s associated with a given HTML
  * widget.</p>
  *
  * <p>How the data for individual parts is stored is determined by the factory

Modified: tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ParameterParser.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ParameterParser.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ParameterParser.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ParameterParser.java Tue Aug  3 10:44:58 2010
@@ -265,7 +265,7 @@ public class ParameterParser {
      * Extracts a map of name/value pairs from the given array of
      * characters. Names are expected to be unique.
      *
-     * @param chars the array of characters that contains a sequence of
+     * @param inputChars the array of characters that contains a sequence of
      * name/value pairs
      * @param separator the name/value pairs separator
      *
@@ -282,7 +282,7 @@ public class ParameterParser {
      * Extracts a map of name/value pairs from the given array of
      * characters. Names are expected to be unique.
      *
-     * @param chars the array of characters that contains a sequence of
+     * @param inputChars the array of characters that contains a sequence of
      * name/value pairs
      * @param offset - the initial offset.
      * @param length - the length.

Modified: tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java Tue Aug  3 10:44:58 2010
@@ -38,17 +38,18 @@ import org.apache.tomcat.util.http.fileu
 import org.apache.tomcat.util.http.fileupload.InvalidFileNameException;
 import org.apache.tomcat.util.http.fileupload.IOUtils;
 import org.apache.tomcat.util.http.fileupload.ParameterParser;
+import org.apache.tomcat.util.http.fileupload.RequestContext;
 import org.apache.tomcat.util.http.fileupload.util.Streams;
 
 
 /**
  * <p> The default implementation of the
- * {@link org.apache.commons.fileupload.FileItem FileItem} interface.
+ * {@link org.apache.tomcat.util.http.fileupload.FileItem FileItem} interface.
  *
  * <p> After retrieving an instance of this class from a {@link
- * org.apache.commons.fileupload.DiskFileUpload DiskFileUpload} instance (see
- * {@link org.apache.commons.fileupload.DiskFileUpload
- * #parseRequest(javax.servlet.http.HttpServletRequest)}), you may
+ * org.apache.tomcat.util.http.fileupload.FileUpload FileUpload} instance (see
+ * {@link org.apache.tomcat.util.http.fileupload.FileUpload
+ * #parseRequest(RequestContext)}), you may
  * either request all contents of file at once using {@link #get()} or
  * request an {@link java.io.InputStream InputStream} with
  * {@link #getInputStream()} and process the file without attempting to load
@@ -56,7 +57,8 @@ import org.apache.tomcat.util.http.fileu
  *
  * <p>Temporary files, which are created for file items, should be
  * deleted later on. The best way to do this is using a
- * {@link FileCleaningTracker}, which you can set on the
+ * {@link org.apache.tomcat.util.http.fileupload.FileCleaningTracker
+ * FileCleaningTracker}, which you can set on the
  * {@link DiskFileItemFactory}. However, if you do use such a tracker,
  * then you must consider the following: Temporary files are automatically
  * deleted as soon as they are no longer needed. (More precisely, when the
@@ -382,7 +384,7 @@ public class DiskFileItem
      *
      * @return The contents of the file, as a string.
      *
-     * @todo Consider making this method throw UnsupportedEncodingException.
+     * TODO Consider making this method throw UnsupportedEncodingException.
      */
     public String getString() {
         byte[] rawdata = get();

Modified: tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItemFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItemFactory.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItemFactory.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItemFactory.java Tue Aug  3 10:44:58 2010
@@ -24,9 +24,10 @@ import org.apache.tomcat.util.http.fileu
 
 
 /**
- * <p>The default {@link org.apache.commons.fileupload.FileItemFactory}
+ * <p>The default {@link org.apache.tomcat.util.http.fileupload.FileItemFactory}
  * implementation. This implementation creates
- * {@link org.apache.commons.fileupload.FileItem} instances which keep their
+ * {@link org.apache.tomcat.util.http.fileupload.FileItem} instances which keep
+ * their
  * content either in memory, for smaller items, or in a temporary file on disk,
  * for larger items. The size threshold, above which content will be stored on
  * disk, is configurable, as is the directory in which temporary files will be
@@ -181,7 +182,7 @@ public class DiskFileItemFactory impleme
     // --------------------------------------------------------- Public Methods
 
     /**
-     * Create a new {@link org.apache.tomcat.util.http.fileupload.disk.commons.fileupload.disk.DiskFileItem}
+     * Create a new {@link DiskFileItem}
      * instance from the supplied parameters and the local factory
      * configuration.
      *

Modified: tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/package.html
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/package.html?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/package.html (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/package.html Tue Aug  3 10:44:58 2010
@@ -17,7 +17,9 @@
 <!-- $Id$ -->
 <html>
   <head>
-    <title>Overview of the org.apache.commons.fileupload component</title>
+    <title>
+      Overview of the org.apache.tomcat.util.http.fileupload component
+    </title>
   </head>
   <body>
     <p><b>NOTE:</b> This code has been copied from commons-fileupload 1.2.1 and
@@ -34,14 +36,12 @@
       While this package provides the generic functionality for file uploads,
       these classes are not typically used directly. Instead, normal usage
       involves one of the provided extensions of
-      {@link org.apache.commons.fileupload.FileUpload FileUpload} such as
-      {@link org.apache.commons.fileupload.servlet.ServletFileUpload ServletFileUpload}
-      or
-      {@link org.apache.commons.fileupload.portlet.PortletFileUpload PortletFileUpload},
+      {@link org.apache.tomcat.util.http.fileupload.FileUpload FileUpload} such as
+      {@link org.apache.tomcat.util.http.fileupload.servlet.ServletFileUpload ServletFileUpload}
       together with a factory for 
-      {@link org.apache.commons.fileupload.FileItem FileItem} instances,
+      {@link org.apache.tomcat.util.http.fileupload.FileItem FileItem} instances,
       such as
-      {@link org.apache.commons.fileupload.disk.DiskFileItemFactory DiskFileItemFactory}.
+      {@link org.apache.tomcat.util.http.fileupload.disk.DiskFileItemFactory DiskFileItemFactory}.
     </p>
     <p>
       The following is a brief example of typical usage in a servlet, storing

Modified: tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/servlet/ServletFileUpload.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/servlet/ServletFileUpload.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/servlet/ServletFileUpload.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/servlet/ServletFileUpload.java Tue Aug  3 10:44:58 2010
@@ -36,7 +36,7 @@ import org.apache.tomcat.util.http.fileu
  * <code>multipart/mixed</code> encoding type, as specified by
  * <a href="http://www.ietf.org/rfc/rfc1867.txt">RFC 1867</a>.  Use {@link
  * #parseRequest(HttpServletRequest)} to acquire a list of {@link
- * org.apache.commons.fileupload.FileItem}s associated with a given HTML
+ * org.apache.tomcat.util.http.fileupload.FileItem}s associated with a given HTML
  * widget.</p>
  *
  * <p>How the data for individual parts is stored is determined by the factory

Modified: tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/util/Streams.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/util/Streams.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/util/Streams.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/util/Streams.java Tue Aug  3 10:44:58 2010
@@ -135,7 +135,7 @@ public final class Streams {
 
     /**
      * This convenience method allows to read a
-     * {@link org.apache.commons.fileupload.FileItemStream}'s
+     * {@link org.apache.tomcat.util.http.fileupload.FileItemStream}'s
      * content into a string. The platform's default character encoding
      * is used for converting bytes into characters.
      * @param pStream The input stream to read.
@@ -151,7 +151,7 @@ public final class Streams {
 
     /**
      * This convenience method allows to read a
-     * {@link org.apache.commons.fileupload.FileItemStream}'s
+     * {@link org.apache.tomcat.util.http.fileupload.FileItemStream}'s
      * content into a string, using the given character encoding.
      * @param pStream The input stream to read.
      * @param pEncoding The character encoding, typically "UTF-8".

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioChannel.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioChannel.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioChannel.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioChannel.java Tue Aug  3 10:44:58 2010
@@ -84,7 +84,7 @@ public class NioChannel implements ByteC
      * Closes this channel.
      *
      * @throws IOException If an I/O error occurs
-     * @todo Implement this java.nio.channels.Channel method
+     * TODO Implement this java.nio.channels.Channel method
      */
     public void close() throws IOException {
         getIOChannel().socket().close();
@@ -98,7 +98,7 @@ public class NioChannel implements ByteC
      * Tells whether or not this channel is open.
      *
      * @return <tt>true</tt> if, and only if, this channel is open
-     * @todo Implement this java.nio.channels.Channel method
+     * TODO Implement this java.nio.channels.Channel method
      */
     public boolean isOpen() {
         return sc.isOpen();
@@ -110,7 +110,7 @@ public class NioChannel implements ByteC
      * @param src The buffer from which bytes are to be retrieved
      * @return The number of bytes written, possibly zero
      * @throws IOException If some other I/O error occurs
-     * @todo Implement this java.nio.channels.WritableByteChannel method
+     * TODO Implement this java.nio.channels.WritableByteChannel method
      */
     public int write(ByteBuffer src) throws IOException {
         return sc.write(src);
@@ -122,7 +122,7 @@ public class NioChannel implements ByteC
      * @param dst The buffer into which bytes are to be transferred
      * @return The number of bytes read, possibly zero, or <tt>-1</tt> if the channel has reached end-of-stream
      * @throws IOException If some other I/O error occurs
-     * @todo Implement this java.nio.channels.ReadableByteChannel method
+     * TODO Implement this java.nio.channels.ReadableByteChannel method
      */
     public int read(ByteBuffer dst) throws IOException {
         return sc.read(dst);
@@ -140,7 +140,7 @@ public class NioChannel implements ByteC
      * getBufHandler
      *
      * @return ApplicationBufferHandler
-     * @todo Implement this org.apache.tomcat.util.net.SecureNioChannel method
+     * TODO Implement this org.apache.tomcat.util.net.SecureNioChannel method
      */
     public ApplicationBufferHandler getBufHandler() {
         return bufHandler;
@@ -153,7 +153,7 @@ public class NioChannel implements ByteC
      * getIOChannel
      *
      * @return SocketChannel
-     * @todo Implement this org.apache.tomcat.util.net.SecureNioChannel method
+     * TODO Implement this org.apache.tomcat.util.net.SecureNioChannel method
      */
     public SocketChannel getIOChannel() {
         return sc;
@@ -163,7 +163,7 @@ public class NioChannel implements ByteC
      * isClosing
      *
      * @return boolean
-     * @todo Implement this org.apache.tomcat.util.net.SecureNioChannel method
+     * TODO Implement this org.apache.tomcat.util.net.SecureNioChannel method
      */
     public boolean isClosing() {
         return false;
@@ -173,7 +173,7 @@ public class NioChannel implements ByteC
      * isInitHandshakeComplete
      *
      * @return boolean
-     * @todo Implement this org.apache.tomcat.util.net.SecureNioChannel method
+     * TODO Implement this org.apache.tomcat.util.net.SecureNioChannel method
      */
     public boolean isInitHandshakeComplete() {
         return true;
@@ -202,7 +202,6 @@ public class NioChannel implements ByteC
     
     /**
      * Return true if the buffer wrote data
-     * @return
      * @throws IOException
      */
     public boolean flushOutbound() throws IOException {

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Tue Aug  3 10:44:58 2010
@@ -367,7 +367,6 @@ public class NioEndpoint extends Abstrac
     protected AtomicInteger pollerRotater = new AtomicInteger(0);
     /**
      * Return an available poller in true round robin fashion
-     * @return
      */
     public Poller getPoller0() {
         int idx = Math.abs(pollerRotater.incrementAndGet()) % pollers.length;

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java Tue Aug  3 10:44:58 2010
@@ -289,7 +289,7 @@ public class SecureNioChannel extends Ni
      * </code></pre>
      * @throws IOException if an I/O error occurs
      * @throws IOException if there is data on the outgoing network buffer and we are unable to flush it
-     * @todo Implement this java.io.Closeable method
+     * TODO Implement this java.io.Closeable method
      */
     @Override
     public void close() throws IOException {
@@ -342,7 +342,7 @@ public class SecureNioChannel extends Ni
      * @return The number of bytes read, possibly zero, or <tt>-1</tt> if the channel has reached end-of-stream
      * @throws IOException If some other I/O error occurs
      * @throws IllegalArgumentException if the destination buffer is different than bufHandler.getReadBuffer()
-     * @todo Implement this java.nio.channels.ReadableByteChannel method
+     * TODO Implement this java.nio.channels.ReadableByteChannel method
      */
     @Override
     public int read(ByteBuffer dst) throws IOException {
@@ -397,7 +397,7 @@ public class SecureNioChannel extends Ni
      * @param src The buffer from which bytes are to be retrieved
      * @return The number of bytes written, possibly zero
      * @throws IOException If some other I/O error occurs
-     * @todo Implement this java.nio.channels.WritableByteChannel method
+     * TODO Implement this java.nio.channels.WritableByteChannel method
      */
     @Override
     public int write(ByteBuffer src) throws IOException {

Modified: tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java?rev=981816&r1=981815&r2=981816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java Tue Aug  3 10:44:58 2010
@@ -118,7 +118,7 @@ public class StandardJarScanner implemen
      * @param callback      The handler to process any JARs found
      * @param jarsToSkip    List of JARs to ignore. If this list is null, a
      *                      default list will be read from the system property
-     *                      defined by {@link #SKIP_JARS_PROPERTY} 
+     *                      defined by {@link Constants#SKIP_JARS_PROPERTY} 
      */
     @Override
     public void scan(ServletContext context, ClassLoader classloader,



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message