svn commit: r1631321 - /tomcat/sandbox/trunk-maven-layout/pom.xml
Author: markt Date: Mon Oct 13 09:18:17 2014 New Revision: 1631321 URL: http://svn.apache.org/r1631321 Log: Futher patch from Pierre Viret. Enable the jdbc-pool module since BZ 57005 is fixed. Modified: tomcat/sandbox/trunk-maven-layout/pom.xml Modified: tomcat/sandbox/trunk-maven-layout/pom.xml URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-maven-layout/pom.xml?rev=1631321&r1=1631320&r2=1631321&view=diff == --- tomcat/sandbox/trunk-maven-layout/pom.xml (original) +++ tomcat/sandbox/trunk-maven-layout/pom.xml Mon Oct 13 09:18:17 2014 @@ -42,7 +42,6 @@ -modules/jdbc-pool tomcat-annotations-api tomcat-catalina tomcat-api @@ -57,6 +56,7 @@ tomcat-extras-juli-adapters tomcat-jasper tomcat-jasper-el +tomcat-jdbc tomcat-jni tomcat-jsp-api tomcat-servlet-api @@ -75,10 +75,7 @@ tomcat-i18n-ja --> - tomcat-buildutil tomcat-webapps global-resources - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1631322 - /tomcat/sandbox/trunk-maven-layout/tomcat-webapps/docs/pom.xml
Author: markt
Date: Mon Oct 13 09:18:55 2014
New Revision: 1631322
URL: http://svn.apache.org/r1631322
Log:
Futher patch from Pierre Viret.
Modified:
tomcat/sandbox/trunk-maven-layout/tomcat-webapps/docs/pom.xml
Modified: tomcat/sandbox/trunk-maven-layout/tomcat-webapps/docs/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-maven-layout/tomcat-webapps/docs/pom.xml?rev=1631322&r1=1631321&r2=1631322&view=diff
==
--- tomcat/sandbox/trunk-maven-layout/tomcat-webapps/docs/pom.xml (original)
+++ tomcat/sandbox/trunk-maven-layout/tomcat-webapps/docs/pom.xml Mon Oct 13
09:18:55 2014
@@ -21,13 +21,101 @@
org.apache.tomcat.webapps
tomcat-webapps
-8.0.15-SNAPSHOT
+8.0.15-SNAPSHOT
-org.apache.tomcat.webapps
-tomcat-docs
-Tomcat Docs
-pom
-http://tomcat.apache.org
+docs
+Tomcat docs webapp
+war
+
+
+
+org.codehaus.mojo
+xml-maven-plugin
+
+
+
+transform
+
+
+
+
+
+
+src/main/webapp
+
src/main/webapp/tomcat-docs.xsl
+
+**/*.xml
+
+
+**/project.xml
+**/build.xml
+META-INF/**
+WEB-INF/**
+
+
+
+.html
+
+
+
+
+sitedir
+
tomcat-${version.major.minor}-doc/
+
+
+
+relative-path
+.
+
+
+version
+${version}
+
+
+majorversion
+${version.major}
+
+
+majorminorversion
+${version.major.minor}
+
+
+build-date
+
+${maven.build.timestamp}
+
+
+build-date-iso-8601
+
+${maven.build.timestamp}
+
+
+year
+${YEAR}
+
+
+
+
+
+
+
+maven-war-plugin
+
+
META-INF/**,WEB-INF/**
+
+
+
${project.build.directory}/generated-resources/xml/xslt
+
+
+
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1631323 - /tomcat/sandbox/trunk-maven-layout/pom.xml
Author: markt Date: Mon Oct 13 09:30:57 2014 New Revision: 1631323 URL: http://svn.apache.org/r1631323 Log: Remove duplication Modified: tomcat/sandbox/trunk-maven-layout/pom.xml Modified: tomcat/sandbox/trunk-maven-layout/pom.xml URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-maven-layout/pom.xml?rev=1631323&r1=1631322&r2=1631323&view=diff == --- tomcat/sandbox/trunk-maven-layout/pom.xml (original) +++ tomcat/sandbox/trunk-maven-layout/pom.xml Mon Oct 13 09:30:57 2014 @@ -75,7 +75,6 @@ tomcat-i18n-ja --> -modules/jdbc-pool tomcat-buildutil tomcat-webapps global-resources - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56397] Establish parallel Maven-based build process
https://issues.apache.org/bugzilla/show_bug.cgi?id=56397 --- Comment #35 from Mark Thomas --- No need to think too much about git at the moment. There doesn't seem to be much interest in moving right now. Patche are all applied and the build completes. I don't see the startup scripts or the config files in Tomcat instance that gets created. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [GUMP@vmgump]: Project tomcat-trunk-test-bio (in module tomcat-trunk) failed
On 12/10/2014 11:08, Konstantin Kolinko wrote: > One more: > It is odd that filtering of MessageBytes is skipped if mb.getType() is > already T_BYTES. I don't think that code path is ever used. > I think those methods, and new/moved method > TesterAjpMessage.appendString() shall filter CTLs. > > I was thinking about helper method, such as filterCTLs(byte[], int > offset, int length). That would be more consistent. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [GUMP@vmgump]: Project tomcat-trunk-test-bio (in module tomcat-trunk) failed
On 12/10/2014 14:22, Caldarale, Charles R wrote: >> From: Konstantin Kolinko [mailto:knst.koli...@gmail.com] >> Subject: Re: [GUMP@vmgump]: Project tomcat-trunk-test-bio (in module >> tomcat-trunk) failed > >>> Is it worth doing that compared to the cost of creating and gc'ing the >>> local variable? > >> Local int variable is not an object. I think that it is created on >> stack and there is no gc involved. (I may be wrong here though). > > A local int resides on the stack, whereas an Integer is an object, and may be > on the stack or in the heap. If the JIT (just the C2 compiler only, I think) > can determine that the object does not escape the local procedure (and is > small enough) it will be on the stack. The escape analysis was implemented > by Sun in Java 6 (the IBM JVM had it for some time before that): > > http://docs.oracle.com/javase/7/docs/technotes/guides/vm/performance-enhancements-7.html#escapeAnalysis Thanks to our resident JVM expert for pointing me in the right direction. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1631342 - /tomcat/trunk/java/javax/servlet/AsyncContext.java
Author: markt
Date: Mon Oct 13 10:39:09 2014
New Revision: 1631342
URL: http://svn.apache.org/r1631342
Log:
Javadoc. Fix Java 8 warnings for this class.
Modified:
tomcat/trunk/java/javax/servlet/AsyncContext.java
Modified: tomcat/trunk/java/javax/servlet/AsyncContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/AsyncContext.java?rev=1631342&r1=1631341&r2=1631342&view=diff
==
--- tomcat/trunk/java/javax/servlet/AsyncContext.java (original)
+++ tomcat/trunk/java/javax/servlet/AsyncContext.java Mon Oct 13 10:39:09 2014
@@ -39,23 +39,41 @@ public interface AsyncContext {
boolean hasOriginalRequestAndResponse();
/**
- *
- * @throws IllegalStateException
+ * @throws IllegalStateException if this method is called when the request
+ * is not in asynchronous mode. The request is in asynchronous mode after
+ * {@link javax.servlet.http.HttpServletRequest#startAsync()} or
+ * {@link javax.servlet.http.HttpServletRequest#startAsync(ServletRequest,
+ * ServletResponse)} has been called and before {@link #complete()} or any
+ * other dispatch() method has been called.
*/
void dispatch();
/**
+ * @param path The path to which the request/response should be dispatched
+ * relative to the {@link ServletContext} from which this async
+ * request was started.
*
- * @param path
- * @throws IllegalStateException
+ * @throws IllegalStateException if this method is called when the request
+ * is not in asynchronous mode. The request is in asynchronous mode after
+ * {@link javax.servlet.http.HttpServletRequest#startAsync()} or
+ * {@link javax.servlet.http.HttpServletRequest#startAsync(ServletRequest,
+ * ServletResponse)} has been called and before {@link #complete()} or any
+ * other dispatch() method has been called.
*/
void dispatch(String path);
/**
+ * @param path The path to which the request/response should be dispatched
+ * relative to the specified {@link ServletContext}.
+ * @param context The {@link ServletContext} to which the request/response
+ *should be dispatched.
*
- * @param context
- * @param path
- * @throws IllegalStateException
+ * @throws IllegalStateException if this method is called when the request
+ * is not in asynchronous mode. The request is in asynchronous mode after
+ * {@link javax.servlet.http.HttpServletRequest#startAsync()} or
+ * {@link javax.servlet.http.HttpServletRequest#startAsync(ServletRequest,
+ * ServletResponse)} has been called and before {@link #complete()} or any
+ * other dispatch() method has been called.
*/
void dispatch(ServletContext context, String path);
@@ -72,12 +90,17 @@ public interface AsyncContext {
throws ServletException;
/**
- * Set timeout in milliseconds. 0 or less indicates no timeout.
+ * Set the timeout.
+ *
+ * @param timeout The timeout in milliseconds. 0 or less indicates no
+ *timeout.
*/
void setTimeout(long timeout);
/**
- * Get timeout in milliseconds. 0 or less indicates no timeout.
+ * Get the current.
+ *
+ * @return The timeout in milliseconds. 0 or less indicates no timeout.
*/
long getTimeout();
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1631347 - in /tomcat/trunk/java/javax/websocket: ./ server/
Author: markt
Date: Mon Oct 13 11:24:24 2014
New Revision: 1631347
URL: http://svn.apache.org/r1631347
Log:
Fix Java8 Javadoc warnings for javax.websocket package
Modified:
tomcat/trunk/java/javax/websocket/ContainerProvider.java
tomcat/trunk/java/javax/websocket/Endpoint.java
tomcat/trunk/java/javax/websocket/PongMessage.java
tomcat/trunk/java/javax/websocket/RemoteEndpoint.java
tomcat/trunk/java/javax/websocket/Session.java
tomcat/trunk/java/javax/websocket/WebSocketContainer.java
tomcat/trunk/java/javax/websocket/server/HandshakeRequest.java
tomcat/trunk/java/javax/websocket/server/ServerEndpoint.java
tomcat/trunk/java/javax/websocket/server/ServerEndpointConfig.java
Modified: tomcat/trunk/java/javax/websocket/ContainerProvider.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/websocket/ContainerProvider.java?rev=1631347&r1=1631346&r2=1631347&view=diff
==
--- tomcat/trunk/java/javax/websocket/ContainerProvider.java (original)
+++ tomcat/trunk/java/javax/websocket/ContainerProvider.java Mon Oct 13
11:24:24 2014
@@ -30,6 +30,8 @@ public abstract class ContainerProvider
/**
* Create a new container used to create outgoing WebSocket connections.
+ *
+ * @return A newly created container.
*/
public static WebSocketContainer getWebSocketContainer() {
WebSocketContainer result = null;
Modified: tomcat/trunk/java/javax/websocket/Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/websocket/Endpoint.java?rev=1631347&r1=1631346&r2=1631347&view=diff
==
--- tomcat/trunk/java/javax/websocket/Endpoint.java (original)
+++ tomcat/trunk/java/javax/websocket/Endpoint.java Mon Oct 13 11:24:24 2014
@@ -22,6 +22,8 @@ public abstract class Endpoint {
* Event that is triggered when a new session starts.
*
* @param session The new session.
+ * @param configThe configuration with which the Endpoint was
+ * configured.
*/
public abstract void onOpen(Session session, EndpointConfig config);
@@ -38,8 +40,8 @@ public abstract class Endpoint {
/**
* Event that is triggered when a protocol error occurs.
*
- * @param session The session
- * @param throwable The exception
+ * @param session The session.
+ * @param throwable The exception.
*/
public void onError(Session session, Throwable throwable) {
// NO-OP by default
Modified: tomcat/trunk/java/javax/websocket/PongMessage.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/websocket/PongMessage.java?rev=1631347&r1=1631346&r2=1631347&view=diff
==
--- tomcat/trunk/java/javax/websocket/PongMessage.java (original)
+++ tomcat/trunk/java/javax/websocket/PongMessage.java Mon Oct 13 11:24:24 2014
@@ -24,7 +24,9 @@ import java.nio.ByteBuffer;
*/
public interface PongMessage {
/**
- * Obtain the payload of the Pong message as a ByteBuffer.
+ * Get the payload of the Pong message..
+ *
+ * @return The payload of the Pong message.
*/
ByteBuffer getApplicationData();
}
Modified: tomcat/trunk/java/javax/websocket/RemoteEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/websocket/RemoteEndpoint.java?rev=1631347&r1=1631346&r2=1631347&view=diff
==
--- tomcat/trunk/java/javax/websocket/RemoteEndpoint.java (original)
+++ tomcat/trunk/java/javax/websocket/RemoteEndpoint.java Mon Oct 13 11:24:24
2014
@@ -29,16 +29,20 @@ public interface RemoteEndpoint {
/**
* Obtain the timeout (in milliseconds) for sending a message
- * asynchronously. A non-positive value means an infinite timeout. The
- * default value is determined by
+ * asynchronously. The default value is determined by
* {@link WebSocketContainer#getDefaultAsyncSendTimeout()}.
+ * @return The current send timeout in milliseconds. A non-positive
+ * value means an infinite timeout.
*/
long getSendTimeout();
/**
- * Set the timeout (in milliseconds) for sending a message
asynchronously. A
- * non-positive value means an infinite timeout. The default value is
- * determined by {@link
WebSocketContainer#getDefaultAsyncSendTimeout()}.
+ * Set the timeout (in milliseconds) for sending a message
+ * asynchronously. The default value is determined by
+ * {@link WebSocketContainer#getDefaultAsyncSendTimeout()}.
+ * @param timeout The new timeout for sending messages asynchronously
+ * in milliseconds. A non-positive value means an
+ *
svn commit: r1631350 - in /tomcat/trunk/java/javax/servlet/jsp: JspApplicationContext.java JspContext.java el/ExpressionEvaluator.java tagext/BodyTag.java tagext/IterationTag.java tagext/Tag.java tage
Author: markt
Date: Mon Oct 13 11:33:23 2014
New Revision: 1631350
URL: http://svn.apache.org/r1631350
Log:
Fix Java8 Javadoc errors in the javax.servlet.jsp package
Modified:
tomcat/trunk/java/javax/servlet/jsp/JspApplicationContext.java
tomcat/trunk/java/javax/servlet/jsp/JspContext.java
tomcat/trunk/java/javax/servlet/jsp/el/ExpressionEvaluator.java
tomcat/trunk/java/javax/servlet/jsp/tagext/BodyTag.java
tomcat/trunk/java/javax/servlet/jsp/tagext/IterationTag.java
tomcat/trunk/java/javax/servlet/jsp/tagext/Tag.java
tomcat/trunk/java/javax/servlet/jsp/tagext/TagData.java
tomcat/trunk/java/javax/servlet/jsp/tagext/VariableInfo.java
Modified: tomcat/trunk/java/javax/servlet/jsp/JspApplicationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/JspApplicationContext.java?rev=1631350&r1=1631349&r2=1631350&view=diff
==
--- tomcat/trunk/java/javax/servlet/jsp/JspApplicationContext.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/JspApplicationContext.java Mon Oct 13
11:33:23 2014
@@ -51,6 +51,7 @@ public interface JspApplicationContext {
*
*
* JSP has a default set of ELResolvers to chain for all EL evaluation:
+ *
*
* ImplicitObjectELResolver
* ELResolver instances registered with this method
@@ -60,7 +61,6 @@ public interface JspApplicationContext {
* BeanELResolver
* ScopedAttributeELResolver
*
- *
*
* @param resolver
*an additional resolver
Modified: tomcat/trunk/java/javax/servlet/jsp/JspContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/JspContext.java?rev=1631350&r1=1631349&r2=1631350&view=diff
==
--- tomcat/trunk/java/javax/servlet/jsp/JspContext.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/JspContext.java Mon Oct 13 11:33:23 2014
@@ -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/trunk/java/javax/servlet/jsp/el/ExpressionEvaluator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/el/ExpressionEvaluator.java?rev=1631350&r1=1631349&r2=1631350&view=diff
==
--- tomcat/trunk/java/javax/servlet/jsp/el/ExpressionEvaluator.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/el/ExpressionEvaluator.java Mon Oct 13
11:33:23 2014
@@ -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/trunk/java/javax/servlet/jsp/tagext/BodyTag.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/tagext/BodyTag.java?rev=1631350&r1=1631349&r2=1631350&view=diff
==
--- tomcat/trunk/java/javax/servlet/jsp/tagext/BodyTag.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/tagext/BodyTag.java Mon Oct 13 11:33:23
2014
@@ -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/trunk/java/javax/servlet/jsp/tagext/IterationTag.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/tagext/IterationTag.java?rev=1631350&r1=1631349&r2=1631350&view=diff
==
--- tomcat/trunk/java/javax/servlet/jsp/tagext/IterationTag.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/tagext/IterationTag.java Mon Oct 13
11:33:23 2014
@@ -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 must
Modified: tomcat/trunk/java/javax/servlet/jsp/tagext/Tag.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/tagext/Tag.java?rev=1631350&r1=1631349&r2=1631350&view=diff
==
--- tom
[Bug 57079] New: Use Tomcat version number in jdbc-pool manifest when building it as part of Tomcat
https://issues.apache.org/bugzilla/show_bug.cgi?id=57079
Bug ID: 57079
Summary: Use Tomcat version number in jdbc-pool manifest when
building it as part of Tomcat
Product: Tomcat 8
Version: 8.0.14
Hardware: PC
Status: NEW
Severity: normal
Priority: P2
Component: Packaging
Assignee: dev@tomcat.apache.org
Reporter: knst.koli...@gmail.com
Looking into tomcat-jdbc.jar/META-INF/MANIFEST.MF file,
Actual behaviour:
currently (e.g. for 8.0.14) it contains:
[[[
Manifest-Version: 1.0
Ant-Version: Apache Ant 1.7.0
Created-By: 11.0-b16 (Sun Microsystems Inc.)
Export-Package: org.apache.tomcat.jdbc.naming;uses:="javax.naming,org.
apache.juli.logging,javax.naming.spi";version="1.1.0.1",org.apache.to
mcat.jdbc.pool;uses:="org.apache.juli.logging,javax.sql,org.apache.to
mcat.jdbc.pool.jmx,javax.management,javax.naming,javax.naming.spi,org
.apache.tomcat.jdbc.pool.interceptor";version="1.1.0.1",org.apache.to
mcat.jdbc.pool.interceptor;uses:="org.apache.tomcat.jdbc.pool,org.apa
che.juli.logging,javax.management.openmbean,javax.management";version
="1.1.0.1",org.apache.tomcat.jdbc.pool.jmx;uses:="org.apache.tomcat.j
dbc.pool,org.apache.juli.logging,javax.management";version="1.1.0.1"
Bundle-Vendor: Apache Software Foundation
Bundle-Version: 1.1.0.1
Bundle-Name: Apache Tomcat JDBC Connection Pool
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.apache.tomcat.jdbc
Import-Package: javax.management;version="0", javax.management.openmb
ean;version="0", javax.naming;version="0", javax.naming.spi;version="
0", javax.sql;version="0", org.apache.juli.logging;version="0"
]]]
It is generated from template in modules/jdbc-pool/resources/MANIFEST.MF
Expected behaviour:
1) I expected "Ant-Version: Apache Ant 1.8.4", because that was the version of
Ant used to build Tomcat 8.0.14.
"Ant-Version: Apache Ant 1.7.0" is hard-coded in template file.
2) "Bundle-Version: 1.1.0.1" and versions in "Export-Package" to be 8.0.14.
The goal is to discern different builds of JDBC Pool.
I guess it boils down to passing relevant ${version} property when invoking its
build file from Tomcat one.
Can we change that "1.1.0.1" to be "8.0.14", or there will be any problems?
As this issue involves OSGi, a better reference would be bug 52381.
--
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1631381 - in /tomcat/trunk: modules/jdbc-pool/build.xml webapps/docs/changelog.xml
Author: kkolinko Date: Mon Oct 13 13:18:28 2014 New Revision: 1631381 URL: http://svn.apache.org/r1631381 Log: Apply timestamp fix (r1630088 r1630094) to jdbc-pool and mention it in changelog. The VERSION_BUILT filter string is actually not used in any of jdbc-pool source files, so this change does not matter much for the current jdbc-pool. Modified: tomcat/trunk/modules/jdbc-pool/build.xml tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/modules/jdbc-pool/build.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.xml?rev=1631381&r1=1631380&r2=1631381&view=diff == --- tomcat/trunk/modules/jdbc-pool/build.xml (original) +++ tomcat/trunk/modules/jdbc-pool/build.xml Mon Oct 13 13:18:28 2014 @@ -39,7 +39,9 @@ - + + + @@ -83,16 +85,12 @@ - - - - - + Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1631381&r1=1631380&r2=1631381&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Mon Oct 13 13:18:28 2014 @@ -195,6 +195,10 @@ 56079: The uninstaller packaged with the Apache Tomcat Windows installer is now digitally signed. (markt) + +Fix timestamps in Tomcat build and jdbc-pool to use 24-hour format +instead of 12-hour one and use UTC timezone. (markt/kkolinko) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1631384 - in /tomcat/trunk/java/org/apache/catalina: ant/ ant/jmx/ authenticator/
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.
+ *
*/
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.
-* Examples of query format:
+* Examples of query format:
*
* *:*
* *:type=RequestProcessor,*
* *:j2eeType=Servlet,*
* Catalina:type=Environment,resourcetype=Global,name=simpleValue
*
- *
* @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
*
* Definition:
*
- *
- *
- *
- *
+ *
+ *
+ *
+ *
*
*
svn commit: r1631390 - in /tomcat/trunk/java/org/apache/catalina: ./ connector/ core/ filters/ ha/deploy/ ha/tcp/
Author: markt Date: Mon Oct 13 13:38:25 2014 New Revision: 1631390 URL: http://svn.apache.org/r1631390 Log: Fix some more of the Java 8 Javadoc errors in the org.apace.catalina package Modified: tomcat/trunk/java/org/apache/catalina/WebResourceRoot.java tomcat/trunk/java/org/apache/catalina/connector/Connector.java tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java tomcat/trunk/java/org/apache/catalina/ha/deploy/WarWatcher.java tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java Modified: tomcat/trunk/java/org/apache/catalina/WebResourceRoot.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/WebResourceRoot.java?rev=1631390&r1=1631389&r2=1631390&view=diff == --- tomcat/trunk/java/org/apache/catalina/WebResourceRoot.java (original) +++ tomcat/trunk/java/org/apache/catalina/WebResourceRoot.java Mon Oct 13 13:38:25 2014 @@ -27,15 +27,15 @@ import java.util.Set; * a Resource, the ResourceSets are processed in the following order: * * Pre - Resources defined by theelement in the web - *application's context.xml. Resources will be searched in the - *order they were specified. + *application's context.xml. Resources will be searched in the order + *they were specified. * Main - The main resources for the web application - i.e. the WAR or the *directory containing the expanded WAR * JARs - Resource JARs as defined by the Servlet specification. JARs will *be searched in the order they were added to the ResourceRoot. * Post - Resources defined by the element in the web - *application's context.xml. Resources will be searched in the - *order they were specified. + *application's context.xml. Resources will be searched in the order + *they were specified. * * The following conventions should be noted: * @@ -378,14 +378,15 @@ public interface WebResourceRoot extends * logged and then closed. * * - * @param trackLockedFiles @true to enable it, @false to disable it + * @param trackLockedFiles {@code true} to enable it, {@code false} to + * disable it */ void setTrackLockedFiles(boolean trackLockedFiles); /** * Has the track locked files feature been enabled? * - * @return @true if it has been enabled, otherwise @false + * @return {@code true} if it has been enabled, otherwise {@code false} */ boolean getTrackLockedFiles(); Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=1631390&r1=1631389&r2=1631390&view=diff == --- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original) +++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Mon Oct 13 13:38:25 2014 @@ -829,7 +829,7 @@ public class Connector extends Lifecycle * Enable the use of IP-based virtual hosting. * * @param useIPVHosts true if Hosts are identified by IP, - *false/code> if Hosts are identified by name. + *false if Hosts are identified by name. */ public void setUseIPVHosts(boolean useIPVHosts) { this.useIPVHosts = useIPVHosts; Modified: tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java?rev=1631390&r1=1631389&r2=1631390&view=diff == --- tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java (original) +++ tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java Mon Oct 13 13:38:25 2014 @@ -84,6 +84,7 @@ import org.apache.tomcat.util.res.String * following ContainerEvent events to listeners who register * themselves with addContainerListener(): * + * ContainerEvents fired by this implementation * * Type * Data Modified: tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java?rev=1631390&r1=1631389&r2=1631390&view=diff == --- tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java (original) +++ tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java Mon Oct 13 13:38:25 2014 @@ -51,6 +51,7 @@ import org.ap
svn commit: r1631399 - in /tomcat/trunk/java/org/apache/catalina: manager/ manager/host/ realm/ security/ servlets/ session/ startup/ storeconfig/ tribes/ tribes/group/ tribes/group/interceptors/ trib
Author: markt
Date: Mon Oct 13 14:04:33 2014
New Revision: 1631399
URL: http://svn.apache.org/r1631399
Log:
Fix some more of the Java 8 Javadoc errors in the org.apace.catalina package
Modified:
tomcat/trunk/java/org/apache/catalina/manager/JspHelper.java
tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java
tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java
tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
tomcat/trunk/java/org/apache/catalina/session/PersistentManager.java
tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
tomcat/trunk/java/org/apache/catalina/startup/HomesUserDatabase.java
tomcat/trunk/java/org/apache/catalina/startup/PasswdUserDatabase.java
tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
tomcat/trunk/java/org/apache/catalina/startup/Tool.java
tomcat/trunk/java/org/apache/catalina/startup/WebappServiceLoader.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreFileMover.java
tomcat/trunk/java/org/apache/catalina/tribes/Channel.java
tomcat/trunk/java/org/apache/catalina/tribes/ChannelInterceptor.java
tomcat/trunk/java/org/apache/catalina/tribes/group/AbsoluteOrder.java
tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java
tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java
tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java
Modified: tomcat/trunk/java/org/apache/catalina/manager/JspHelper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/JspHelper.java?rev=1631399&r1=1631398&r2=1631399&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/JspHelper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/JspHelper.java Mon Oct 13
14:04:33 2014
@@ -192,11 +192,11 @@ public class JspHelper {
* Performs the following substring replacements
* (to facilitate output to XML/HTML pages):
*
- *& -> &
- *< -> <
- *> -> >
- *" -> "
- *' -> '
+ *& -> &
+ *< -> <
+ *> -> >
+ *" -> "
+ *' -> '
*
* See also OutSupport.writeEscapedXml().
*/
Modified: tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=1631399&r1=1631398&r2=1631399&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Mon Oct
13 14:04:33 2014
@@ -81,12 +81,12 @@ import org.apache.tomcat.util.res.String
* file found at the specified URL. The docBase attribute
* of the context configuration file is used to locate the actual
* WAR or directory containing the application.
- * /deploy?config={config-url}&war={war-url}/ - Install and start
+ * /deploy?config={config-url}&war={war-url}/ - Install and
start
* a new web application, based on the contents of the context
* configuration file found at {config-url}, overriding the
* docBase attribute with the contents of the web
* application archive found at {war-url}.
- * /deploy?path=/xxx&war={war-url} - Install and start a new
+ * /deploy?path=/xxx&war={war-url} - Install and start a new
* web application attached to context path /xxx, based
* on the contents of the web application archive found at the
* specified URL.
@@ -105,7 +105,7 @@ import org.apache.tomcat.util.res.String
* /expire?path=/xxx - List session idle timeinformation about the
* web application attached to context path /xxx for this
* virtual host.
- * /expire?path=/xxx&idle=mm - Expire sessions
+ * /expire?path=/xxx&idle=mm - Expire sessions
* for the context path /xxx which were idle for at
* least mm minutes.
* /start?path=/xxx - Start the web application attached to
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=1631399&r1=163
svn commit: r1631404 - in /tomcat/trunk/java/org/apache/catalina: users/MemoryUser.java util/ExtensionValidator.java util/MIME2Java.java util/RequestUtil.java valves/JDBCAccessLogValve.java valves/Rem
Author: markt
Date: Mon Oct 13 14:15:11 2014
New Revision: 1631404
URL: http://svn.apache.org/r1631404
Log:
Fix more of the Java 8 Javadoc errors in the org.apace.catalina package
Modified:
tomcat/trunk/java/org/apache/catalina/users/MemoryUser.java
tomcat/trunk/java/org/apache/catalina/util/ExtensionValidator.java
tomcat/trunk/java/org/apache/catalina/util/MIME2Java.java
tomcat/trunk/java/org/apache/catalina/util/RequestUtil.java
tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java
tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteCond.java
Modified: tomcat/trunk/java/org/apache/catalina/users/MemoryUser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/users/MemoryUser.java?rev=1631404&r1=1631403&r2=1631404&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/users/MemoryUser.java (original)
+++ tomcat/trunk/java/org/apache/catalina/users/MemoryUser.java Mon Oct 13
14:15:11 2014
@@ -252,7 +252,7 @@ public class MemoryUser extends Abstract
*
* IMPLEMENTATION NOTE - For backwards compatibility,
* the reader that processes this entry will accept either
- * username or name for the username
+ * username or name for the username
* property.
*/
public String toXml() {
Modified: tomcat/trunk/java/org/apache/catalina/util/ExtensionValidator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/ExtensionValidator.java?rev=1631404&r1=1631403&r2=1631404&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/util/ExtensionValidator.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/util/ExtensionValidator.java Mon Oct
13 14:15:11 2014
@@ -112,7 +112,7 @@ public final class ExtensionValidator {
* file in the /META-INF/ directory of the application and all
* MANIFEST.MF files in each JAR file located in the WEB-INF/lib
* directory and creates an ArrayList of
- * ManifestResorce objects. These objects are then passed
+ * ManifestResorce objects. These objects are then passed
* to the validateManifestResources method for validation.
*
* @param resources The resources configured for this Web Application
Modified: tomcat/trunk/java/org/apache/catalina/util/MIME2Java.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/MIME2Java.java?rev=1631404&r1=1631403&r2=1631404&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/util/MIME2Java.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/MIME2Java.java Mon Oct 13
14:15:11 2014
@@ -32,6 +32,7 @@ import java.util.Map;
* methods such as TXDocument#printWithFormat and
DTD#printExternal.
*
*
+ * MIME charset name to Java encoding name mapping
*
*
* Common Name
Modified: tomcat/trunk/java/org/apache/catalina/util/RequestUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/RequestUtil.java?rev=1631404&r1=1631403&r2=1631404&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/util/RequestUtil.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/RequestUtil.java Mon Oct 13
14:15:11 2014
@@ -90,7 +90,7 @@ public final class RequestUtil {
* IMPLEMENTATION NOTE: URL decoding is performed
* individually on the parsed name and value elements, rather than on
* the entire query string ahead of time, to properly deal with the case
- * where the name or value includes an encoded "=" or "&" character
+ * where the name or value includes an encoded "=" or "&" character
* that would otherwise be interpreted as a delimiter.
*
* @param map Map that accumulates the resulting parameters
@@ -169,7 +169,7 @@ public final class RequestUtil {
* IMPLEMENTATION NOTE: URL decoding is performed
* individually on the parsed name and value elements, rather than on
* the entire query string ahead of time, to properly deal with the case
- * where the name or value includes an encoded "=" or "&" character
+ * where the name or value includes an encoded "=" or "&" character
* that would otherwise be interpreted as a delimiter.
*
* NOTE: byte array data is modified by this method. Caller beware.
Modified: tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java?rev=1631404&r1=1631403&r2=1631404&view=diff
==
--- tomcat/trunk/java/org/apache/c
svn commit: r1631406 - in /tomcat/trunk/java/org/apache: catalina/Lifecycle.java coyote/AsyncStateMachine.java
Author: markt Date: Mon Oct 13 14:17:33 2014 New Revision: 1631406 URL: http://svn.apache.org/r1631406 Log: Use UTF-8 to fix ASCII art in Javadoc. How ironic. Modified: tomcat/trunk/java/org/apache/catalina/Lifecycle.java tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java Modified: tomcat/trunk/java/org/apache/catalina/Lifecycle.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Lifecycle.java?rev=1631406&r1=1631405&r2=1631406&view=diff == --- tomcat/trunk/java/org/apache/catalina/Lifecycle.java (original) +++ tomcat/trunk/java/org/apache/catalina/Lifecycle.java Mon Oct 13 14:17:33 2014 @@ -30,38 +30,38 @@ 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()| | | | - * | -->-<-- autoauto | | | - * | | -<- MUST_STOP -<-- | | + * | --»-«-- autoauto | | | + * | | -«- MUST_STOP -«-- | | * | | | | | - * |\|/ ---< ^ + * |\|/ ---« ^ * | | | | * | | \|/auto auto start() | - * | | STOPPING_PREP -->- STOPPING -->- STOPPED >-- + * | | STOPPING_PREP --»- STOPPING --»- STOPPED »-- * | |^ | | ^ * | | stop() | | | | * | | -- | | | * | | | auto | | | - * | | | MUST_DESTROY--<--- | | + * | | | MUST_DESTROY--«--- | | * | | || | | * | | ||auto | | * | | |destroy() \|/ destroy() | | - * | |FAILED >-- DESTROYING ---<- | + * | |FAILED »-- DESTROYING ---«- | * | |^ | | * | | destroy() | |auto | - * | >-\|/ | + * | »-\|/ | * | DESTROYED | * | | * |stop() | - * --->-->-- + * ---»--»-- * * Any state can transition to FAILED. * Modified: tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java?rev=1631406&r1=1631405&r2=1631406&view=diff == --- tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java (original) +++ tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java Mon Oct 13 14:17:33 2014 @@ -52,9 +52,9 @@ import org.apache.tomcat.util.security.P * DISPATCHING - The dispatch is being processed. * ERROR - Something went wrong. * - * |->--| + * |-»--| * | \|/ - * | |--<---ERROR---<---| + * | |
svn commit: r1631414 - in /tomcat/trunk/java/org/apache/coyote: Request.java Response.java http11/AbstractInputBuffer.java http11/InternalInputBuffer.java spdy/SpdyAprNpnHandler.java spdy/SpdyProxyPro
Author: markt
Date: Mon Oct 13 14:32:10 2014
New Revision: 1631414
URL: http://svn.apache.org/r1631414
Log:
Fix Java 8 Javadoc errors in org.apache.coyote
Modified:
tomcat/trunk/java/org/apache/coyote/Request.java
tomcat/trunk/java/org/apache/coyote/Response.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java
tomcat/trunk/java/org/apache/coyote/spdy/SpdyAprNpnHandler.java
tomcat/trunk/java/org/apache/coyote/spdy/SpdyProxyProtocol.java
Modified: tomcat/trunk/java/org/apache/coyote/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Request.java?rev=1631414&r1=1631413&r2=1631414&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/Request.java (original)
+++ tomcat/trunk/java/org/apache/coyote/Request.java Mon Oct 13 14:32:10 2014
@@ -451,7 +451,7 @@ public final class Request {
*
* The buffer is owned by the protocol implementation - it will be reused
on the next read.
* The Adapter must either process the data in place or copy it to a
separate buffer if it needs
- * to hold it. In most cases this is done during byte->char conversions or
via InputStream. Unlike
+ * to hold it. In most cases this is done during byte->char conversions
or via InputStream. Unlike
* InputStream, this interface allows the app to process data in place,
without copy.
*
*/
Modified: tomcat/trunk/java/org/apache/coyote/Response.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Response.java?rev=1631414&r1=1631413&r2=1631414&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/Response.java (original)
+++ tomcat/trunk/java/org/apache/coyote/Response.java Mon Oct 13 14:32:10 2014
@@ -37,7 +37,7 @@ import org.apache.tomcat.util.res.String
* @author Jason Hunter [j...@eng.sun.com]
* @author James Todd [go...@eng.sun.com]
* @author Harish Prabandham
- * @author Hans Bergsten
+ * @author Hans Bergsten [h...@gefionsoftware.com]
* @author Remy Maucherat
*/
public final class Response {
@@ -280,7 +280,7 @@ public final class Response {
// Headers
/**
- * Warning: This method always returns false for Content-Type
+ * Warning: This method always returns false for Content-Type
* and Content-Length.
*/
public boolean containsHeader(String name) {
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java?rev=1631414&r1=1631413&r2=1631414&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java Mon Oct
13 14:32:10 2014
@@ -361,7 +361,7 @@ public abstract class AbstractInputBuffe
/**
* Has all of the request body been read? There are subtle differences
- * between this and available() > 0 primarily because of having to handle
+ * between this and available() > 0 primarily because of having to
handle
* faking non-blocking reads with the blocking IO connector.
*/
public boolean isFinished() {
Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java?rev=1631414&r1=1631413&r2=1631414&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java Mon Oct
13 14:32:10 2014
@@ -73,7 +73,7 @@ public class InternalInputBuffer extends
/**
* Data is always available for blocking IO (if you wait long enough) so
* return a value of 1. Note that the actual value is never used it is only
- * tested for == 0 or > 0.
+ * tested for == 0 or > 0.
*/
@Override
public int available() {
Modified: tomcat/trunk/java/org/apache/coyote/spdy/SpdyAprNpnHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/spdy/SpdyAprNpnHandler.java?rev=1631414&r1=1631413&r2=1631414&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/spdy/SpdyAprNpnHandler.java (original)
+++ tomcat/trunk/java/org/apache/coyote/spdy/SpdyAprNpnHandler.java Mon Oct 13
14:32:10 2014
@@ -38,7 +38,7 @@ import org.apache.tomcat.util.net.Socket
* Plugin for APR connector providing SPDY support via NPN negotiation.
*
* Example:
- *
+ *SSLCertificat
svn commit: r1631415 - in /tomcat/trunk/java/org/apache/el: MethodExpressionImpl.java ValueExpressionImpl.java
Author: markt
Date: Mon Oct 13 14:32:28 2014
New Revision: 1631415
URL: http://svn.apache.org/r1631415
Log:
Fix Java 8 Javadoc errors in org.apache.el
Modified:
tomcat/trunk/java/org/apache/el/MethodExpressionImpl.java
tomcat/trunk/java/org/apache/el/ValueExpressionImpl.java
Modified: tomcat/trunk/java/org/apache/el/MethodExpressionImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/MethodExpressionImpl.java?rev=1631415&r1=1631414&r2=1631415&view=diff
==
--- tomcat/trunk/java/org/apache/el/MethodExpressionImpl.java (original)
+++ tomcat/trunk/java/org/apache/el/MethodExpressionImpl.java Mon Oct 13
14:32:28 2014
@@ -41,7 +41,7 @@ import org.apache.el.util.ReflectionUtil
* An Expression that refers to a method on an object.
*
*
- * The {@link javax.el.ExpressionFactory#createMethodExpression} method
+ * The {@link javax.el.ExpressionFactory#createMethodExpression} method
* can be used to parse an expression string and return a concrete instance
* of MethodExpression that encapsulates the parsed expression.
* The {@link FunctionMapper} is used at parse time, not evaluation time,
Modified: tomcat/trunk/java/org/apache/el/ValueExpressionImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/ValueExpressionImpl.java?rev=1631415&r1=1631414&r2=1631415&view=diff
==
--- tomcat/trunk/java/org/apache/el/ValueExpressionImpl.java (original)
+++ tomcat/trunk/java/org/apache/el/ValueExpressionImpl.java Mon Oct 13
14:32:28 2014
@@ -54,7 +54,7 @@ import org.apache.el.util.ReflectionUtil
*
*
*
- * The {@link javax.el.ExpressionFactory#createValueExpression} method
+ * The {@link javax.el.ExpressionFactory#createValueExpression} method
* can be used to parse an expression string and return a concrete instance
* of ValueExpression that encapsulates the parsed expression.
* The {@link FunctionMapper} is used at parse time, not evaluation time,
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1631418 - in /tomcat/trunk/java/org/apache/juli/logging: Log.java LogFactory.java
Author: markt
Date: Mon Oct 13 14:33:05 2014
New Revision: 1631418
URL: http://svn.apache.org/r1631418
Log:
Fix Java 8 Javadoc errors in org.apache.juli
Modified:
tomcat/trunk/java/org/apache/juli/logging/Log.java
tomcat/trunk/java/org/apache/juli/logging/LogFactory.java
Modified: tomcat/trunk/java/org/apache/juli/logging/Log.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/logging/Log.java?rev=1631418&r1=1631417&r2=1631418&view=diff
==
--- tomcat/trunk/java/org/apache/juli/logging/Log.java (original)
+++ tomcat/trunk/java/org/apache/juli/logging/Log.java Mon Oct 13 14:33:05 2014
@@ -24,7 +24,7 @@ package org.apache.juli.logging;
* this interface must have a constructor that takes a single String
* parameter representing the "name" of this Log.
*
- * The six logging levels used by Log are (in order):
+ * The six logging levels used by Log are (in order):
*
* trace (the least serious)
* debug
@@ -33,7 +33,7 @@ package org.apache.juli.logging;
* error
* fatal (the most serious)
*
- * The mapping of these log levels to the concepts used by the underlying
+ * The mapping of these log levels to the concepts used by the underlying
* logging system is implementation dependent.
* The implementation should ensure, though, that this ordering behaves
* as expected.
@@ -44,12 +44,12 @@ package org.apache.juli.logging;
* to be logged).
*
* For example,
- *
+ *
*if (log.isDebugEnabled()) {
*... do something expensive ...
*log.debug(theResult);
*}
- *
+ *
*
*
* Configuration of the underlying logging system will generally be done
Modified: tomcat/trunk/java/org/apache/juli/logging/LogFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/logging/LogFactory.java?rev=1631418&r1=1631417&r2=1631418&view=diff
==
--- tomcat/trunk/java/org/apache/juli/logging/LogFactory.java (original)
+++ tomcat/trunk/java/org/apache/juli/logging/LogFactory.java Mon Oct 13
14:33:05 2014
@@ -29,7 +29,7 @@ import java.util.logging.LogManager;
*
* Why? It is an attempt to strike a balance between simpler code (no
discovery)
* and providing flexibility - particularly for those projects that embed
Tomcat
- * or some of Tomcat's components - is an alternative logging
+ * or some of Tomcat's components - is an alternative logging
* implementationnis desired.
*
* Note that this implementation is not just a wrapper around JDK logging (like
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1631417 - in /tomcat/trunk/java/org/apache/jasper: compiler/ compiler/tagplugin/ runtime/ tagplugins/jstl/ xmlparser/
Author: markt
Date: Mon Oct 13 14:32:49 2014
New Revision: 1631417
URL: http://svn.apache.org/r1631417
Log:
Fix Java 8 Javadoc errors in org.apache.jasper
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/AntCompiler.java
tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java
tomcat/trunk/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java
tomcat/trunk/java/org/apache/jasper/runtime/JspWriterImpl.java
tomcat/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java
tomcat/trunk/java/org/apache/jasper/xmlparser/EncodingMap.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/AntCompiler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/AntCompiler.java?rev=1631417&r1=1631416&r2=1631417&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/AntCompiler.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/AntCompiler.java Mon Oct 13
14:32:49 2014
@@ -330,14 +330,14 @@ public class AntCompiler extends Compile
/**
- * Thread <-> PrintStream associations.
+ * Thread <-> PrintStream associations.
*/
protected static final ThreadLocal streams =
new ThreadLocal<>();
/**
- * Thread <-> ByteArrayOutputStream associations.
+ * Thread <-> ByteArrayOutputStream associations.
*/
protected static final ThreadLocal data =
new ThreadLocal<>();
Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java?rev=1631417&r1=1631416&r2=1631417&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java Mon Oct
13 14:32:49 2014
@@ -47,7 +47,7 @@ import org.apache.juli.logging.LogFactor
/**
* Class for tracking JSP compile time file dependencies when the
- * &060;%@include file="..."%&062; directive is used.
+ * >%@include file="..."%< directive is used.
*
* A background thread periodically checks the files a JSP page
* is dependent upon. If a dependent file changes the JSP page
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=1631417&r1=1631416&r2=1631417&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java Mon Oct 13
14:32:49 2014
@@ -910,9 +910,9 @@ public class JspUtil {
}
/**
- * Handles taking input from TLDs 'java.lang.Object' ->
- * 'java.lang.Object.class' 'int' -> 'int.class' 'void' -> 'Void.TYPE'
- * 'int[]' -> 'int[].class'
+ * Handles taking input from TLDs 'java.lang.Object' ->
+ * 'java.lang.Object.class' 'int' -> 'int.class' 'void' ->
'Void.TYPE'
+ * 'int[]' -> 'int[].class'
*
* @param type
*/
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java?rev=1631417&r1=1631416&r2=1631417&view=diff
==
---
tomcat/trunk/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java
(original)
+++
tomcat/trunk/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java
Mon Oct 13 14:32:49 2014
@@ -112,7 +112,7 @@ public interface TagPluginContext {
/**
* Associate the attribute with a value in the current tagplugin context.
* The plugin attributes can be used for communication among tags that
- * must work together as a group. See for an example.
+ * must work together as a group. See for an example.
*/
void setPluginAttribute(String attr, Object value);
Modified: tomcat/trunk/java/org/apache/jasper/runtime/JspWriterImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/JspWriterImpl.java?rev=1631417&r1=1631416&r2=1631417&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/runtime/JspWriterImpl.java (original)
+++ tomcat/trunk/java/org/apache/jasper/runtime/JspWriterImpl.java Mon Oct 13
14:32:49 2014
@@ -62,7 +62,7 @@ public class JspWriterImpl extends JspWr
* @param response A Servlet Response
* @param sz Output-buffer size, a
svn commit: r1631419 - /tomcat/trunk/java/org/apache/juli/logging/LogFactory.java
Author: markt Date: Mon Oct 13 14:36:49 2014 New Revision: 1631419 URL: http://svn.apache.org/r1631419 Log: Fix typos Modified: tomcat/trunk/java/org/apache/juli/logging/LogFactory.java Modified: tomcat/trunk/java/org/apache/juli/logging/LogFactory.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/logging/LogFactory.java?rev=1631419&r1=1631418&r2=1631419&view=diff == --- tomcat/trunk/java/org/apache/juli/logging/LogFactory.java (original) +++ tomcat/trunk/java/org/apache/juli/logging/LogFactory.java Mon Oct 13 14:36:49 2014 @@ -30,7 +30,7 @@ import java.util.logging.LogManager; * Why? It is an attempt to strike a balance between simpler code (no discovery) * and providing flexibility - particularly for those projects that embed Tomcat * or some of Tomcat's components - is an alternative logging - * implementationnis desired. + * implementation is desired. * * Note that this implementation is not just a wrapper around JDK logging (like * the original commons-logging impl). It adds 2 features - a simpler - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1631422 - in /tomcat/trunk/java/org/apache: catalina/Lifecycle.java coyote/AsyncStateMachine.java
Author: markt Date: Mon Oct 13 14:39:36 2014 New Revision: 1631422 URL: http://svn.apache.org/r1631422 Log: Set encoding so diffs are reported correctly Modified: tomcat/trunk/java/org/apache/catalina/Lifecycle.java (props changed) tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java (props changed) Propchange: tomcat/trunk/java/org/apache/catalina/Lifecycle.java -- svn:mime-type = text/plain; charset=UTF-8 Propchange: tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java -- svn:mime-type = text/plain; charset=UTF-8 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1631423 - /tomcat/trunk/java/org/apache/catalina/Lifecycle.java
Author: markt Date: Mon Oct 13 14:41:02 2014 New Revision: 1631423 URL: http://svn.apache.org/r1631423 Log: Trivial change to test diffs Modified: tomcat/trunk/java/org/apache/catalina/Lifecycle.java Modified: tomcat/trunk/java/org/apache/catalina/Lifecycle.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Lifecycle.java?rev=1631423&r1=1631422&r2=1631423&view=diff == --- tomcat/trunk/java/org/apache/catalina/Lifecycle.java [UTF-8] (original) +++ tomcat/trunk/java/org/apache/catalina/Lifecycle.java [UTF-8] Mon Oct 13 14:41:02 2014 @@ -61,7 +61,7 @@ package org.apache.catalina; * | DESTROYED | * | | * |stop() | - * ---»--»-- + * »-»-- * * Any state can transition to FAILED. * - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1631431 - in /tomcat/trunk/java/org/apache/naming: JndiPermission.java SelectorContext.java factory/BeanFactory.java factory/SendMailFactory.java
Author: markt Date: Mon Oct 13 14:59:30 2014 New Revision: 1631431 URL: http://svn.apache.org/r1631431 Log: Fix Java 8 Javadoc errors in org.apache.naming Modified: tomcat/trunk/java/org/apache/naming/JndiPermission.java tomcat/trunk/java/org/apache/naming/SelectorContext.java tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java tomcat/trunk/java/org/apache/naming/factory/SendMailFactory.java Modified: tomcat/trunk/java/org/apache/naming/JndiPermission.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/JndiPermission.java?rev=1631431&r1=1631430&r2=1631431&view=diff == --- tomcat/trunk/java/org/apache/naming/JndiPermission.java (original) +++ tomcat/trunk/java/org/apache/naming/JndiPermission.java Mon Oct 13 14:59:30 2014 @@ -29,8 +29,8 @@ import java.security.BasicPermission; * resources that start with name. There are no actions. * * Example that grants permission to read all JNDI file based resources: - * permission org.apache.naming.JndiPermission "*"; * + * permission org.apache.naming.JndiPermission "*"; * * @author Glenn Nielsen */ Modified: tomcat/trunk/java/org/apache/naming/SelectorContext.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/SelectorContext.java?rev=1631431&r1=1631430&r2=1631431&view=diff == --- tomcat/trunk/java/org/apache/naming/SelectorContext.java (original) +++ tomcat/trunk/java/org/apache/naming/SelectorContext.java Mon Oct 13 14:59:30 2014 @@ -117,7 +117,7 @@ public class SelectorContext implements * * @param name the name of the object to look up * @return the object bound to name - * @exception NamingException if a naming exception is encountered + * @throws NamingException if a naming exception is encountered */ @Override public Object lookup(Name name) @@ -140,7 +140,7 @@ public class SelectorContext implements * * @param name the name of the object to look up * @return the object bound to name - * @exception NamingException if a naming exception is encountered + * @throws NamingException if a naming exception is encountered */ @Override public Object lookup(String name) @@ -165,11 +165,11 @@ public class SelectorContext implements * * @param name the name to bind; may not be empty * @param obj the object to bind; possibly null - * @exception javax.naming.NameAlreadyBoundException if name is already + * @throws javax.naming.NameAlreadyBoundException if name is already * bound - * @exception javax.naming.directory.InvalidAttributesException if object did not + * @throws javax.naming.directory.InvalidAttributesException if object did not * supply all mandatory attributes - * @exception NamingException if a naming exception is encountered + * @throws NamingException if a naming exception is encountered */ @Override public void bind(Name name, Object obj) @@ -183,11 +183,11 @@ public class SelectorContext implements * * @param name the name to bind; may not be empty * @param obj the object to bind; possibly null - * @exception javax.naming.NameAlreadyBoundException if name is already + * @throws javax.naming.NameAlreadyBoundException if name is already * bound - * @exception javax.naming.directory.InvalidAttributesException if object did not + * @throws javax.naming.directory.InvalidAttributesException if object did not * supply all mandatory attributes - * @exception NamingException if a naming exception is encountered + * @throws NamingException if a naming exception is encountered */ @Override public void bind(String name, Object obj) @@ -207,9 +207,9 @@ public class SelectorContext implements * * @param name the name to bind; may not be empty * @param obj the object to bind; possibly null - * @exception javax.naming.directory.InvalidAttributesException if object did not + * @throws javax.naming.directory.InvalidAttributesException if object did not * supply all mandatory attributes - * @exception NamingException if a naming exception is encountered + * @throws NamingException if a naming exception is encountered */ @Override public void rebind(Name name, Object obj) @@ -223,9 +223,9 @@ public class SelectorContext implements * * @param name the name to bind; may not be empty * @param obj the object to bind; possibly null - * @exception javax.naming.directory.InvalidAttributesException if object did not + * @throws javax.naming.directory.InvalidAttributesException if object did not * supply all mandatory attributes - * @exception NamingException if a naming exception is encountered + * @throws Naming
svn commit: r1631434 - in /tomcat/trunk/java/org/apache/tomcat/jni: File.java Poll.java SSLContext.java Socket.java Stdlib.java
Author: markt
Date: Mon Oct 13 15:06:59 2014
New Revision: 1631434
URL: http://svn.apache.org/r1631434
Log:
Fix Java 8 Javadoc errors in org.apache.tomcat.jni
Modified:
tomcat/trunk/java/org/apache/tomcat/jni/File.java
tomcat/trunk/java/org/apache/tomcat/jni/Poll.java
tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java
tomcat/trunk/java/org/apache/tomcat/jni/Socket.java
tomcat/trunk/java/org/apache/tomcat/jni/Stdlib.java
Modified: tomcat/trunk/java/org/apache/tomcat/jni/File.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/File.java?rev=1631434&r1=1631433&r2=1631434&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/jni/File.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/File.java Mon Oct 13 15:06:59 2014
@@ -173,7 +173,7 @@ public class File {
public static final int APR_FINFO_GPROT = 0x0020; /** Group
protection bits */
public static final int APR_FINFO_WPROT = 0x0040; /** World
protection bits */
public static final int APR_FINFO_ICASE = 0x0100; /** if dev is case
insensitive */
-public static final int APR_FINFO_NAME = 0x0200; /** ->name in
proper case */
+public static final int APR_FINFO_NAME = 0x0200; /** ->name in
proper case */
public static final int APR_FINFO_MIN= 0x8170; /** type, mtime,
ctime, atime, size */
public static final int APR_FINFO_IDENT = 0x3000; /** dev and inode */
@@ -654,8 +654,8 @@ public class File {
/**
* Set the timeout value for a pipe or manipulate the blocking state.
* @param thepipe The pipe we are setting a timeout on.
- * @param timeout The timeout value in microseconds. Values < 0 mean wait
- *forever, 0 means do not wait at all.
+ * @param timeout The timeout value in microseconds. Values < 0 mean
+ *wait forever, 0 means do not wait at all.
*/
public static native int pipeTimeoutSet(long thepipe, long timeout);
Modified: tomcat/trunk/java/org/apache/tomcat/jni/Poll.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/Poll.java?rev=1631434&r1=1631433&r2=1631434&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/jni/Poll.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/Poll.java Mon Oct 13 15:06:59 2014
@@ -109,8 +109,8 @@ public class Poll {
*The descriptor array must be two times the size of pollset.
*and are populated as follows:
*
- * descriptors[2n + 0] -> returned events
- * descriptors[2n + 1] -> socket
+ * descriptors[2n + 0] -> returned events
+ * descriptors[2n + 1] -> socket
*
* @param remove Remove signaled descriptors from pollset
* @return Number of signaled descriptors (output parameter)
@@ -126,7 +126,7 @@ public class Poll {
*The descriptor array must be the size of pollset.
*and are populated as follows:
*
- * descriptors[n] -> socket
+ * descriptors[n] -> socket
*
* @param remove Remove signaled descriptors from pollset
* @return Number of signaled descriptors (output parameter)
@@ -156,8 +156,8 @@ public class Poll {
*The descriptor array must be two times the size of pollset.
*and are populated as follows:
*
- * descriptors[2n + 0] -> returned events
- * descriptors[2n + 1] -> socket
+ * descriptors[2n + 0] -> returned events
+ * descriptors[2n + 1] -> socket
*
* @return Number of descriptors (output parameter) in the Poll
* or negative APR error code.
@@ -176,7 +176,7 @@ public class Poll {
* Check if interrupt() is allowed.
*
* @param pollset
- * @return true if {@link #interrupt(long)} is allowed, else
+ * @return true if {@link #interrupt(long)} is allowed, else
* false
*/
public static native boolean wakeable(long pollset);
Modified: tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java?rev=1631434&r1=1631433&r2=1631434&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java Mon Oct 13 15:06:59
2014
@@ -100,7 +100,7 @@ public final class SSLContext {
* mode valid at the time and may be 0 or 1.
*
* Normally when a SSL connection is finished, the parties must send out
- * "close notify" alert messages using L
+ * "close notify" alert messages using
L
* for a clean shutdown.
*
* When setting the "quiet shutdown" flag to 1, SSL.shutdown
Modified: tomc
svn commit: r1631451 - /tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
Author: markt
Date: Mon Oct 13 16:01:59 2014
New Revision: 1631451
URL: http://svn.apache.org/r1631451
Log:
Fix HTML entity
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java?rev=1631451&r1=1631450&r2=1631451&view=diff
==
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
Mon Oct 13 16:01:59 2014
@@ -668,7 +668,7 @@ public interface PoolConfiguration {
*
boolean result = getTimeBetweenEvictionRunsMillis()>0;
result = result && (isRemoveAbandoned() &&
getRemoveAbandonedTimeout()>0);
-result = result || (isTestWhileIdle() &&
getValidationQuery()!=null);
+result = result || (isTestWhileIdle() &&
getValidationQuery()!=null);
return result;
*
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1631454 - in /tomcat/trunk: java/org/apache/tomcat/dbcp/dbcp2/ java/org/apache/tomcat/dbcp/dbcp2/datasources/ webapps/docs/
Author: markt
Date: Mon Oct 13 16:06:18 2014
New Revision: 1631454
URL: http://svn.apache.org/r1631454
Log:
Fix Java 8 Javadoc errors in org.apache.tomcat.dbcp
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/ (props changed)
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/package-info.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/package-info.java
tomcat/trunk/webapps/docs/changelog.xml
Propchange: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/
--
Merged
/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2:r1626989-1631451
Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java?rev=1631454&r1=1631453&r2=1631454&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java Mon Oct
13 16:06:18 2014
@@ -1518,11 +1518,12 @@ public class BasicDataSource implements
* {@link #getRemoveAbandonedTimeout() removeAbandonedTimeout} seconds.
*
* Abandoned connections are identified and removed when
- * {@link #getConnection()} is invoked and the following conditions hold
+ * {@link #getConnection()} is invoked and the following conditions hold:
+ *
* {@link #getRemoveAbandonedOnBorrow()} or
* {@link #getRemoveAbandonedOnMaintenance()} = true
- * {@link #getNumActive()} > {@link #getMaxTotal()} - 3
- * {@link #getNumIdle()} < 2
+ * {@link #getNumActive()} > {@link #getMaxTotal()} - 3
+ * {@link #getNumIdle()} < 2
*
* @see #getRemoveAbandonedTimeout()
*/
@@ -1569,11 +1570,12 @@ public class BasicDataSource implements
* {@link #getRemoveAbandonedTimeout() removeAbandonedTimeout} seconds.
*
* Abandoned connections are identified and removed when
- * {@link #getConnection()} is invoked and the following conditions hold
+ * {@link #getConnection()} is invoked and the following conditions hold:
+ *
* {@link #getRemoveAbandonedOnBorrow()} or
* {@link #getRemoveAbandonedOnMaintenance()} = true
- * {@link #getNumActive()} > {@link #getMaxTotal()} - 3
- * {@link #getNumIdle()} < 2
+ * {@link #getNumActive()} > {@link #getMaxTotal()} - 3
+ * {@link #getNumIdle()} < 2
*
* @see #getRemoveAbandonedTimeout()
*/
@@ -1613,13 +1615,13 @@ public class BasicDataSource implements
* one of these to execute a query (using one of the execute methods)
* resets the lastUsed property of the parent connection.
*
- * Abandoned connection cleanup happens when
- *
+ * Abandoned connection cleanup happens when:
+ *
* {@link #getRemoveAbandonedOnBorrow()} or
* {@link #getRemoveAbandonedOnMaintenance()} = true
* {@link #getNumIdle() numIdle} < 2
* {@link #getNumActive() numActive} > {@link #getMaxTotal()
maxTotal} - 3
- *
+ *
*
* The default value is 300 seconds.
*/
@@ -1864,6 +1866,47 @@ public class BasicDataSource implements
throw new SQLFeatureNotSupportedException();
}
+/**
+ * Manually invalidates a connection, effectively requesting the pool to
try
+ * to close it, remove it from the pool and reclaim pool capacity.
+ *
+ * @throws IllegalStateException
+ * if invalidating the connection failed.
+ * @since 2.1
+ */
+public void invalidateConnection(Connection connection) throws
IllegalStateException {
+if (connection == null) {
+return;
+}
+if (connectionPool == null) {
+throw new IllegalStateException("Cannot invalidate connection:
ConnectionPool is null.");
+}
+
+final PoolableConnection poolableConnection;
+try {
+poolableConnection = connection.unwrap(PoolableConnection.class);
+if (poolableConnection == null) {
+throw new IllegalStateException(
+"Cannot invalidate connection: Connection is not a
poolable connection.");
+}
+} catch (SQLException e) {
+throw new IllegalStateException("Cannot invalidate connection:
Unwrapping poolable connection failed.", e);
+}
+
+// attempt to close the connection for good measure
+try {
+connection.close();
+} catch (Exception e) {
+// ignore any exceptions here
+}
+
+try {
+connectionPool.invalidateObject(poolableConnection);
+} catch (Exception e) {
+throw new
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/538 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1631347 Blamelist: markt BUILD FAILED: failed compile_1 sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1631458 - in /tomcat/trunk/java/org/apache/tomcat/util: descriptor/tld/ digester/ http/ http/fileupload/ modeler/ net/ net/jsse/
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.
- *
+ *
* 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.
- *
+ *
* This encapsulates references to Tag Library Descriptors that can be located
* in different places:
*
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;
-
/**
* Rule implementation that saves a parameter for use by a surrounding
- * CallMethodRule.
+ * CallMethodRule.
*
- * This parameter may be:
+ * This parameter may be:
*
* from an attribute of the current element
* See {@link #CallParamRule(int paramIndex, String attributeName)}
* from current the element body
* See {@link #CallParamRule(int paramIndex)}
*
- *
*/
-
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 org.xml.sax.XMLReader.
- * See http://www.saxproject.org/apidoc/xml/sax/package-summary.html#package-description";
+ * See http://www.saxproject.org/apidoc/xml/sax/package-summary.html#package-description";>
*
http://www.saxproject.org/apidoc/xml/sax/package-summary.html#package-description
* for information about the standard SAX2 feature flags. In order to b
svn commit: r1631520 - in /tomcat/trunk: java/org/apache/tomcat/util/buf/LocalStrings.properties java/org/apache/tomcat/util/buf/MessageBytes.java webapps/docs/changelog.xml
Author: markt
Date: Mon Oct 13 19:27:37 2014
New Revision: 1631520
URL: http://svn.apache.org/r1631520
Log:
Cache the Encoder instances used to convert Strings to byte arrays in the
Connectors (e.g. when writing HTTP headers) to improve throughput.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/buf/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/LocalStrings.properties?rev=1631520&r1=1631519&r2=1631520&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/LocalStrings.properties Mon
Oct 13 19:27:37 2014
@@ -18,6 +18,9 @@ c2bConverter.recycleFailed=Failed to rec
hexUtils.fromHex.oddDigits=The input must consist of an even number of hex
digits
hexUtils.fromHex.nonHex=The input must consist only of hex digits
+
+messageBytes.toBytesFailed=Failed to convert the String [{0}] to bytes using
Charset [{0}]
+
uDecoder.urlDecode.missingDigit=The % character must be followed by two
hexademical digits
uDecoder.convertHexDigit.notHex=[{0}] is not a hexadecimal digit
uDecoder.urlDecode.uee=Unable to URL decode the specified input since the
encoding [{0}] is not supported.
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java?rev=1631520&r1=1631519&r2=1631520&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java Mon Oct 13
19:27:37 2014
@@ -18,8 +18,16 @@ package org.apache.tomcat.util.buf;
import java.io.IOException;
import java.io.Serializable;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.CharacterCodingException;
import java.nio.charset.Charset;
+import java.nio.charset.CharsetEncoder;
+import java.util.HashMap;
import java.util.Locale;
+import java.util.Map;
+
+import org.apache.tomcat.util.res.StringManager;
/**
* This class is used to represent a subarray of bytes in an HTTP message.
@@ -36,6 +44,9 @@ import java.util.Locale;
public final class MessageBytes implements Cloneable, Serializable {
private static final long serialVersionUID = 1L;
+private static final StringManager sm = StringManager.getManager(
+Constants.Package);
+
// primary type ( whatever is set as original value )
private int type = T_NULL;
@@ -64,6 +75,8 @@ public final class MessageBytes implemen
// strValue!=null is the same
private boolean hasStrValue=false;
+private Map encoders = new HashMap<>();
+
/**
* Creates a new, uninitialized MessageBytes object.
* Use static newInstance() in order to allow
@@ -215,17 +228,29 @@ public final class MessageBytes implemen
byteC.setCharset(charset);
}
-/** Do a char->byte conversion.
+/** Do a char->byte conversion.
*/
public void toBytes() {
-if( ! byteC.isNull() ) {
+if (!byteC.isNull()) {
type=T_BYTES;
return;
}
toString();
type=T_BYTES;
-byte bb[] = strValue.getBytes(byteC.getCharset());
-byteC.setBytes(bb, 0, bb.length);
+Charset charset = byteC.getCharset();
+CharsetEncoder encoder = encoders.get(charset);
+if (encoder == null) {
+encoder = charset.newEncoder();
+encoders.put(charset, encoder);
+}
+ByteBuffer result;
+try {
+ result = encoder.encode(CharBuffer.wrap(strValue));
+} catch (CharacterCodingException e) {
+throw new IllegalArgumentException(sm.getString(
+"messageBytes.toBytesFailed", strValue, charset), e);
+}
+byteC.setBytes(result.array(), result.arrayOffset(), result.limit());
}
/** Convert to char[] and fill the CharChunk.
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1631520&r1=1631519&r2=1631520&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Oct 13 19:27:37 2014
@@ -143,6 +143,15 @@
+
+
+
+Cache the Encoder instances used to convert Strings to
byte
+arrays in the Connectors (e.g. when writing HTTP headers) to improve
+throughput. (markt)
+
+
+
[Bug 56397] Establish parallel Maven-based build process
https://issues.apache.org/bugzilla/show_bug.cgi?id=56397 Pierre Viret changed: What|Removed |Added Attachment #32101|0 |1 is obsolete|| --- Comment #36 from Pierre Viret --- Created attachment 32108 --> https://issues.apache.org/bugzilla/attachment.cgi?id=32108&action=edit Patch for tomcat-maven-layout created with "svn diff -x -u" This patch contains following changes: - fix typo in name of dir apache-tomcat/src/main/resources - work on docs web app (the most files are generated but the content could not be tested yet) - apache-tomcat now generates the structure correctly (bin, conf, ...) The server can be started but there are SEVERE errors: I suppose that some classes are missing somewhere in the jars. Next steps: - check every jars generated by maven if it contains all needed classes (compare with the ant build output) - fix the errors until the server can start correctly - implement the tests: maybe I should start with this step as it could show if some class is missing in some generated jar. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1631568 - in /tomcat/trunk/java/javax: el/ servlet/ servlet/jsp/ servlet/jsp/tagext/
Author: markt
Date: Mon Oct 13 21:51:42 2014
New Revision: 1631568
URL: http://svn.apache.org/r1631568
Log:
Fix some Javadoc warnings when compiling with Java 8
Modified:
tomcat/trunk/java/javax/el/ELResolver.java
tomcat/trunk/java/javax/servlet/ServletContextAttributeListener.java
tomcat/trunk/java/javax/servlet/ServletContextListener.java
tomcat/trunk/java/javax/servlet/ServletInputStream.java
tomcat/trunk/java/javax/servlet/ServletRegistration.java
tomcat/trunk/java/javax/servlet/ServletRequest.java
tomcat/trunk/java/javax/servlet/ServletRequestAttributeListener.java
tomcat/trunk/java/javax/servlet/ServletRequestEvent.java
tomcat/trunk/java/javax/servlet/ServletRequestListener.java
tomcat/trunk/java/javax/servlet/ServletRequestWrapper.java
tomcat/trunk/java/javax/servlet/jsp/JspApplicationContext.java
tomcat/trunk/java/javax/servlet/jsp/tagext/TagAttributeInfo.java
Modified: tomcat/trunk/java/javax/el/ELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ELResolver.java?rev=1631568&r1=1631567&r2=1631568&view=diff
==
--- tomcat/trunk/java/javax/el/ELResolver.java (original)
+++ tomcat/trunk/java/javax/el/ELResolver.java Mon Oct 13 21:51:42 2014
@@ -29,6 +29,10 @@ public abstract class ELResolver {
public static final String RESOLVABLE_AT_DESIGN_TIME =
"resolvableAtDesignTime";
/**
+ * @param context The EL context for this evaluation
+ * @param base The base object on which the property is to be found
+ * @param property The property whose value is to be returned
+ * @return the value of the provided property
* @throws NullPointerException
* If the supplied context is null
* @throws PropertyNotFoundException
@@ -53,6 +57,10 @@ public abstract class ELResolver {
}
/**
+ * @param context The EL context for this evaluation
+ * @param base The base object on which the property is to be found
+ * @param property The property whose type is to be returned
+ * @return the type of the provided property
* @throws NullPointerException
* If the supplied context is null
* @throws PropertyNotFoundException
@@ -66,6 +74,10 @@ public abstract class ELResolver {
Object property);
/**
+ * @param context The EL context for this evaluation
+ * @param base The base object on which the property is to be found
+ * @param property The property whose value is to be set
+ * @param valueThe value to set the property to
* @throws NullPointerException
* If the supplied context is null
* @throws PropertyNotFoundException
@@ -82,6 +94,11 @@ public abstract class ELResolver {
Object property, Object value);
/**
+ * @param context The EL context for this evaluation
+ * @param base The base object on which the property is to be found
+ * @param property The property to be checked for read only status
+ * @return true if the identified property is read only,
+ * otherwise false
* @throws NullPointerException
* If the supplied context is null
* @throws PropertyNotFoundException
Modified: tomcat/trunk/java/javax/servlet/ServletContextAttributeListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletContextAttributeListener.java?rev=1631568&r1=1631567&r2=1631568&view=diff
==
--- tomcat/trunk/java/javax/servlet/ServletContextAttributeListener.java
(original)
+++ tomcat/trunk/java/javax/servlet/ServletContextAttributeListener.java Mon
Oct 13 21:51:42 2014
@@ -32,18 +32,21 @@ public interface ServletContextAttribute
/**
* Notification that a new attribute was added to the servlet context.
* Called after the attribute is added.
+ * @param scae Information about the new attribute
*/
-public void attributeAdded(ServletContextAttributeEvent scab);
+public void attributeAdded(ServletContextAttributeEvent scae);
/**
* Notification that an existing attribute has been removed from the
servlet
* context. Called after the attribute is removed.
+ * @param scae Information about the removed attribute
*/
-public void attributeRemoved(ServletContextAttributeEvent scab);
+public void attributeRemoved(ServletContextAttributeEvent scae);
/**
* Notification that an attribute on the servlet context has been replaced.
* Called after the attribute is replaced.
+ * @param scae Information about the replaced attribute
*/
-public void attributeReplaced(ServletContextAttributeEvent scab);
+public void attributeReplaced(ServletContextAttributeEvent scae);
}
Modified: tomcat/trunk/java/javax/servlet/ServletContextListener.java
URL:
htt
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/540 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1631520 Blamelist: markt Build succeeded! sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1631593 - in /tomcat/trunk/java/javax/servlet: Filter.java FilterChain.java FilterConfig.java FilterRegistration.java ServletContext.java
Author: markt
Date: Mon Oct 13 22:36:45 2014
New Revision: 1631593
URL: http://svn.apache.org/r1631593
Log:
Fix some Javadoc warnings when compiling with Java 8
Modified:
tomcat/trunk/java/javax/servlet/Filter.java
tomcat/trunk/java/javax/servlet/FilterChain.java
tomcat/trunk/java/javax/servlet/FilterConfig.java
tomcat/trunk/java/javax/servlet/FilterRegistration.java
tomcat/trunk/java/javax/servlet/ServletContext.java
Modified: tomcat/trunk/java/javax/servlet/Filter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/Filter.java?rev=1631593&r1=1631592&r2=1631593&view=diff
==
--- tomcat/trunk/java/javax/servlet/Filter.java (original)
+++ tomcat/trunk/java/javax/servlet/Filter.java Mon Oct 13 22:36:45 2014
@@ -49,12 +49,20 @@ public interface Filter {
* Called by the web container to indicate to a filter that it is being
* placed into service. The servlet container calls the init method exactly
* once after instantiating the filter. The init method must complete
- * successfully before the filter is asked to do any filtering work.
- *
+ * successfully before the filter is asked to do any filtering work.
+ *
* The web container cannot place the filter into service if the init
method
- * either
- * 1.Throws a ServletException
- * 2.Does not return within a time period defined by the web container
+ * either:
+ *
+ * Throws a ServletException
+ * Does not return within a time period defined by the web
+ * container
+ *
+ *
+ * @param filterConfig The configuration information associated with the
+ * filter instance being initialised
+ *
+ * @throws ServletException if the initialisation fails
*/
public void init(FilterConfig filterConfig) throws ServletException;
@@ -78,7 +86,17 @@ public interface Filter {
* next entity in the filter chain to block the request processing
* 5. Directly set headers on the response after invocation of the next
* entity in the filter chain.
- **/
+ *
+ * @param request The request to process
+ * @param response The response associated with the request
+ * @param chainProvides access to the next filter in the chain for this
+ * filter to pass the request and response to for further
+ * processing
+ *
+ * @throws IOException if an I/O error occurs during this filter's
+ * processing of the request
+ * @throws ServletException if the processing fails for any other reason
+ */
public void doFilter(ServletRequest request, ServletResponse response,
FilterChain chain) throws IOException, ServletException;
Modified: tomcat/trunk/java/javax/servlet/FilterChain.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/FilterChain.java?rev=1631593&r1=1631592&r2=1631593&view=diff
==
--- tomcat/trunk/java/javax/servlet/FilterChain.java (original)
+++ tomcat/trunk/java/javax/servlet/FilterChain.java Mon Oct 13 22:36:45 2014
@@ -41,6 +41,10 @@ public interface FilterChain {
* @param response
*the response to pass along the chain.
*
+ * @throws IOException if an I/O error occurs during the processing of the
+ * request
+ * @throws ServletException if the processing fails for any other reason
+
* @since 2.3
*/
public void doFilter(ServletRequest request, ServletResponse response)
Modified: tomcat/trunk/java/javax/servlet/FilterConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/FilterConfig.java?rev=1631593&r1=1631592&r2=1631593&view=diff
==
--- tomcat/trunk/java/javax/servlet/FilterConfig.java (original)
+++ tomcat/trunk/java/javax/servlet/FilterConfig.java Mon Oct 13 22:36:45 2014
@@ -30,8 +30,10 @@ import java.util.Enumeration;
public interface FilterConfig {
/**
- * Returns the filter-name of this filter as defined in the deployment
- * descriptor.
+ * Get the name of the filter.
+ *
+ * @return The filter-name of this filter as defined in the deployment
+ * descriptor.
*/
public String getFilterName();
Modified: tomcat/trunk/java/javax/servlet/FilterRegistration.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/FilterRegistration.java?rev=1631593&r1=1631592&r2=1631593&view=diff
==
--- tomcat/trunk/java/javax/servlet/FilterRegistration.java (original)
+++ tomcat/trunk/java/javax/servlet/FilterRegistration.java Mon Oct 13 22:36:45
2014
@@ -26,12 +26,19 @@ import java.util.EnumSet;
svn commit: r1631628 - in /tomcat/trunk: java/org/apache/catalina/ha/ClusterRuleSet.java java/org/apache/catalina/ha/session/ClusterManagerBase.java webapps/docs/changelog.xml webapps/docs/config/clus
Author: kfujino
Date: Tue Oct 14 06:08:49 2014
New Revision: 1631628
URL: http://svn.apache.org/r1631628
Log:
Add support for the SessionIdGenerator to cluster manager template.
Modified:
tomcat/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/cluster-manager.xml
Modified: tomcat/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java?rev=1631628&r1=1631627&r2=1631628&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java Tue Oct 14
06:08:49 2014
@@ -91,7 +91,13 @@ public class ClusterRuleSet extends Rule
digester.addSetNext(prefix + "Manager",
"setManagerTemplate",
"org.apache.catalina.ha.ClusterManager");
-
+digester.addObjectCreate(prefix + "Manager/SessionIdGenerator",
+"org.apache.catalina.util.StandardSessionIdGenerator",
+"className");
+digester.addSetProperties(prefix + "Manager/SessionIdGenerator");
+digester.addSetNext(prefix + "Manager/SessionIdGenerator",
+ "setSessionIdGenerator",
+ "org.apache.catalina.SessionIdGenerator");
digester.addObjectCreate(prefix + "Channel",
null, // MUST be specified in the element
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java?rev=1631628&r1=1631627&r2=1631628&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
Tue Oct 14 06:08:49 2014
@@ -24,6 +24,7 @@ import org.apache.catalina.Cluster;
import org.apache.catalina.Context;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.Loader;
+import org.apache.catalina.SessionIdGenerator;
import org.apache.catalina.Valve;
import org.apache.catalina.ha.CatalinaCluster;
import org.apache.catalina.ha.ClusterManager;
@@ -199,6 +200,17 @@ public abstract class ClusterManagerBase
copy.setSecureRandomClass(getSecureRandomClass());
copy.setSecureRandomProvider(getSecureRandomProvider());
copy.setSecureRandomAlgorithm(getSecureRandomAlgorithm());
+if (getSessionIdGenerator() != null) {
+try {
+SessionIdGenerator copyIdGenerator =
sessionIdGeneratorClass.newInstance();
+
copyIdGenerator.setSessionIdLength(getSessionIdGenerator().getSessionIdLength());
+
copyIdGenerator.setJvmRoute(getSessionIdGenerator().getJvmRoute());
+copy.setSessionIdGenerator(copyIdGenerator);
+} catch (InstantiationException | IllegalAccessException e) {
+ // Ignore
+}
+}
+
}
/**
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1631628&r1=1631627&r2=1631628&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Oct 14 06:08:49 2014
@@ -152,6 +152,14 @@
+
+
+
+Add support for the SessionIdGenerator to cluster manager
+template. (kfujino)
+
+
+
Modified: tomcat/trunk/webapps/docs/config/cluster-manager.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/cluster-manager.xml?rev=1631628&r1=1631627&r2=1631628&view=diff
==
--- tomcat/trunk/webapps/docs/config/cluster-manager.xml (original)
+++ tomcat/trunk/webapps/docs/config/cluster-manager.xml Tue Oct 14 06:08:49
2014
@@ -226,5 +226,21 @@
+
+ All Manager Implementations
+ All Manager implementations allow nesting of a
+ element. It defines
+ the behavior of session id generation. All implementations
+ of the SessionIdGenerator allow the
+ following attributes:
+
+
+
+ The length of the session ID may be changed with the
+ sessionIdLength attribute.
+
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Question of new SessionIdGenerator implementation.
I have a question of new SessionIdGenerator implementation. If reloading Manager( or Context), SessionIdGenerator is re-created based on sessionIdGeneratorClass that is cached to Manager. However, attributes of jvmRoute and sessionIdLength are default value. I think these attributes are need to take over when reloading. Or another workaround? -- Keiichi.Fujino
