You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by cs...@apache.org on 2017/07/14 19:39:00 UTC
svn commit: r1801981 - in /tomcat/tc7.0.x/trunk:
java/javax/servlet/annotation/ java/org/apache/catalina/ant/jmx/
java/org/apache/catalina/comet/ java/org/apache/catalina/core/
java/org/apache/catalina/servlets/ java/org/apache/catalina/tribes/io/
java...
Author: csutherl
Date: Fri Jul 14 19:38:59 2017
New Revision: 1801981
URL: http://svn.apache.org/viewvc?rev=1801981&view=rev
Log:
Porting r1631157 to tomcat7: Some Javadoc fixes for Java 8 <br/> -> <br>
Modified:
tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/HttpConstraint.java
tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/HttpMethodConstraint.java
tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/MultipartConfig.java
tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/ServletSecurity.java
tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/WebFilter.java
tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/WebInitParam.java
tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/WebListener.java
tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/WebServlet.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/comet/CometEvent.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardEngine.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/Membership.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSource.java
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/MultiLockFairBlockingQueue.java
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
Modified: tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/HttpConstraint.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/HttpConstraint.java?rev=1801981&r1=1801980&r2=1801981&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/HttpConstraint.java (original)
+++ tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/HttpConstraint.java Fri Jul 14 19:38:59 2017
@@ -58,7 +58,7 @@ public @interface HttpConstraint {
* @return array of names. The array may be of zero length, in which case
* the EmptyRoleSemantic applies; the returned value determines
* whether access is to be permitted or denied regardless of the
- * identity and authentication state in either case, PERMIT or DENY.<br />
+ * identity and authentication state in either case, PERMIT or DENY.<br>
* Otherwise, when the array contains one or more role names access
* is permitted if the user a member of at least one of the named
* roles. The EmptyRoleSemantic is not applied in this case.
Modified: tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/HttpMethodConstraint.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/HttpMethodConstraint.java?rev=1801981&r1=1801980&r2=1801981&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/HttpMethodConstraint.java (original)
+++ tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/HttpMethodConstraint.java Fri Jul 14 19:38:59 2017
@@ -65,7 +65,7 @@ public @interface HttpMethodConstraint {
* @return array of names. The array may be of zero length, in which case
* the EmptyRoleSemantic applies; the returned value determines
* whether access is to be permitted or denied regardless of the
- * identity and authentication state in either case, PERMIT or DENY.<br />
+ * identity and authentication state in either case, PERMIT or DENY.<br>
* Otherwise, when the array contains one or more role names access
* is permitted if the user a member of at least one of the named
* roles. The EmptyRoleSemantic is not applied in this case.
Modified: tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/MultipartConfig.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/MultipartConfig.java?rev=1801981&r1=1801980&r2=1801981&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/MultipartConfig.java (original)
+++ tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/MultipartConfig.java Fri Jul 14 19:38:59 2017
@@ -24,20 +24,20 @@ import java.lang.annotation.Target;
/**
* This annotation is used to indicate that the {@link javax.servlet.Servlet} on
* which it is declared expects requests to made using the {@code
- * multipart/form-data} MIME type. <br />
- * <br />
+ * multipart/form-data} MIME type. <br>
+ * <br>
*
* {@link javax.servlet.http.Part} components of a given {@code
* multipart/form-data} request are retrieved by a Servlet annotated with
* {@code MultipartConfig} by calling
* {@link javax.servlet.http.HttpServletRequest#getPart} or
- * {@link javax.servlet.http.HttpServletRequest#getParts}.<br />
- * <br />
+ * {@link javax.servlet.http.HttpServletRequest#getParts}.<br>
+ * <br>
*
- * E.g. <code>@WebServlet("/upload")}</code><br />
+ * E.g. <code>@WebServlet("/upload")}</code><br>
*
* <code>@MultipartConfig()</code> <code>public class UploadServlet extends
- * HttpServlet ... } </code><br />
+ * HttpServlet ... } </code><br>
*
* @since Servlet 3.0
*/
Modified: tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/ServletSecurity.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/ServletSecurity.java?rev=1801981&r1=1801980&r2=1801981&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/ServletSecurity.java (original)
+++ tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/ServletSecurity.java Fri Jul 14 19:38:59 2017
@@ -25,10 +25,10 @@ import java.lang.annotation.Target;
/**
* Declare this annotation on a {@link javax.servlet.Servlet} implementation
- * class to enforce security constraints on HTTP protocol requests.<br />
+ * class to enforce security constraints on HTTP protocol requests.<br>
* The container applies constraints to the URL patterns mapped to each Servlet
- * which declares this annotation.<br />
- * <br />
+ * which declares this annotation.<br>
+ * <br>
*
* @since Servlet 3.0
*/
Modified: tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/WebFilter.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/WebFilter.java?rev=1801981&r1=1801980&r2=1801981&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/WebFilter.java (original)
+++ tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/WebFilter.java Fri Jul 14 19:38:59 2017
@@ -25,34 +25,34 @@ import java.lang.annotation.Target;
import javax.servlet.DispatcherType;
/**
- * The annotation used to declare a Servlet {@link javax.servlet.Filter}. <br />
- * <br />
+ * The annotation used to declare a Servlet {@link javax.servlet.Filter}. <br>
+ * <br>
*
* This annotation will be processed by the container during deployment, the
* Filter class in which it is found will be created as per the configuration
* and applied to the URL patterns, {@link javax.servlet.Servlet}s and
- * {@link javax.servlet.DispatcherType}s.<br />
- * <br/>
+ * {@link javax.servlet.DispatcherType}s.<br>
+ * <br>
*
* If the name attribute is not defined, the fully qualified name of the class
- * is used.<br/>
- * <br/>
+ * is used.<br>
+ * <br>
*
* At least one URL pattern MUST be declared in either the {@code value} or
- * {@code urlPattern} attribute of the annotation, but not both.<br/>
- * <br/>
+ * {@code urlPattern} attribute of the annotation, but not both.<br>
+ * <br>
*
* The {@code value} attribute is recommended for use when the URL pattern is
* the only attribute being set, otherwise the {@code urlPattern} attribute
- * should be used.<br />
- * <br />
+ * should be used.<br>
+ * <br>
*
* The annotated class MUST implement {@link javax.servlet.Filter}.
*
* E.g.
*
- * <code>@WebFilter("/path/*")</code><br />
- * <code>public class AnExampleFilter implements Filter { ... </code><br />
+ * <code>@WebFilter("/path/*")</code><br>
+ * <code>public class AnExampleFilter implements Filter { ... </code><br>
*
* @since Servlet 3.0 (Section 8.1.2)
*
Modified: tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/WebInitParam.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/WebInitParam.java?rev=1801981&r1=1801980&r2=1801981&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/WebInitParam.java (original)
+++ tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/WebInitParam.java Fri Jul 14 19:38:59 2017
@@ -26,12 +26,12 @@ import java.lang.annotation.Target;
* The annotation used to declare an initialization parameter on a
* {@link javax.servlet.Servlet} or {@link javax.servlet.Filter}, within a
* {@link javax.servlet.annotation.WebFilter} or
- * {@link javax.servlet.annotation.WebServlet} annotation.<br />
- * <br />
+ * {@link javax.servlet.annotation.WebServlet} annotation.<br>
+ * <br>
*
* E.g.
* <code>&#064;WebServlet(name="TestServlet", urlPatterns={"/test"},initParams={&#064;WebInitParam(name="test", value="true")})
- * public class TestServlet extends HttpServlet { ... </code><br />
+ * public class TestServlet extends HttpServlet { ... </code><br>
*
* @since Servlet 3.0
*/
Modified: tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/WebListener.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/WebListener.java?rev=1801981&r1=1801980&r2=1801981&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/WebListener.java (original)
+++ tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/WebListener.java Fri Jul 14 19:38:59 2017
@@ -24,8 +24,8 @@ import java.lang.annotation.Target;
/**
* The annotation used to declare a listener for various types of event, in a
- * given web application context.<br />
- * <br />
+ * given web application context.<br>
+ * <br>
*
* The class annotated MUST implement one, (or more), of the following
* interfaces: {@link javax.servlet.http.HttpSessionAttributeListener},
@@ -33,11 +33,11 @@ import java.lang.annotation.Target;
* {@link javax.servlet.ServletContextAttributeListener},
* {@link javax.servlet.ServletContextListener},
* {@link javax.servlet.ServletRequestAttributeListener},
- * {@link javax.servlet.ServletRequestListener} <br />
- * <br />
+ * {@link javax.servlet.ServletRequestListener} <br>
+ * <br>
*
- * E.g. <code>@WebListener</code><br />
- * <code>public TestListener implements ServletContextListener {</code><br />
+ * E.g. <code>@WebListener</code><br>
+ * <code>public TestListener implements ServletContextListener {</code><br>
*
* @since Servlet 3.0
*/
Modified: tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/WebServlet.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/WebServlet.java?rev=1801981&r1=1801980&r2=1801981&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/WebServlet.java (original)
+++ tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/WebServlet.java Fri Jul 14 19:38:59 2017
@@ -24,31 +24,31 @@ import java.lang.annotation.Target;
/**
* This annotation is used to declare the configuration of an
- * {@link javax.servlet.Servlet}. <br/>
+ * {@link javax.servlet.Servlet}. <br>
*
* If the name attribute is not defined, the fully qualified name of the class
- * is used.<br/>
- * <br/>
+ * is used.<br>
+ * <br>
*
* At least one URL pattern MUST be declared in either the {@code value} or
- * {@code urlPattern} attribute of the annotation, but not both.<br/>
- * <br/>
+ * {@code urlPattern} attribute of the annotation, but not both.<br>
+ * <br>
*
* The {@code value} attribute is recommended for use when the URL pattern is
* the only attribute being set, otherwise the {@code urlPattern} attribute
- * should be used.<br />
- * <br />
+ * should be used.<br>
+ * <br>
*
* The class on which this annotation is declared MUST extend
- * {@link javax.servlet.http.HttpServlet}. <br />
- * <br />
+ * {@link javax.servlet.http.HttpServlet}. <br>
+ * <br>
*
- * E.g. <code>@WebServlet("/path")}<br />
- * public class TestServlet extends HttpServlet ... {</code><br />
+ * E.g. <code>@WebServlet("/path")}<br>
+ * public class TestServlet extends HttpServlet ... {</code><br>
*
* E.g.
- * <code>@WebServlet(name="TestServlet", urlPatterns={"/path", "/alt"}) <br />
- * public class TestServlet extends HttpServlet ... {</code><br />
+ * <code>@WebServlet(name="TestServlet", urlPatterns={"/path", "/alt"}) <br>
+ * public class TestServlet extends HttpServlet ... {</code><br>
*
* @since Servlet 3.0 (Section 8.1.1)
*
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java?rev=1801981&r1=1801980&r2=1801981&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java Fri Jul 14 19:38:59 2017
@@ -39,7 +39,7 @@ import org.apache.tools.ant.BuildExcepti
* <li>Show query result as Ant console log</li>
* <li>Bind query result as Ant properties</li>
* </ul>
- * <br/>
+ * <br>
* Query a list of Mbeans.
* <pre>
* <jmxQuery
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java?rev=1801981&r1=1801980&r2=1801981&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java Fri Jul 14 19:38:59 2017
@@ -81,7 +81,7 @@ import org.apache.tools.ant.Project;
* </p>
* All JMXAccessorXXXTask support the attribute <em>if</em> and
* <em>unless</em>. With <em>if</em> the task is only execute when property
- * exist and with <em>unless</em> when property not exists. <br/><b>NOTE
+ * exist and with <em>unless</em> when property not exists. <br><b>NOTE
* </b>: These tasks require Ant 1.6 or later interface.
*
* @author Peter Rossbach
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/comet/CometEvent.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/comet/CometEvent.java?rev=1801981&r1=1801980&r2=1801981&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/comet/CometEvent.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/comet/CometEvent.java Fri Jul 14 19:38:59 2017
@@ -124,13 +124,13 @@ public interface CometEvent {
/**
* Sets the timeout for this Comet connection. Please NOTE, that the implementation
- * of a per connection timeout is OPTIONAL and MAY NOT be implemented.<br/>
+ * of a per connection timeout is OPTIONAL and MAY NOT be implemented.<br>
* This method sets the timeout in milliseconds of idle time on the connection.
* The timeout is reset every time data is received from the connection or data is flushed
* using <code>response.flushBuffer()</code>. If a timeout occurs, the
* <code>error(HttpServletRequest, HttpServletResponse)</code> method is invoked. The
* web application SHOULD NOT attempt to reuse the request and response objects after a timeout
- * as the <code>error(HttpServletRequest, HttpServletResponse)</code> method indicates.<br/>
+ * as the <code>error(HttpServletRequest, HttpServletResponse)</code> method indicates.<br>
* This method should not be called asynchronously, as that will have no effect.
*
* @param timeout The timeout in milliseconds for this connection, must be a positive value, larger than 0
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardEngine.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardEngine.java?rev=1801981&r1=1801980&r2=1801981&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardEngine.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardEngine.java Fri Jul 14 19:38:59 2017
@@ -45,7 +45,7 @@ import org.apache.juli.logging.LogFactor
/**
* Standard implementation of the <b>Engine</b> interface. Each
* child container must be a Host implementation to process the specific
- * fully qualified host name of that virtual host. <br/>
+ * fully qualified host name of that virtual host. <br>
* You can set the jvmRoute direct or with the System.property <b>jvmRoute</b>.
*
* @author Craig R. McClanahan
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1801981&r1=1801980&r2=1801981&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Fri Jul 14 19:38:59 2017
@@ -103,7 +103,7 @@ import org.xml.sax.ext.EntityResolver2;
* <p>It can be mapped to sub-paths, however in all cases resources are served
* from the web appplication resource root using the full path from the root
* of the web application context.
- * <br/>e.g. given a web application structure:
+ * <br>e.g. given a web application structure:
*</p>
* <pre>
* /context
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java?rev=1801981&r1=1801980&r2=1801981&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java Fri Jul 14 19:38:59 2017
@@ -34,7 +34,7 @@ import java.util.concurrent.atomic.Atomi
* as they come in on a socket.
* <br>
* <b>THIS CLASS IS NOT THREAD SAFE</B><BR>
- * <br/>
+ * <br>
* Transfer package:
* <ul>
* <li><b>START_DATA/b> - 7 bytes - <i>FLT2002</i></li>
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java?rev=1801981&r1=1801980&r2=1801981&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java Fri Jul 14 19:38:59 2017
@@ -110,7 +110,7 @@ public class McastService implements Mem
/**
*
* @param properties
- * <BR/>All are required<BR />
+ * <br>All are required<br>
* 1. mcastPort - the port to listen to<BR>
* 2. mcastAddress - the mcast group address<BR>
* 4. bindAddress - the bind address if any - only one that can be null<BR>
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/Membership.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/Membership.java?rev=1801981&r1=1801980&r2=1801981&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/Membership.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/Membership.java Fri Jul 14 19:38:59 2017
@@ -112,7 +112,7 @@ public class Membership implements Clone
* Notify the membership that this member has announced itself.
*
* @param member - the member that just pinged us
- * @return - true if this member is new to the cluster, false otherwise.<br/>
+ * @return - true if this member is new to the cluster, false otherwise.<br>
* - false if this member is the local member or updated.
*/
public synchronized boolean memberAlive(MemberImpl member) {
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java?rev=1801981&r1=1801980&r2=1801981&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java Fri Jul 14 19:38:59 2017
@@ -29,8 +29,8 @@ import org.apache.juli.logging.LogFactor
/**
* A smart implementation of a stateful replicated map. uses primary/secondary backup strategy.
* One node is always the primary and one node is always the backup.
- * This map is synchronized across a cluster, and only has one backup member.<br/>
- * A perfect usage for this map would be a session map for a session manager in a clustered environment.<br/>
+ * This map is synchronized across a cluster, and only has one backup member.<br>
+ * A perfect usage for this map would be a session map for a session manager in a clustered environment.<br>
* The only way to modify this list is to use the <code>put, putAll, remove</code> methods.
* entrySet, entrySetFull, keySet, keySetFull, returns all non modifiable sets.<br><br>
* If objects (values) in the map change without invoking <code>put()</code> or <code>remove()</code>
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java?rev=1801981&r1=1801980&r2=1801981&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java Fri Jul 14 19:38:59 2017
@@ -26,7 +26,7 @@ import org.apache.catalina.tribes.group.
/**
- * A fast queue that remover thread lock the adder thread. <br/>Limit the queue
+ * A fast queue that remover thread lock the adder thread. <br>Limit the queue
* length when you have strange producer thread problems.
*
* FIXME add i18n support to log messages
Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java?rev=1801981&r1=1801980&r2=1801981&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java Fri Jul 14 19:38:59 2017
@@ -323,8 +323,8 @@ public class ChunkedInputFilter implemen
/**
* Parse the header of a chunk.
- * A chunk header can look like one of the following:<br />
- * A10CRLF<br />
+ * A chunk header can look like one of the following:<br>
+ * A10CRLF<br>
* F23;chunk-extension to be ignoredCRLF
*
* <p>
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java?rev=1801981&r1=1801980&r2=1801981&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java Fri Jul 14 19:38:59 2017
@@ -824,7 +824,7 @@ public final class ByteChunk implements
* Returns the first instance of the given character in this ByteChunk
* starting at the specified byte. If the character is not found, -1 is
* returned.
- * <br/>
+ * <br>
* NOTE: This only works for characters in the range 0-127.
*
* @param c The character
@@ -840,7 +840,7 @@ public final class ByteChunk implements
/**
* Returns the first instance of the given character in the given byte array
* between the specified start and end.
- * <br/>
+ * <br>
* NOTE: This only works for characters in the range 0-127.
*
* @param bytes The byte array to search
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java?rev=1801981&r1=1801980&r2=1801981&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java Fri Jul 14 19:38:59 2017
@@ -70,7 +70,7 @@ import org.apache.tomcat.util.res.String
/**
* SSL server socket factory. It <b>requires</b> a valid RSA key and
- * JSSE.<br/>
+ * JSSE.<br>
* keytool -genkey -alias tomcat -keyalg RSA</br>
* Use "changeit" as password (this is the default we use).
*
Modified: tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSource.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSource.java?rev=1801981&r1=1801980&r2=1801981&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSource.java (original)
+++ tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSource.java Fri Jul 14 19:38:59 2017
@@ -64,7 +64,7 @@ public class DataSource extends DataSour
protected volatile ObjectName oname = null;
/**
- * Unregisters the underlying connection pool mbean.<br/>
+ * Unregisters the underlying connection pool mbean.<br>
* {@inheritDoc}
*/
@Override
@@ -73,7 +73,7 @@ public class DataSource extends DataSour
}
/**
- * no-op<br/>
+ * no-op<br>
* {@inheritDoc}
*/
@Override
@@ -83,7 +83,7 @@ public class DataSource extends DataSour
/**
- * no-op<br/>
+ * no-op<br>
* {@inheritDoc}
*/
@Override
@@ -92,7 +92,7 @@ public class DataSource extends DataSour
}
/**
- * If the connection pool MBean exists, it will be registered during this operation.<br/>
+ * If the connection pool MBean exists, it will be registered during this operation.<br>
* {@inheritDoc}
*/
@Override
Modified: tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java?rev=1801981&r1=1801980&r2=1801981&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java (original)
+++ tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java Fri Jul 14 19:38:59 2017
@@ -40,9 +40,9 @@ import org.apache.juli.logging.LogFactor
* <code>RefAddr</code> values of the specified <code>Reference</code>,
* which must match the names and data types of the
* <code>BasicDataSource</code> bean properties.</p>
- * <br/>
- * Properties available for configuration:<br/>
- * <a href="http://commons.apache.org/dbcp/configuration.html">Commons DBCP properties</a><br/>
+ * <br>
+ * Properties available for configuration:<br>
+ * <a href="http://commons.apache.org/dbcp/configuration.html">Commons DBCP properties</a><br>
*<ol>
* <li>initSQL - A query that gets executed once, right after the connection is established.</li>
* <li>testOnConnect - run validationQuery after connection has been established.</li>
Modified: tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java?rev=1801981&r1=1801980&r2=1801981&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java (original)
+++ tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java Fri Jul 14 19:38:59 2017
@@ -35,7 +35,7 @@ import org.apache.tomcat.jdbc.pool.PoolP
*
* The DataSource proxy lets us implements methods that don't exist in the current
* compiler JDK but might be methods that are part of a future JDK DataSource interface.
- * <br/>
+ * <br>
* It's a trick to work around compiler issues when implementing interfaces. For example,
* I could put in Java 6 methods of javax.sql.DataSource here, and compile it with JDK 1.5
* and still be able to run under Java 6 without getting NoSuchMethodException.
Modified: tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java?rev=1801981&r1=1801980&r2=1801981&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java (original)
+++ tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java Fri Jul 14 19:38:59 2017
@@ -34,7 +34,7 @@ import java.util.concurrent.locks.Reentr
* invocations to method poll(...) will get handed out in the order they were received.
* Locking is fine grained, a shared lock is only used during the first level of contention, waiting is done in a
* lock per thread basis so that order is guaranteed once the thread goes into a suspended monitor state.
- * <br/>
+ * <br>
* Not all of the methods of the {@link java.util.concurrent.BlockingQueue} are implemented.
* @author Filip Hanik
*
Modified: tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java?rev=1801981&r1=1801980&r2=1801981&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java (original)
+++ tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java Fri Jul 14 19:38:59 2017
@@ -26,7 +26,7 @@ import org.apache.tomcat.jdbc.pool.PoolP
* Abstract class that is to be extended for implementations of interceptors.
* Everytime an operation is called on the {@link java.sql.Connection} object the
* {@link #invoke(Object, Method, Object[])} method on the interceptor will be called.
- * Interceptors are useful to change or improve behavior of the connection pool.<br/>
+ * Interceptors are useful to change or improve behavior of the connection pool.<br>
* Interceptors can receive a set of properties. Each sub class is responsible for parsing the properties during runtime when they
* are needed or simply override the {@link #setProperties(Map)} method.
* Properties arrive in a key-value pair of Strings as they were received through the configuration.
@@ -156,7 +156,7 @@ public abstract class JdbcInterceptor im
* Gets called each time the connection is borrowed from the pool
* This means that if an interceptor holds a reference to the connection
* the interceptor can be reused for another connection.
- * <br/>
+ * <br>
* This method may be called with null as both arguments when we are closing down the connection.
* @param parent - the connection pool owning the connection
* @param con - the pooled connection
Modified: tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/MultiLockFairBlockingQueue.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/MultiLockFairBlockingQueue.java?rev=1801981&r1=1801980&r2=1801981&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/MultiLockFairBlockingQueue.java (original)
+++ tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/MultiLockFairBlockingQueue.java Fri Jul 14 19:38:59 2017
@@ -38,7 +38,7 @@ import java.util.concurrent.locks.Reentr
* invocations to method poll(...) will get handed out in the order they were received.
* Locking is fine grained, a shared lock is only used during the first level of contention, waiting is done in a
* lock per thread basis so that order is guaranteed once the thread goes into a suspended monitor state.
- * <br/>
+ * <br>
* Not all of the methods of the {@link java.util.concurrent.BlockingQueue} are implemented.
* @author Filip Hanik
*
Modified: tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java?rev=1801981&r1=1801980&r2=1801981&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java (original)
+++ tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java Fri Jul 14 19:38:59 2017
@@ -87,7 +87,7 @@ public interface PoolConfiguration {
/**
* The connection properties that will be sent to the JDBC driver when establishing new connections.
- * Format of the string is [propertyName=property;] <br/>
+ * Format of the string is [propertyName=property;] <br>
* NOTE - The "user" and "password" properties will be passed explicitly, so they do not need to be included here.
* The default value is null.
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org