date:20170714

svn propchange: r1801987 - svn:log

2017-07-14 Thread csutherl

Author: csutherl
Revision: 1801987
Modified property: svn:log

Modified: svn:log at Fri Jul 14 20:16:20 2017
--
--- svn:log (original)
+++ svn:log Fri Jul 14 20:16:20 2017
@@ -1 +1 @@
-Porting r1631350 to tomcat7: Use UTF-8 to fix ASCII art in Javadoc. How ironic.
+Porting r1631406 to tomcat7: Use UTF-8 to fix ASCII art in Javadoc. How ironic.


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

svn commit: r1801987 - in /tomcat/tc7.0.x/trunk/java/org/apache: catalina/Lifecycle.java coyote/AsyncStateMachine.java

2017-07-14 Thread csutherl

Author: csutherl
Date: Fri Jul 14 20:14:50 2017
New Revision: 1801987

URL: http://svn.apache.org/viewvc?rev=1801987&view=rev
Log:
Porting r1631350 to tomcat7: Use UTF-8 to fix ASCII art in Javadoc. How ironic.

Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/Lifecycle.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/AsyncStateMachine.java

Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/Lifecycle.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/Lifecycle.java?rev=1801987&r1=1801986&r2=1801987&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/Lifecycle.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/Lifecycle.java Fri Jul 14 
20:14:50 2017
@@ -30,30 +30,30 @@ package org.apache.catalina;
  *  -
  *  |   |
  *  | init()|
- * NEW ->-- INITIALIZING|
- * | |   |  | 
--<---
+ * NEW -Â»-- INITIALIZING|
+ * | |   |  | 
--Â«---
  * | |   |auto  | |
|
  * | |  \|/start() \|/   \|/ auto  auto stop() 
|
- * | |  INITIALIZED -->-- STARTING_PREP -->- STARTING -->- STARTED -->---  
|
+ * | |  INITIALIZED --Â»-- STARTING_PREP --Â»- STARTING --Â»- STARTED 
--Â»---  |
  * | | ||  
|
  * | |destroy()||  
|
- * | -->-<--<  
^
+ * | --Â»-Â«--
Â«  ^
  * | |  |  
|
  * | | \|/  auto auto  start() 
|
- * | | STOPPING_PREP > STOPPING -->- STOPPED 
->-
+ * | | STOPPING_PREP Â» STOPPING --Â»- STOPPED 
-Â»-
  * |\|/   ^ |  ^
  * | |   stop()   | |  |
  * | |   -- |  |
  * | |   |  |  |
  * | |   |destroy()   destroy() |  |
- * | |FAILED >-- DESTROYING ---<-  |
+ * | |FAILED Â»-- DESTROYING ---Â«-  |
  * | |^ |  |
  * | | destroy()  | |auto  |
- * | >-\|/ |
+ * | Â»-\|/ |
  * | DESTROYED |
  * |   |
  * |stop() |
- * --->-->--
+ * ---Â»--Â»--
  *
  * Any state can transition to FAILED.
  *

Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/AsyncStateMachine.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/AsyncStateMachine.java?rev=1801987&r1=1801986&r2=1801987&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/AsyncStateMachine.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/AsyncStateMachine.java Fri Jul 
14 20:14:50 2017
@@ -74,35 +74,35 @@ import org.apache.tomcat.util.security.P
  *is called.
  * ERROR- Something went wrong.
  *
- * |->--|  
|--Â«MUST_ERROR---Â«|
+ * |-Â»--|  
|--Â«MUST_ERROR---Â«|
  * |   \|/\|/  
  |
- * |   |--<-E R R O 
R<-<---| |
- * |   |  complete() /|\/|\\ \--<-<-|  
| ^
+ * |   |--Â«-E R R O 
R<-Â«---| |
+ * |   |  complete() /|\/|\\ 
\--Â«-Â«-|  | ^
  * |   |  |  |  \   |  
| |
- * |   ||->---|  |   \--->--|   |  
| |
+ * |   ||-Â»---|  |   \---Â»--|   
|  | |
  *

svn commit: r1801983 - in /tomcat/tc7.0.x/trunk/java/javax/servlet/jsp: JspApplicationContext.java JspContext.java el/ExpressionEvaluator.java tagext/BodyTag.java tagext/IterationTag.java tagext/Tag.j

2017-07-14 Thread csutherl

Author: csutherl
Date: Fri Jul 14 19:58:10 2017
New Revision: 1801983

URL: http://svn.apache.org/viewvc?rev=1801983&view=rev
Log:
Porting r1631350 to tomcat7: Fix Java8 Javadoc errors in the javax.servlet.jsp 
package

Modified:
tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/JspApplicationContext.java
tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/JspContext.java
tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/el/ExpressionEvaluator.java
tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/tagext/BodyTag.java
tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/tagext/IterationTag.java
tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/tagext/Tag.java
tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/tagext/TagData.java
tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/tagext/VariableInfo.java

Modified: tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/JspApplicationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/JspApplicationContext.java?rev=1801983&r1=1801982&r2=1801983&view=diff
==
--- tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/JspApplicationContext.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/JspApplicationContext.java Fri 
Jul 14 19:58:10 2017
@@ -48,6 +48,7 @@ public interface JspApplicationContext {
  * 
  * 
  * JSP has a default set of ELResolvers to chain for all EL evaluation:
+ * 
  * 
  * ImplicitObjectELResolver
  * ELResolver instances registered with this method
@@ -57,7 +58,6 @@ public interface JspApplicationContext {
  * BeanELResolver
  * ScopedAttributeELResolver
  * 
- * 
  * 
  * @param resolver
  *an additional resolver

Modified: tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/JspContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/JspContext.java?rev=1801983&r1=1801982&r2=1801983&view=diff
==
--- tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/JspContext.java (original)
+++ tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/JspContext.java Fri Jul 14 
19:58:10 2017
@@ -252,13 +252,13 @@ public abstract class JspContext {
  * page scope attribute namespace of the JspContext.
  * The returned JspWriter must implement all methods and
  * behave as though it were unbuffered.  More specifically:
+ * 
  * 
  *   clear() must throw an IOException
  *   clearBuffer() does nothing
  *   getBufferSize() always returns 0
  *   getRemaining() always returns 0
  * 
- * 
  *
  * @param writer The Writer for the returned JspWriter to send
  * output to.

Modified: 
tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/el/ExpressionEvaluator.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/el/ExpressionEvaluator.java?rev=1801983&r1=1801982&r2=1801983&view=diff
==
--- tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/el/ExpressionEvaluator.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/el/ExpressionEvaluator.java Fri 
Jul 14 19:58:10 2017
@@ -44,12 +44,12 @@ package javax.servlet.jsp.el;
  * 
  * 
  * The following are examples of syntactically legal EL expressions:
+ * 
  * 
  * ${person.lastName}
  * ${8 * 8}
  * ${my:reverse('hello')}
  * 
- * 
  * 
  * @since 2.0
  * @deprecated As of JSP 2.1, replaced by javax.el.ExpressionFactory

Modified: tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/tagext/BodyTag.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/tagext/BodyTag.java?rev=1801983&r1=1801982&r2=1801983&view=diff
==
--- tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/tagext/BodyTag.java (original)
+++ tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/tagext/BodyTag.java Fri Jul 14 
19:58:10 2017
@@ -70,7 +70,7 @@ import javax.servlet.jsp.JspException;
  * TryCatchFinally interface; see that interface for details.
  * 
  * 
+ * alt="Lifecycle Details Transition Diagram for BodyTag">
  * 
  * Empty and Non-Empty Action
  * 

Modified: tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/tagext/IterationTag.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/tagext/IterationTag.java?rev=1801983&r1=1801982&r2=1801983&view=diff
==
--- tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/tagext/IterationTag.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/tagext/IterationTag.java Fri 
Jul 14 19:58:10 2017
@@ -51,7 +51,7 @@ import javax.servlet.jsp.JspException;
  *
  * 
  * 
+ *  alt="Lifecycle Details Transition Diagram for IterationTag">
  *
  * Empty and Non-Empty Action
  *  If the TagLibraryDescriptor file indicates that the action mu

svn commit: r1801982 - /tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/tagext/VariableInfo.java

2017-07-14 Thread csutherl

Author: csutherl
Date: Fri Jul 14 19:45:08 2017
New Revision: 1801982

URL: http://svn.apache.org/viewvc?rev=1801982&view=rev
Log:
Porting r1631705 to tomcat7: Switch to inline styles to silence the Java 8 
Javadoc warnings for the JSP API

Modified:
tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/tagext/VariableInfo.java

Modified: tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/tagext/VariableInfo.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/tagext/VariableInfo.java?rev=1801982&r1=1801981&r2=1801982&view=diff
==
--- tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/tagext/VariableInfo.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/tagext/VariableInfo.java Fri 
Jul 14 19:45:08 2017
@@ -81,77 +81,77 @@ package javax.servlet.jsp.tagext;
  * thus where synchronization is needed as illustrated by the table below.
  * Note: the synchronization of the variable(s) will occur 
after
  * the respective method has been called. 
- * 
+ * 
  * 
  * 
- * Variable 
Synchronization
+ * Variable Synchronization
  * Points
  * 
  * 
  * 
- *  
- * doStartTag()
- * doInitBody()
- * doAfterBody()
- * doEndTag()
- * doTag()
+ *  
+ * doStartTag()
+ * doInitBody()
+ * doAfterBody()
+ * doEndTag()
+ * doTag()
  * 
  * 
- * Tag
+ * Tag
  * 
- * AT_BEGIN, NESTED
+ * AT_BEGIN, 
NESTED
  * 
- * 
+ * 
  * 
- * 
+ * 
  * 
- * AT_BEGIN, AT_END
+ * AT_BEGIN, 
AT_END
  * 
- * 
+ * 
  * 
  * 
  * 
- * IterationTag
+ * IterationTag
  * 
- * AT_BEGIN, NESTED
+ * AT_BEGIN, 
NESTED
  * 
- * 
+ * 
  * 
- * AT_BEGIN, NESTED
+ * AT_BEGIN, 
NESTED
  * 
- * AT_BEGIN, AT_END
+ * AT_BEGIN, 
AT_END
  * 
- * 
+ * 
  * 
  * 
  * 
- * BodyTag
+ * BodyTag
  * 
- * AT_BEGIN,
+ * AT_BEGIN,
  * NESTED1
  * 
- * AT_BEGIN,
+ * AT_BEGIN,
  * NESTED1
  * 
- * AT_BEGIN, NESTED
+ * AT_BEGIN, 
NESTED
  * 
- * AT_BEGIN, AT_END
+ * AT_BEGIN, 
AT_END
  * 
- * 
+ * 
  * 
  * 
  * 
- * SimpleTag
+ * SimpleTag
  * 
- * 
+ * 
  * 
- * 
+ * 
  * 
- * 
+ * 
  * 
- * 
+ * 
  * 
- * AT_BEGIN, AT_END
+ * AT_BEGIN, 
AT_END
  * 
  * 
  * 



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

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/catalin

2017-07-14 Thread csutherl

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  -> 

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.
+ * identity and authentication state in either case, PERMIT or 
DENY.
  * 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.
+ * identity and authentication state in either case, PERMIT or 
DENY.
  * 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 EmptyRoleSemanti

svn propchange: r1801987 - svn:log

svn commit: r1801987 - in /tomcat/tc7.0.x/trunk/java/org/apache: catalina/Lifecycle.java coyote/AsyncStateMachine.java

svn commit: r1801983 - in /tomcat/tc7.0.x/trunk/java/javax/servlet/jsp: JspApplicationContext.java JspContext.java el/ExpressionEvaluator.java tagext/BodyTag.java tagext/IterationTag.java tagext/Tag.j

svn commit: r1801982 - /tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/tagext/VariableInfo.java

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/catalin

5 matches

Site Navigation

Mail list logo

Footer information