Author: markt
Date: Mon Oct 13 13:19:34 2014
New Revision: 1631384
URL: http://svn.apache.org/r1631384
Log:
Fix Java 8 Javadoc errors in org.apace.catalina.[ant|authenticator]
Modified:
tomcat/trunk/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java
tomcat/trunk/java/org/apache/catalina/ant/JMXQueryTask.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java
tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
tomcat/trunk/java/org/apache/catalina/authenticator/NonLoginAuthenticator.java
tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
Modified:
tomcat/trunk/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java?rev=1631384&r1=1631383&r2=1631384&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java Mon
Oct 13 13:19:34 2014
@@ -75,6 +75,7 @@ public abstract class BaseRedirectorHelp
* This flag does not control parameters checking. If the task is called
* with wrong or invalid parameters, it will throw BuildException
* independently from the setting of this flag.
+ * </b>
*/
protected boolean failOnError = true;
Modified: tomcat/trunk/java/org/apache/catalina/ant/JMXQueryTask.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/JMXQueryTask.java?rev=1631384&r1=1631383&r2=1631384&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/JMXQueryTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/JMXQueryTask.java Mon Oct 13
13:19:34 2014
@@ -53,14 +53,13 @@ public class JMXQueryTask extends Abstra
/**
* Set method for the JMX query string.
- * <P>Examples of query format:
+ * <p>Examples of query format:</p>
* <UL>
* <LI>*:*</LI>
* <LI>*:type=RequestProcessor,*</LI>
* <LI>*:j2eeType=Servlet,*</LI>
* <LI>Catalina:type=Environment,resourcetype=Global,name=simpleValue</LI>
* </UL>
- * </P>
* @param query JMX Query string
*/
public void setQuery (String query) {
Modified:
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java?rev=1631384&r1=1631383&r2=1631384&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java Mon
Oct 13 13:19:34 2014
@@ -22,20 +22,20 @@ import org.apache.tools.ant.BuildExcepti
*
* <b>Definition</b>:
* <pre>
- * <path id="catalina_ant">
- * <fileset dir="${catalina.home}/server/lib">
- * <include name="catalina-ant.jar"/>
- * </fileset>
- * </path>
+ * <path id="catalina_ant">
+ * <fileset dir="${catalina.home}/server/lib">
+ * <include name="catalina-ant.jar"/>
+ * </fileset>
+ * </path>
*
* <typedef
* name="jmxCondition"
* classname="org.apache.catalina.ant.jmx.JMXAccessorCondition"
- * classpathref="catalina_ant"/>
+ * classpathref="catalina_ant"/>
* <taskdef
* name="jmxOpen"
* classname="org.apache.catalina.ant.jmx.JMXAccessorTask"
- * classpathref="catalina_ant"/>
+ * classpathref="catalina_ant"/>
* </pre>
*
* <b>Usage</b>: Wait for start backup node
@@ -170,7 +170,7 @@ public class JMXAccessorCondition extend
/**
* This method evaluates the condition
- * It support for operation ">,>=,<,<=" the types <code>long</code> and
<code>double</code>.
+ * It support for operation ">,>=,<,<=" the types
<code>long</code> and <code>double</code>.
* @return expression <em>jmxValue</em> <em>operation</em> <em>value</em>
*/
@Override
Modified:
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java?rev=1631384&r1=1631383&r2=1631384&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
Mon Oct 13 13:19:34 2014
@@ -35,6 +35,7 @@ import org.apache.tools.ant.BuildExcepti
* Examples:
* <br>
* create a new Mbean at jmx.server connection
+ * </p>
* <pre>
* <jmx:create
* ref="jmx.server"
@@ -44,7 +45,6 @@ import org.apache.tools.ant.BuildExcepti
* <Arg value="org.apache.catalina.mbeans.MBeanFactory" />
* </jmxCreate/>
* </pre>
- * </p>
* <p>
* <b>WARNING</b>Not all Tomcat MBeans can create remotely and autoregister by
its parents!
* Please, use the MBeanFactory operation to generate valves and realms.
Modified:
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java?rev=1631384&r1=1631383&r2=1631384&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java
Mon Oct 13 13:19:34 2014
@@ -22,16 +22,16 @@ import org.apache.tools.ant.BuildExcepti
*
* Definition
* <pre>
- * <path id="catalina_ant">
- * <fileset dir="${catalina.home}/server/lib">
- * <include name="catalina-ant.jar"/>
- * </fileset>
- * </path>
+ * <path id="catalina_ant">
+ * <fileset dir="${catalina.home}/server/lib">
+ * <include name="catalina-ant.jar"/>
+ * </fileset>
+ * </path>
*
* <typedef
* name="jmxEquals"
* classname="org.apache.catalina.ant.jmx.JMXAccessorEqualsCondition"
- * classpathref="catalina_ant"/>
+ * classpathref="catalina_ant"/>
* </pre>
*
* usage: Wait for start backup node
Modified: tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java?rev=1631384&r1=1631383&r2=1631384&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java Mon
Oct 13 13:19:34 2014
@@ -36,6 +36,7 @@ import org.apache.tools.ant.BuildExcepti
* Examples:
* <br>
* Get a Mbean IDataSender attribute nrOfRequests and create a new ant
property <em>IDataSender.9025.nrOfRequests</em>
+ * </p>
* <pre>
* <jmx:get
* ref="jmx.server"
@@ -45,7 +46,6 @@ import org.apache.tools.ant.BuildExcepti
* echo="false">
* />
* </pre>
- * </p>
* <p>
* First call to a remote MBeanserver save the JMXConnection a referenz
<em>jmx.server</em>
* </p>
Modified: tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java?rev=1631384&r1=1631383&r2=1631384&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java Mon
Oct 13 13:19:34 2014
@@ -39,6 +39,7 @@ import org.apache.tools.ant.BuildExcepti
* Examples:
* Set a Mbean Manager attribute maxActiveSessions.
* Set this attribute with fresh jmx connection without save reference
+ * </p>
* <pre>
* <jmx:set
* host="127.0.0.1"
@@ -51,7 +52,6 @@ import org.apache.tools.ant.BuildExcepti
* echo="false">
* />
* </pre>
- * </p>
* <p>
* First call to a remote MBeanserver save the JMXConnection a referenz
<em>jmx.server</em>
* </p>
Modified:
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java?rev=1631384&r1=1631383&r2=1631384&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java
Mon Oct 13 13:19:34 2014
@@ -30,12 +30,12 @@ import org.apache.tools.ant.BuildExcepti
* Examples:
* <br>
* unregister an existing Mbean at jmx.server connection
+ * </p>
* <pre>
* <jmx:unregister
* ref="jmx.server"
* name="Catalina:type=MBeanFactory" />
* </pre>
- * </p>
* <p>
* <b>WARNING</b>Not all Tomcat MBeans can successfully unregister remotely.
The mbean
* unregistration don't remove valves, realm, .. from parent class.
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java?rev=1631384&r1=1631383&r2=1631384&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
Mon Oct 13 13:19:34 2014
@@ -351,7 +351,7 @@ public class DigestAuthenticator extends
*
* realm = "realm" "=" realm-value
* realm-value = quoted-string
- * domain = "domain" "=" <"> 1#URI <">
+ * domain = "domain" "=" <"> 1#URI <">
* nonce = "nonce" "=" nonce-value
* nonce-value = quoted-string
* opaque = "opaque" "=" quoted-string
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/NonLoginAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/NonLoginAuthenticator.java?rev=1631384&r1=1631383&r2=1631384&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/authenticator/NonLoginAuthenticator.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/authenticator/NonLoginAuthenticator.java
Mon Oct 13 13:19:34 2014
@@ -50,7 +50,7 @@ public final class NonLoginAuthenticator
* Therefore, it is necessary to always return <code>true</code> to
* indicate the user has not failed authentication.</p>
*
- * <p>There are two cases:
+ * <p>There are two cases:</p>
* <ul>
* <li>without SingleSignon: a Session instance does not yet exist
* and there is no <code>auth-method</code> to authenticate the
@@ -68,7 +68,7 @@ public final class NonLoginAuthenticator
* keep the SSOE "alive", even if all the other properly
* authenticated Sessions expire first... until it expires too.
* </li>
- * </ul></p>
+ * </ul>
*
* @param request Request we are processing
* @param response Response we are creating
Modified: tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java?rev=1631384&r1=1631383&r2=1631384&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java Mon
Oct 13 13:19:34 2014
@@ -120,7 +120,7 @@ public class SingleSignOn extends ValveB
* Authenticator downstream in the pipeline) to the security
* <code>Realm</code>, or if this Valve can itself bind security info
* to the request based on the presence of a valid SSO entry without
- * rechecking with the <code>Realm</code..
+ * rechecking with the <code>Realm</code>.
*
* @return <code>true</code> if it is required that a downstream
* Authenticator reauthenticate each request before calls to
@@ -143,7 +143,7 @@ public class SingleSignOn extends ValveB
* Authenticator downstream in the pipeline) to the security
* <code>Realm</code>, or if this Valve can itself bind security info
* to the request, based on the presence of a valid SSO entry, without
- * rechecking with the <code>Realm</code.
+ * rechecking with the <code>Realm</code>.
* <p>
* If this property is <code>false</code> (the default), this
* <code>Valve</code> will bind a UserPrincipal and AuthType to the request
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
