Author: markt
Date: Mon Oct 13 16:27:15 2014
New Revision: 1631458
URL: http://svn.apache.org/r1631458
Log:
More Java 8 Javadoc error fixes
Modified:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TaglibXml.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TldResourcePath.java
tomcat/trunk/java/org/apache/tomcat/util/digester/CallParamRule.java
tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
tomcat/trunk/java/org/apache/tomcat/util/http/CookieSupport.java
tomcat/trunk/java/org/apache/tomcat/util/http/ServerCookie.java
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
tomcat/trunk/java/org/apache/tomcat/util/net/SocketProperties.java
tomcat/trunk/java/org/apache/tomcat/util/net/URL.java
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TaglibXml.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TaglibXml.java?rev=1631458&r1=1631457&r2=1631458&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TaglibXml.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TaglibXml.java Mon
Oct 13 16:27:15 2014
@@ -23,7 +23,7 @@ import javax.servlet.jsp.tagext.Function
/**
* Common representation of a Tag Library Descriptor (TLD) XML file.
- * <p/>
+ * <p>
* This stores the raw result of parsing an TLD XML file, flattening different
* version of the descriptors to a common format. This is different to a
* TagLibraryInfo instance that would be passed to a tag validator in that it
Modified:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TldResourcePath.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TldResourcePath.java?rev=1631458&r1=1631457&r2=1631458&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TldResourcePath.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TldResourcePath.java
Mon Oct 13 16:27:15 2014
@@ -26,7 +26,7 @@ import org.apache.tomcat.util.scan.JarFa
/**
* A TLD Resource Path as defined in JSP 7.3.2.
- * <p/>
+ * <p>
* This encapsulates references to Tag Library Descriptors that can be located
* in different places:
* <ul>
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/CallParamRule.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/CallParamRule.java?rev=1631458&r1=1631457&r2=1631458&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/digester/CallParamRule.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/CallParamRule.java Mon
Oct 13 16:27:15 2014
@@ -14,28 +14,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package org.apache.tomcat.util.digester;
-
import org.xml.sax.Attributes;
-
/**
* <p>Rule implementation that saves a parameter for use by a surrounding
- * <code>CallMethodRule<code>.</p>
+ * <code>CallMethodRule</code>.</p>
*
- * <p>This parameter may be:
+ * <p>This parameter may be:</p>
* <ul>
* <li>from an attribute of the current element
* See {@link #CallParamRule(int paramIndex, String attributeName)}
* <li>from current the element body
* See {@link #CallParamRule(int paramIndex)}
* </ul>
- * </p>
*/
-
public class CallParamRule extends Rule {
// ----------------------------------------------------------- Constructors
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java?rev=1631458&r1=1631457&r2=1631458&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java Mon Oct 13
16:27:15 2014
@@ -442,7 +442,7 @@ public class Digester extends DefaultHan
/**
* Sets a flag indicating whether the requested feature is supported
* by the underlying implementation of <code>org.xml.sax.XMLReader</code>.
- * See <a
href="http://www.saxproject.org/apidoc/xml/sax/package-summary.html#package-description";
+ * See <a
href="http://www.saxproject.org/apidoc/xml/sax/package-summary.html#package-description";>
*
http://www.saxproject.org/apidoc/xml/sax/package-summary.html#package-description</a>
* for information about the standard SAX2 feature flags. In order to be
* effective, this method must be called <strong>before</strong> the
@@ -616,7 +616,7 @@ public class Digester extends DefaultHan
/**
* Return the current value of the specified property for the underlying
* <code>XMLReader</code> implementation.
- * See <a
href="http://www.saxproject.org/apidoc/xml/sax/package-summary.html#package-description";
+ * See <a
href="http://www.saxproject.org/apidoc/xml/sax/package-summary.html#package-description";>
*
http://www.saxproject.org/apidoc/xml/sax/package-summary.html#package-description</a>
* for information about the standard SAX2 properties.
*
Modified: tomcat/trunk/java/org/apache/tomcat/util/http/CookieSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/CookieSupport.java?rev=1631458&r1=1631457&r2=1631458&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/CookieSupport.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/CookieSupport.java Mon Oct 13
16:27:15 2014
@@ -41,8 +41,8 @@ public final class CookieSupport {
/**
* If true, separators that are not explicitly dis-allowed by the v0 cookie
* spec but are disallowed by the HTTP spec will be allowed in v0 cookie
- * names and values. These characters are: \"()/:<=>?@[\\]{} Note that the
- * inclusion of / depends on the value of {@link #FWD_SLASH_IS_SEPARATOR}.
+ * names and values. These characters are: \"()/:<=>?@[\\]{} Note
that
+ * the inclusion of / depends on the value of {@link
#FWD_SLASH_IS_SEPARATOR}.
*/
public static final boolean ALLOW_HTTP_SEPARATORS_IN_V0;
Modified: tomcat/trunk/java/org/apache/tomcat/util/http/ServerCookie.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/ServerCookie.java?rev=1631458&r1=1631457&r2=1631458&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/ServerCookie.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/ServerCookie.java Mon Oct 13
16:27:15 2014
@@ -24,7 +24,7 @@ import org.apache.tomcat.util.buf.Messag
/**
* Server-side cookie representation.
* Allows recycling and uses MessageBytes as low-level
- * representation ( and thus the byte-> char conversion can be delayed
+ * representation ( and thus the byte -> char conversion can be delayed
* until we know the charset ).
*
* Tomcat.core uses this recyclable object to represent cookies,
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java?rev=1631458&r1=1631457&r2=1631458&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
Mon Oct 13 16:27:15 2014
@@ -49,7 +49,7 @@ import org.apache.tomcat.util.http.fileu
* header-part := 1*header CRLF<br>
* header := header-name ":" header-value<br>
* header-name := <printable ascii characters except ":"><br>
- * header-value := <any ascii characters except CR & LF><br>
+ * header-value := <any ascii characters except CR & LF><br>
* body-data := <arbitrary data><br>
* </code>
*
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=1631458&r1=1631457&r2=1631458&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java Mon
Oct 13 16:27:15 2014
@@ -523,11 +523,7 @@ public class BaseModelMBean implements D
* Set the instance handle of the object against which we will execute
* all methods in this ModelMBean management interface.
*
- * <strike>This method will detect and call "setModelMbean" method. A
resource
- * can implement this method to get a reference to the model mbean.
- * The reference can be used to send notification and access the
- * registry.
- * </strike> The caller can provide the mbean instance or the object name
to
+ * The caller can provide the mbean instance or the object name to
* the resource, if needed.
*
* @param resource The resource object to be managed
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java?rev=1631458&r1=1631457&r2=1631458&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java Mon Oct
13 16:27:15 2014
@@ -413,7 +413,7 @@ public class SecureNio2Channel extends N
* To close the connection, you could do something like
* <pre><code>
* close();
- * while (isOpen() && !myTimeoutFunction()) Thread.sleep(25);
+ * while (isOpen() && !myTimeoutFunction()) Thread.sleep(25);
* if ( isOpen() ) close(true); //forces a close if you timed out
* </code></pre>
* @throws IOException if an I/O error occurs
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=1631458&r1=1631457&r2=1631458&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java Mon Oct
13 16:27:15 2014
@@ -354,7 +354,7 @@ public class SecureNioChannel extends Ni
* To close the connection, you could do something like
* <pre><code>
* close();
- * while (isOpen() && !myTimeoutFunction()) Thread.sleep(25);
+ * while (isOpen() && !myTimeoutFunction()) Thread.sleep(25);
* if ( isOpen() ) close(true); //forces a close if you timed out
* </code></pre>
* @throws IOException if an I/O error occurs
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SocketProperties.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SocketProperties.java?rev=1631458&r1=1631457&r2=1631458&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SocketProperties.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SocketProperties.java Mon Oct
13 16:27:15 2014
@@ -54,7 +54,7 @@ public class SocketProperties {
* Default is 500
* -1 is unlimited
* 0 is disabled
- * >0 the max number of objects to keep in cache.
+ * >0 the max number of objects to keep in cache.
*/
protected int eventCache = 500;
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/URL.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/URL.java?rev=1631458&r1=1631457&r2=1631458&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/URL.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/URL.java Mon Oct 13 16:27:15
2014
@@ -33,10 +33,10 @@ import java.util.Locale;
*
* <p><strong>WARNING</strong> - This class assumes that the string
* representation of a URL conforms to the <code>spec</code> argument
- * as described in RFC 2396 "Uniform Resource Identifiers: Generic Syntax":
+ * as described in RFC 2396 "Uniform Resource Identifiers: Generic Syntax":</p>
* <pre>
*
<scheme>//<authority><path>?<query>#<fragment>
- * </pre></p>
+ * </pre>
*
* <p><strong>FIXME</strong> - This class really ought to end up in a Commons
* package someplace.</p>
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java?rev=1631458&r1=1631457&r2=1631458&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
Mon Oct 13 16:27:15 2014
@@ -71,7 +71,7 @@ import org.apache.tomcat.util.res.String
/**
* SSL server socket factory. It <b>requires</b> a valid RSA key and
* JSSE.<br>
- * keytool -genkey -alias tomcat -keyalg RSA</br>
+ * keytool -genkey -alias tomcat -keyalg RSA<br>
* Use "changeit" as password (this is the default we use).
*
* @author Harish Prabandham
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
