Re: [VOTE][RESULT] Release Apache Tomcat 7.0.61
Hi, 2015-03-27 14:36 GMT+02:00 Violeta Georgieva violet...@apache.org: The proposed Apache Tomcat 7.0.61 release is now available for voting. It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.61/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1041/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_61/ The proposed 7.0.61 release is: [ ] Broken - do not release [ ] Stable - go ahead and release as 7.0.61 Stable The votes cast were +1 (binding): kkolinko, violetagg, rjung +1 (non-binding): Ognjen Blagojevic, fschumacher No other votes were cast. With three binding and two non-binding +1 votes this vote passes. I'll upload the release to the mirrors and announce it once the mirrors are OK. Regards, Violeta
svn commit: r8540 - /dev/tomcat/tomcat-7/v7.0.61/ /release/tomcat/tomcat-7/v7.0.61/
Author: violetagg Date: Tue Apr 7 06:39:43 2015 New Revision: 8540 Log: Release Tomcat 7.0.61 Added: release/tomcat/tomcat-7/v7.0.61/ - copied from r8539, dev/tomcat/tomcat-7/v7.0.61/ Removed: dev/tomcat/tomcat-7/v7.0.61/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
TC native proposal
I've been thinking about the responses to the recent tc-native - ALPN - HTTP/2 - Tomcat 9 thread [1]. I've also been looking at how tc-native currently pulls in the Java source and our previous discussions on how that is organised (e.g. [2], [3], [4]). While I think there are better ways to handle the Java side of tc-native, right now I'd rather put my effort into HTTP/2 support. Therefore, I'd like to make the following proposal: 1. Update tc-native trunk to use Java sources from tomcat/trunk (9.0.x) 2. Update tc-native 1.1.x to use Java sources from 8.0.x/trunk 3. Ensure 7.0.x/trunk and 6.0.x/trunk have identical Java sources to 8.0.x/trunk (but not adding new classes like SSLExt if not already present). 4. Deprecate the SSLExt and socket.* classes 5. Have tc-native trunk depend on OpenSSL 1.0.2 6. In tc-native trunk add support for ALPN to SSLContext [1] http://tomcat.markmail.org/thread/b2ubilnny36lbxha [2] http://tomcat.markmail.org/thread/3oksxa4izkiqwjn4 [3] http://tomcat.markmail.org/thread/dxskexh77tts4h5i [4] http://markmail.org/thread/hmzz4vdbjlejjhsb - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn propchange: r1671803 - svn:log
Author: kkolinko Revision: 1671803 Modified property: svn:log Modified: svn:log at Tue Apr 7 11:18:22 2015 -- --- svn:log (original) +++ svn:log Tue Apr 7 11:18:22 2015 @@ -1 +1 @@ -Copy current trunk with experimental NPN support to a brance since NPN support will be removed from trunk +Copy current trunk with experimental NPN support to a branch since NPN support will be removed from trunk - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: TC native proposal
On 07/04/2015 09:58, Mark Thomas wrote: I've been thinking about the responses to the recent tc-native - ALPN - HTTP/2 - Tomcat 9 thread [1]. I've also been looking at how tc-native currently pulls in the Java source and our previous discussions on how that is organised (e.g. [2], [3], [4]). While I think there are better ways to handle the Java side of tc-native, right now I'd rather put my effort into HTTP/2 support. Therefore, I'd like to make the following proposal: 1. Update tc-native trunk to use Java sources from tomcat/trunk (9.0.x) 2. Update tc-native 1.1.x to use Java sources from 8.0.x/trunk Ah. Change of plan since tc-native 1.1.x doesn't include SSLExt etc so we have never released a version of tc-native where these are working. 3. Ensure 7.0.x/trunk and 6.0.x/trunk have identical Java sources to 8.0.x/trunk (but not adding new classes like SSLExt if not already present). ... and ensure that the Java classes are aligned with the native ones in 1.1.x (i.e. remove SSLExt and friends). 4. Deprecate the SSLExt and socket.* classes Copy trunk to a branch (so we have these if we want to re-use bits) and remove these from trunk. 5. Have tc-native trunk depend on OpenSSL 1.0.2 6. In tc-native trunk add support for ALPN to SSLContext Mark [1] http://tomcat.markmail.org/thread/b2ubilnny36lbxha [2] http://tomcat.markmail.org/thread/3oksxa4izkiqwjn4 [3] http://tomcat.markmail.org/thread/dxskexh77tts4h5i [4] http://markmail.org/thread/hmzz4vdbjlejjhsb - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1671806 - in /tomcat/tc8.0.x/trunk: java/org/apache/coyote/spdy/ java/org/apache/tomcat/jni/SSLExt.java java/org/apache/tomcat/jni/socket/ java/org/apache/tomcat/spdy/ webapps/docs/change
Author: markt Date: Tue Apr 7 11:19:43 2015 New Revision: 1671806 URL: http://svn.apache.org/r1671806 Log: Remove the non-working (for quite some time) SDPY experiment. Note the code remains in trunk where it will be re-used as appropriate for the HTTP/2 implementation. Removed: tomcat/tc8.0.x/trunk/java/org/apache/coyote/spdy/ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/jni/SSLExt.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/jni/socket/ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/spdy/ Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1671806r1=1671805r2=1671806view=diff == --- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Tue Apr 7 11:19:43 2015 @@ -104,6 +104,12 @@ application is performing I/O on a non-container thread without using the Servlet 3+ asynchronous API. (markt) /fix + scode +Remove the experimental support for SPDY. No current user agent supports +the version of SPDY that the experiment targetted. Note: HTTP/2 support +is under development for Tomcat 9 and may be back-ported to Tomcat 8 +once complete. (markt) + /scode /changelog /subsection subsection name=Cluster - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1671809 - in /tomcat/tc8.0.x/trunk/java/org/apache: coyote/ajp/ coyote/http11/ tomcat/util/net/
Author: markt
Date: Tue Apr 7 11:26:24 2015
New Revision: 1671809
URL: http://svn.apache.org/r1671809
Log:
Remove NPN plumbing used by experimental SPDY support.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java
tomcat/tc8.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11Protocol.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified: tomcat/tc8.0.x/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java?rev=1671809r1=1671808r2=1671809view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java Tue
Apr 7 11:26:24 2015
@@ -16,8 +16,6 @@
*/
package org.apache.coyote.ajp;
-import javax.net.ssl.SSLEngine;
-
import org.apache.coyote.AbstractProtocol;
import org.apache.coyote.Processor;
import org.apache.juli.logging.Log;
@@ -150,10 +148,6 @@ public class AjpNio2Protocol extends Abs
}
@Override
-public void onCreateSSLEngine(SSLEngine engine) {
-}
-
-@Override
public void closeAll() {
for (Nio2Channel channel : connections.keySet()) {
((Nio2Endpoint)
proto.endpoint).closeSocket(channel.getSocket(), SocketStatus.STOP);
Modified: tomcat/tc8.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java?rev=1671809r1=1671808r2=1671809view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java Tue Apr
7 11:26:24 2015
@@ -19,8 +19,6 @@ package org.apache.coyote.ajp;
import java.nio.channels.SocketChannel;
import java.util.Iterator;
-import javax.net.ssl.SSLEngine;
-
import org.apache.coyote.AbstractProtocol;
import org.apache.coyote.Processor;
import org.apache.juli.logging.Log;
@@ -177,9 +175,5 @@ public class AjpNioProtocol extends Abst
register(processor);
return processor;
}
-
-@Override
-public void onCreateSSLEngine(SSLEngine engine) {
-}
}
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1671809r1=1671808r2=1671809view=diff
==
---
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
Tue Apr 7 11:26:24 2015
@@ -270,17 +270,6 @@ public abstract class AbstractHttp11Prot
endpoint.setMaxKeepAliveRequests(mkar);
}
-protected NpnHandlerS npnHandler;
-@SuppressWarnings(unchecked)
-public void setNpnHandler(String impl) {
-try {
-Class? c = Class.forName(impl);
-npnHandler = (NpnHandlerS) c.newInstance();
-} catch (Exception ex) {
-getLog().warn(Failed to init light protocol + impl, ex);
-}
-}
-
// - Common
code
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1671809r1=1671808r2=1671809view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
Tue Apr 7 11:26:24 2015
@@ -211,15 +211,6 @@ public class Http11AprProtocol extends A
}
-@Override
-public void start() throws Exception {
-super.start();
-if (npnHandler != null) {
-long sslCtx = ((AprEndpoint) endpoint).getJniSslContext();
-npnHandler.init(endpoint, sslCtx, getAdapter());
-}
-}
-
// Connection handler
protected static class
svn commit: r1671801 - in /tomcat/native/branches/1.1.x: build.properties.default build.xml native/include/tcn_version.h native/os/win32/libtcnative.rc
Author: markt
Date: Tue Apr 7 11:07:12 2015
New Revision: 1671801
URL: http://svn.apache.org/r1671801
Log:
Update version numbers for next release (1.1.34)
Modified:
tomcat/native/branches/1.1.x/build.properties.default
tomcat/native/branches/1.1.x/build.xml
tomcat/native/branches/1.1.x/native/include/tcn_version.h
tomcat/native/branches/1.1.x/native/os/win32/libtcnative.rc
Modified: tomcat/native/branches/1.1.x/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/build.properties.default?rev=1671801r1=1671800r2=1671801view=diff
==
--- tomcat/native/branches/1.1.x/build.properties.default (original)
+++ tomcat/native/branches/1.1.x/build.properties.default Tue Apr 7 11:07:12
2015
@@ -18,7 +18,7 @@
# - Version Control Flags -
version.major=1
version.minor=1
-version.build=33
+version.build=34
version.patch=0
version.suffix=-dev
Modified: tomcat/native/branches/1.1.x/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/build.xml?rev=1671801r1=1671800r2=1671801view=diff
==
--- tomcat/native/branches/1.1.x/build.xml (original)
+++ tomcat/native/branches/1.1.x/build.xml Tue Apr 7 11:07:12 2015
@@ -33,7 +33,7 @@
property name=year value=2015 /
property name=version.major value=1 /
property name=version.minor value=1 /
-property name=version.build value=31 /
+property name=version.build value=34 /
property name=version.patch value=0 /
property name=version.suffixvalue= /
Modified: tomcat/native/branches/1.1.x/native/include/tcn_version.h
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/include/tcn_version.h?rev=1671801r1=1671800r2=1671801view=diff
==
--- tomcat/native/branches/1.1.x/native/include/tcn_version.h (original)
+++ tomcat/native/branches/1.1.x/native/include/tcn_version.h Tue Apr 7
11:07:12 2015
@@ -69,7 +69,7 @@ extern C {
#define TCN_MINOR_VERSION 1
/** patch level */
-#define TCN_PATCH_VERSION 33
+#define TCN_PATCH_VERSION 34
/**
* This symbol is defined for internal, development copies of TCN. This
Modified: tomcat/native/branches/1.1.x/native/os/win32/libtcnative.rc
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/os/win32/libtcnative.rc?rev=1671801r1=1671800r2=1671801view=diff
==
--- tomcat/native/branches/1.1.x/native/os/win32/libtcnative.rc (original)
+++ tomcat/native/branches/1.1.x/native/os/win32/libtcnative.rc Tue Apr 7
11:07:12 2015
@@ -20,7 +20,7 @@ LANGUAGE 0x9,0x1
See the License for the specific language governing \
permissions and limitations under the License.
-#define TCN_VERSION 1.1.33
+#define TCN_VERSION 1.1.34
1000 ICON apache.ico
1001 DIALOGEX 0, 0, 252, 51
@@ -36,8 +36,8 @@ BEGIN
END
1 VERSIONINFO
- FILEVERSION 1,1,33,0
- PRODUCTVERSION 1,1,33,0
+ FILEVERSION 1,1,34,0
+ PRODUCTVERSION 1,1,34,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1671803 - /tomcat/native/branches/experimental-npn/
Author: markt Date: Tue Apr 7 11:09:37 2015 New Revision: 1671803 URL: http://svn.apache.org/r1671803 Log: Copy current trunk with experimental NPN support to a brance since NPN support will be removed from trunk Added: tomcat/native/branches/experimental-npn/ - copied from r1671802, tomcat/native/trunk/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1671805 - in /tomcat/native/branches/1.1.x: java/org/apache/tomcat/ jnirelease.sh
Author: markt Date: Tue Apr 7 11:11:48 2015 New Revision: 1671805 URL: http://svn.apache.org/r1671805 Log: Use the Java code from Tomcat 8.0.x for tc-native 1.1.x. Modified: tomcat/native/branches/1.1.x/java/org/apache/tomcat/ (props changed) tomcat/native/branches/1.1.x/jnirelease.sh Propchange: tomcat/native/branches/1.1.x/java/org/apache/tomcat/ -- --- svn:externals (original) +++ svn:externals Tue Apr 7 11:11:48 2015 @@ -1 +1 @@ -^/tomcat/trunk/java/org/apache/tomcat/jni@1659384 jni +^/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/jni@1659384 jni Modified: tomcat/native/branches/1.1.x/jnirelease.sh URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/jnirelease.sh?rev=1671805r1=1671804r2=1671805view=diff == --- tomcat/native/branches/1.1.x/jnirelease.sh (original) +++ tomcat/native/branches/1.1.x/jnirelease.sh Tue Apr 7 11:11:48 2015 @@ -27,7 +27,7 @@ apr_src_dir=`pwd`/native/srclib/apr JKJNIEXT= JKJNIVER= SVNBASE=https://svn.apache.org/repos/asf/tomcat/native -TCTRUNK_SVNBASE=https://svn.apache.org/repos/asf/tomcat/trunk +TCTRUNK_SVNBASE=https://svn.apache.org/repos/asf/tomcat/tc8.0.x/trunk # Set the environment variable that stops OSX storing extended # attributes in tar archives etc. with a file starting with ._ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-tc8.0.x-test-nio2 (in module tomcat-8.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc8.0.x-test-nio2 has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc8.0.x-test-nio2 : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/logs-NIO2 -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2 (Type: Build) Work ended in a state of : Failed Elapsed: 43 mins 11 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-NIO2 -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150407-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150407.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150407-native-src.tar.gz -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20150407/bin /openssl -Dexecute.test.bio=false -Dexecute.test.apr=false -Dtest.excludePerformance=true -Dexecute.test.nio2=true -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-8.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/bu ild/lib/tomcat
Re: svn commit: r1671809 - in /tomcat/tc8.0.x/trunk/java/org/apache: coyote/ajp/ coyote/http11/ tomcat/util/net/
2015-04-07 14:26 GMT+03:00 ma...@apache.org:
Author: markt
Date: Tue Apr 7 11:26:24 2015
New Revision: 1671809
URL: http://svn.apache.org/r1671809
Log:
Remove NPN plumbing used by experimental SPDY support.
Don't forget to also remove NPN library download option,
(build.properties.default, build.xml)
# NPN support
npn.version=8.1.2.v20120308
npn.home=${base.path}/npn-${npn.version}
npn.jar=${npn.home}/npn-${npn.version}.jar
npn.loc=http://repo1.maven.org/maven2/org/eclipse/jetty/npn/npn-api/${npn.version}/npn-api-${npn.version}.jar
etc.
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1671846 - /tomcat/tc8.0.x/trunk/java/org/apache/tomcat/jni/Poll.java
Author: markt
Date: Tue Apr 7 13:49:37 2015
New Revision: 1671846
URL: http://svn.apache.org/r1671846
Log:
Align with tomcat-native 1.1.x
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/jni/Poll.java
Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/jni/Poll.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/jni/Poll.java?rev=1671846r1=1671845r2=1671846view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/jni/Poll.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/jni/Poll.java Tue Apr 7
13:49:37 2015
@@ -163,21 +163,4 @@ public class Poll {
* or negative APR error code.
*/
public static native int pollset(long pollset, long [] descriptors);
-
-/**
- * Make poll() return.
- *
- * @param pollset
- * @return Negative APR error code
- */
-public static native int interrupt(long pollset);
-
-/**
- * Check if interrupt() is allowed.
- *
- * @param pollset
- * @return codetrue/code if {@link #interrupt(long)} is allowed, else
- * codefalse/code
- */
-public static native boolean wakeable(long pollset);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1671852 - in /tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni: Buffer.java Thread.java
Author: markt Date: Tue Apr 7 14:10:00 2015 New Revision: 1671852 URL: http://svn.apache.org/r1671852 Log: Add new classes available in tomcat-native 1.1.x Added: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Buffer.java - copied unchanged from r1671754, tomcat/tc8.0.x/trunk/java/org/apache/tomcat/jni/Buffer.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Thread.java - copied unchanged from r1671754, tomcat/tc8.0.x/trunk/java/org/apache/tomcat/jni/Thread.java - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 7.0.61
Violetta, On 3/27/15 8:36 AM, Violeta Georgieva wrote: The proposed Apache Tomcat 7.0.61 release is now available for voting. It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.61/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1041/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_61/ The proposed 7.0.61 release is: [ ] Broken - do not release [X] Stable - go ahead and release as 7.0.61 Stable Works fine with a development web application, using AjpNioProtocol and Http11NioProtocol connectors. Details: * Environment * Java (build): java version 1.6.0_26 Java(TM) SE Runtime Environment (build 1.6.0_26-b03) Java HotSpot(TM) 64-Bit Server VM (build 20.1-b02, mixed mode) * Java (test): java version 1.7.0_76 Java(TM) SE Runtime Environment (build 1.7.0_76-b13) Java HotSpot(TM) 64-Bit Server VM (build 24.76-b04, mixed mode) * OS: Linux 2.6.32-312-ec2 x86_64 * cc: cc (Debian 4.7.2-5) 4.7.2 * make: GNU Make 3.81 * OpenSSL: OpenSSL 1.0.1e 11 Feb 2013 * APR: 1.4.6 * * Valid MD5 signature for apache-tomcat-7.0.61.zip * Valid GPG signature for apache-tomcat-7.0.61.zip * Valid MD5 signature for apache-tomcat-7.0.61.tar.gz * Valid GPG signature for apache-tomcat-7.0.61.tar.gz * Valid MD5 signature for apache-tomcat-7.0.61.exe * Valid GPG signature for apache-tomcat-7.0.61.exe * Valid MD5 signature for apache-tomcat-7.0.61-src.zip * Valid GPG signature for apache-tomcat-7.0.61-src.zip * Valid MD5 signature for apache-tomcat-7.0.61-src.tar.gz * Valid GPG signature for apache-tomcat-7.0.61-src.tar.gz * * Binary Zip and tarball: Same * Source Zip and tarball: Same * * Building dependencies returned: 0 * tcnative builds cleanly * Tomcat builds cleanly * Junit Tests: FAILED * * Tests that failed: (Expected, since multicast is not enabled) org.apache.catalina.session.TestStandardSession.APR.txt org.apache.catalina.session.TestStandardSession.BIO.txt org.apache.catalina.session.TestStandardSession.NIO.txt org.apache.catalina.tribes.group.TestGroupChannelMemberArrival.APR.txt org.apache.catalina.tribes.group.TestGroupChannelMemberArrival.BIO.txt org.apache.catalina.tribes.group.TestGroupChannelMemberArrival.NIO.txt org.apache.catalina.tribes.group.TestGroupChannelSenderConnections.APR.txt org.apache.catalina.tribes.group.TestGroupChannelSenderConnections.BIO.txt org.apache.catalina.tribes.group.TestGroupChannelSenderConnections.NIO.txt org.apache.catalina.tribes.group.TestGroupChannelStartStop.APR.txt org.apache.catalina.tribes.group.TestGroupChannelStartStop.BIO.txt org.apache.catalina.tribes.group.TestGroupChannelStartStop.NIO.txt org.apache.catalina.tribes.group.interceptors.TestNonBlockingCoordinator.APR.txt org.apache.catalina.tribes.group.interceptors.TestNonBlockingCoordinator.BIO.txt org.apache.catalina.tribes.group.interceptors.TestNonBlockingCoordinator.NIO.txt org.apache.catalina.tribes.group.interceptors.TestOrderInterceptor.APR.txt org.apache.catalina.tribes.group.interceptors.TestOrderInterceptor.BIO.txt org.apache.catalina.tribes.group.interceptors.TestOrderInterceptor.NIO.txt org.apache.catalina.tribes.group.interceptors.TestTcpFailureDetector.APR.txt org.apache.catalina.tribes.group.interceptors.TestTcpFailureDetector.BIO.txt org.apache.catalina.tribes.group.interceptors.TestTcpFailureDetector.NIO.txt signature.asc Description: OpenPGP digital signature
svn commit: r1671870 - in /tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni: Address.java Library.java
Author: markt
Date: Tue Apr 7 15:08:39 2015
New Revision: 1671870
URL: http://svn.apache.org/r1671870
Log:
CTR: Whitespace/keyword ordering to align with 7.0.x and 8.0.x
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Address.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Library.java
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Address.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Address.java?rev=1671870r1=1671869r2=1671870view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Address.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Address.java Tue Apr 7
15:08:39 2015
@@ -21,7 +21,6 @@ package org.apache.tomcat.jni;
*
* @author Mladen Turk
*/
-
public class Address {
static public String APR_ANYADDR = 0.0.0.0;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Library.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Library.java?rev=1671870r1=1671869r2=1671870view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Library.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Library.java Tue Apr 7
15:08:39 2015
@@ -28,7 +28,7 @@ public final class Library {
/*
* A handle to the unique Library singleton instance.
*/
-static private Library _instance = null;
+private static Library _instance = null;
private Library()
{
@@ -149,7 +149,7 @@ public final class Library {
* called for any APR library.
* @param libraryName the name of the library to load
*/
-static public boolean initialize(String libraryName)
+public static boolean initialize(String libraryName)
throws Exception
{
if (_instance == null) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1671855 - in /tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni: File.java Global.java Lock.java Multicast.java Poll.java Pool.java Procattr.java SSLContext.java SSLSocket.java Shm.java Soc
Author: markt
Date: Tue Apr 7 14:19:36 2015
New Revision: 1671855
URL: http://svn.apache.org/r1671855
Log:
Align with 8.0.x - Javadoc fixes
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/File.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Global.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Lock.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Multicast.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Poll.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Pool.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Procattr.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/SSLContext.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/SSLSocket.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Shm.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Socket.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Status.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Stdlib.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Time.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/File.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/File.java?rev=1671855r1=1671854r2=1671855view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/File.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/File.java Tue Apr 7
14:19:36 2015
@@ -58,7 +58,7 @@ public class File {
*/
public static final int APR_FOPEN_SENDFILE_ENABLED = 0x01000;
/** Platform dependent flag to enable large file support;
- * br /bWarning :/b The APR_LARGEFILE flag only has effect on some
platforms
+ * brbWarning :/b The APR_LARGEFILE flag only has effect on some
platforms
* where sizeof(apr_off_t) == 4. Where implemented, it allows opening
* and writing to a file which exceeds the size which can be
* represented by apr_off_t (2 gigabytes). When a file's size does
@@ -107,7 +107,7 @@ public class File {
/* apr_filetype_e values for the filetype member of the
* apr_file_info_t structure
- * br /bWarning :/b: Not all of the filetypes below can be
determined.
+ * brbWarning :/b: Not all of the filetypes below can be determined.
* For example, a given platform might not correctly report
* a socket descriptor as APR_SOCK if that type isn't
* well-identified on that platform. In such cases where
@@ -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; /** -gt;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 */
@@ -263,7 +263,7 @@ public class File {
/**
* Rename the specified file.
- * br /bWarning :/b If a file exists at the new location, then it
will be
+ * brbWarning :/b If a file exists at the new location, then it will
be
* overwritten. Moving files or directories across devices may not be
* possible.
* @param fromPath The full path to the original file (using / on all
systems)
@@ -275,7 +275,7 @@ public class File {
/**
* Copy the specified file to another file.
* The new file does not need to exist, it will be created if required.
- * br /bWarning :/b If the new file already exists, its contents
will be overwritten.
+ * brbWarning :/b If the new file already exists, its contents will
be overwritten.
* @param fromPath The full path to the original file (using / on all
systems)
* @param toPath The full path to the new file (using / on all systems)
* @param perms Access permissions for the new file if it is created.
@@ -562,10 +562,10 @@ public class File {
/**
* Set the specified file's permission bits.
- * br /bWarning :/b Some platforms may not be able to apply all of
the
+ * brbWarning :/b Some platforms may not be able to apply all of the
* available permission bits; APR_INCOMPLETE will be returned if some
* permissions are specified which could not be set.
- * br /bWarning :/b Platforms which do not implement this feature
will return
+ * brbWarning :/b Platforms which do not implement this feature will
return
* APR_ENOTIMPL.
* @param fname The file (name) to apply the permissions to.
* @param perms The permission bits to apply to the file.
@@ -579,7 +579,7 @@ public class File {
* of the file
buildbot exception in ASF Buildbot on tomcat-8-trunk
The Buildbot has detected a build exception on builder tomcat-8-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-8-trunk/builds/202 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' triggered this build Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1671809 Blamelist: markt BUILD FAILED: exception upload_2 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1671848 - /tomcat/tc8.0.x/trunk/java/org/apache/tomcat/jni/Library.java
Author: markt
Date: Tue Apr 7 13:50:25 2015
New Revision: 1671848
URL: http://svn.apache.org/r1671848
Log:
Remove Java 7 feature so we can use the same Java code for tomcat-native in
Tomcat 6, 7 8.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/jni/Library.java
Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/jni/Library.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/jni/Library.java?rev=1671848r1=1671847r2=1671848view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/jni/Library.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/jni/Library.java Tue Apr 7
13:50:25 2015
@@ -41,7 +41,11 @@ public final class Library {
try {
System.loadLibrary(NAMES[i]);
loaded = true;
-} catch (ThreadDeath | VirtualMachineError t) {
+} catch (ThreadDeath t) {
+throw t;
+} catch (VirtualMachineError t) {
+// Don't use a Java 7 multiple exception catch so we can keep
+// the JNI code identical between Tomcat 6/7/8
throw t;
} catch (Throwable t) {
String name = System.mapLibraryName(NAMES[i]);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56108] Allow user-defined Diffie-Hellman parameters (secure DH-Cipher)
https://bz.apache.org/bugzilla/show_bug.cgi?id=56108 bpoy...@ccac.edu changed: What|Removed |Added CC||bpoy...@ccac.edu -- 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: r1671840 - in /tomcat/tc8.0.x/trunk: ./ conf/ java/org/apache/coyote/http11/ res/checkstyle/ res/maven/ webapps/docs/
Author: markt
Date: Tue Apr 7 13:27:39 2015
New Revision: 1671840
URL: http://svn.apache.org/r1671840
Log:
Remove remaining references to SPDY and NPN from 8.0.x
Removed:
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/NpnHandler.java
tomcat/tc8.0.x/trunk/res/maven/tomcat-spdy.pom
Modified:
tomcat/tc8.0.x/trunk/RELEASE-NOTES
tomcat/tc8.0.x/trunk/build.properties.default
tomcat/tc8.0.x/trunk/build.xml
tomcat/tc8.0.x/trunk/conf/catalina.properties
tomcat/tc8.0.x/trunk/res/checkstyle/org-import-control.xml
tomcat/tc8.0.x/trunk/res/maven/mvn-pub.xml
tomcat/tc8.0.x/trunk/webapps/docs/class-loader-howto.xml
Modified: tomcat/tc8.0.x/trunk/RELEASE-NOTES
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/RELEASE-NOTES?rev=1671840r1=1671839r2=1671840view=diff
==
--- tomcat/tc8.0.x/trunk/RELEASE-NOTES (original)
+++ tomcat/tc8.0.x/trunk/RELEASE-NOTES Tue Apr 7 13:27:39 2015
@@ -83,7 +83,6 @@ for use by web applications (by placing
* tomcat-dbcp.jar (package renamed database connection pool based on Commons
DBCP)
* tomcat-jdbc.jar (Tomcat's database connection pooling solution)
* tomcat-jni.jar (Interface to the native component of the APR/native
connector)
-* tomcat-spdy.jar (SPDY implementation)
* tomcat-util.jar (Various utilities)
* tomcat-websocket.jar (WebSocket 1.1 implementation)
* websocket-api.jar (WebSocket 1.1 API)
Modified: tomcat/tc8.0.x/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/build.properties.default?rev=1671840r1=1671839r2=1671840view=diff
==
--- tomcat/tc8.0.x/trunk/build.properties.default (original)
+++ tomcat/tc8.0.x/trunk/build.properties.default Tue Apr 7 13:27:39 2015
@@ -145,12 +145,6 @@ jdt.jar=${jdt.home}/ecj-${jdt.version}.j
jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
-# NPN support
-npn.version=8.1.2.v20120308
-npn.home=${base.path}/npn-${npn.version}
-npn.jar=${npn.home}/npn-${npn.version}.jar
-npn.loc=http://repo1.maven.org/maven2/org/eclipse/jetty/npn/npn-api/${npn.version}/npn-api-${npn.version}.jar
-
# - Tomcat native library -
tomcat-native.version=1.1.33
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
Modified: tomcat/tc8.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/build.xml?rev=1671840r1=1671839r2=1671840view=diff
==
--- tomcat/tc8.0.x/trunk/build.xml (original)
+++ tomcat/tc8.0.x/trunk/build.xml Tue Apr 7 13:27:39 2015
@@ -100,7 +100,6 @@
property name=tomcat-coyote.jar
value=${tomcat.build}/lib/tomcat-coyote.jar/
property name=tomcat-dbcp.jar
value=${tomcat.build}/lib/tomcat-dbcp.jar/
property name=tomcat-jni.jar value=${tomcat.build}/lib/tomcat-jni.jar/
- property name=tomcat-spdy.jar
value=${tomcat.build}/lib/tomcat-spdy.jar/
property name=tomcat-api.jar value=${tomcat.build}/lib/tomcat-api.jar/
property name=tomcat-util.jar
value=${tomcat.build}/lib/tomcat-util.jar/
property name=tomcat-util-scan.jar
value=${tomcat.build}/lib/tomcat-util-scan.jar/
@@ -124,7 +123,6 @@
property name=catalina-ant-src.jar
value=${tomcat.src.jars}/catalina-ant-src.jar/
property name=catalina-storeconfig-src.jar
value=${tomcat.src.jars}/catalina-storeconfig-src.jar/
property name=tomcat-jni-src.jar
value=${tomcat.src.jars}/tomcat-jni-src.jar/
- property name=tomcat-spdy-src.jar
value=${tomcat.src.jars}/tomcat-spdy-src.jar/
property name=tomcat-coyote-src.jar
value=${tomcat.src.jars}/tomcat-coyote-src.jar/
property name=tomcat-dbcp-src.jar
value=${tomcat.src.jars}/tomcat-dbcp-src.jar/
property name=tomcat-api-src.jar
value=${tomcat.src.jars}/tomcat-api-src.jar/
@@ -194,12 +192,9 @@
defaultexcludes remove=**/.gitignore /
!--defaultexcludes echo=true /--
- available file=${npn.jar} property=npn.exists /
-
!-- Classpaths --
path id=compile.classpath
pathelement location=${jdt.jar}/
-pathelement location=${npn.jar}/
/path
path id=tomcat.classpath
@@ -347,7 +342,6 @@
exclude name=org/apache/tomcat/buildutil /
exclude name=org/apache/tomcat/dbcp /
exclude name=org/apache/tomcat/jni /
-exclude name=org/apache/tomcat/spdy /
exclude name=org/apache/tomcat/util /
exclude name=org/apache/tomcat/websocket /
/patternset
@@ -412,8 +406,6 @@
patternset id=files.tomcat-coyote
include name=org/apache/coyote/** /
-!-- Included in tomcat-spdy --
-exclude name=org/apache/coyote/spdy/** /
!-- Remaining tomcat-util packages --
include name=org/apache/tomcat/util/bcel/** /
include
svn commit: r1671864 - /tomcat/tc8.0.x/trunk/java/org/apache/tomcat/jni/Library.java
Author: markt
Date: Tue Apr 7 14:57:45 2015
New Revision: 1671864
URL: http://svn.apache.org/r1671864
Log:
Java 6 compatibility
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/jni/Library.java
Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/jni/Library.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/jni/Library.java?rev=1671864r1=1671863r2=1671864view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/jni/Library.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/jni/Library.java Tue Apr 7
14:57:45 2015
@@ -47,7 +47,7 @@ public final class Library {
// Don't use a Java 7 multiple exception catch so we can keep
// the JNI code identical between Tomcat 6/7/8
throw t;
-} catch (Throwable t) {
+} catch (Exception t) {
String name = System.mapLibraryName(NAMES[i]);
for (int j = 0; j paths.length; j++) {
java.io.File fd = new java.io.File(paths[j] , name);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1671865 - /tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Library.java
Author: markt
Date: Tue Apr 7 14:57:54 2015
New Revision: 1671865
URL: http://svn.apache.org/r1671865
Log:
Java 6 compatibility
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Library.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Library.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Library.java?rev=1671865r1=1671864r2=1671865view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Library.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Library.java Tue Apr 7
14:57:54 2015
@@ -47,7 +47,7 @@ public final class Library {
// Don't use a Java 7 multiple exception catch so we can keep
// the JNI code identical between Tomcat 6/7/8
throw t;
-} catch (Throwable t) {
+} catch (Exception t) {
String name = System.mapLibraryName(NAMES[i]);
for (int j = 0; j paths.length; j++) {
java.io.File fd = new java.io.File(paths[j] , name);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1671809 - in /tomcat/tc8.0.x/trunk/java/org/apache: coyote/ajp/ coyote/http11/ tomcat/util/net/
On 07/04/2015 13:17, Konstantin Kolinko wrote:
2015-04-07 14:26 GMT+03:00 ma...@apache.org:
Author: markt
Date: Tue Apr 7 11:26:24 2015
New Revision: 1671809
URL: http://svn.apache.org/r1671809
Log:
Remove NPN plumbing used by experimental SPDY support.
Don't forget to also remove NPN library download option,
(build.properties.default, build.xml)
Thanks. I missed that. I'll do a search for npn so see if I missed
anything else.
Mark
# NPN support
npn.version=8.1.2.v20120308
npn.home=${base.path}/npn-${npn.version}
npn.jar=${npn.home}/npn-${npn.version}.jar
npn.loc=http://repo1.maven.org/maven2/org/eclipse/jetty/npn/npn-api/${npn.version}/npn-api-${npn.version}.jar
etc.
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a new failure on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/613 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' triggered this build Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1671855 Blamelist: markt BUILD FAILED: failed compile Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1671866 - /tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/
Author: markt
Date: Tue Apr 7 15:05:41 2015
New Revision: 1671866
URL: http://svn.apache.org/r1671866
Log:
CTR: Javadoc / whitespace updates to align with 7.0.x and 8.0.x
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Address.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/BIOCallback.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Directory.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Error.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/File.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/FileInfo.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Global.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Library.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Local.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Lock.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Mmap.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Multicast.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/OS.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/PasswordCallback.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Poll.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Pool.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/PoolCallback.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Proc.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/ProcErrorCallback.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Procattr.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Registry.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/SSL.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/SSLContext.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/SSLSocket.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Shm.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Sockaddr.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Socket.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Status.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Stdlib.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Time.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/User.java
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Address.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Address.java?rev=1671866r1=1671865r2=1671866view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Address.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Address.java Tue Apr 7
15:05:41 2015
@@ -20,7 +20,6 @@ package org.apache.tomcat.jni;
/** Address
*
* @author Mladen Turk
- *
*/
public class Address {
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/BIOCallback.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/BIOCallback.java?rev=1671866r1=1671865r2=1671866view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/BIOCallback.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/BIOCallback.java Tue Apr 7
15:05:41 2015
@@ -20,14 +20,13 @@ package org.apache.tomcat.jni;
/** Open SSL BIO Callback Interface
*
* @author Mladen Turk
- *
*/
public interface BIOCallback {
/**
* Write data
- * @param buf containg the bytes to write.
+ * @param buf containing the bytes to write.
* @return Number of characters written.
*/
public int write(byte [] buf);
@@ -49,7 +48,7 @@ public interface BIOCallback {
/**
* Read string up to the len or CLRLF
* @param len Maximum number of characters to read
- * @return String with up to len bytes readed
+ * @return String with up to len bytes read
*/
public String gets(int len);
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Directory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Directory.java?rev=1671866r1=1671865r2=1671866view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Directory.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Directory.java Tue Apr 7
15:05:41 2015
@@ -20,7 +20,6 @@ package org.apache.tomcat.jni;
/** Directory
*
* @author Mladen Turk
- *
*/
public class Directory {
@@ -28,7 +27,7 @@ public class Directory {
/**
* Create a new directory on the file system.
* @param path the path for the directory to be created. (use / on all
systems)
- * @param perm Permissions for the new direcoty.
+ * @param perm Permissions for the new directory.
* @param pool the pool to use.
*/
public static native int make(String path, int perm, long pool);
@@ -37,7 +36,7 @@ public class Directory {
* 'mkdir -p'.
buildbot exception in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a build exception on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/614 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' triggered this build Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1671865 Blamelist: markt BUILD FAILED: exception upload_2 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1671854 - in /tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni: Error.java Library.java SSL.java
Author: markt
Date: Tue Apr 7 14:18:42 2015
New Revision: 1671854
URL: http://svn.apache.org/r1671854
Log:
Align implementation with 8.0.x (use final, add some new constants, throw
Exception rather than Throwable)
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Error.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Library.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/SSL.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Error.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Error.java?rev=1671854r1=1671853r2=1671854view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Error.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Error.java Tue Apr 7
14:18:42 2015
@@ -28,12 +28,12 @@ public class Error extends Exception {
/**
* APR error type.
*/
-private int error;
+private final int error;
/**
* A description of the problem.
*/
-private String description;
+private final String description;
/**
* Construct an APRException.
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Library.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Library.java?rev=1671854r1=1671853r2=1671854view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Library.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Library.java Tue Apr 7
14:18:42 2015
@@ -26,13 +26,13 @@ import java.io.File;
public final class Library {
/* Default library names */
-private static String [] NAMES = {tcnative-1, libtcnative-1};
+private static final String [] NAMES = {tcnative-1, libtcnative-1};
/*
* A handle to the unique Library singleton instance.
*/
private static Library _instance = null;
-private Library() throws Throwable {
+private Library() throws Exception {
boolean loaded = false;
String path = System.getProperty(java.library.path);
String [] paths = path.split(File.pathSeparator);
@@ -44,6 +44,8 @@ public final class Library {
} catch (ThreadDeath t) {
throw t;
} catch (VirtualMachineError t) {
+// Don't use a Java 7 multiple exception catch so we can keep
+// the JNI code identical between Tomcat 6/7/8
throw t;
} catch (Throwable t) {
String name = System.mapLibraryName(NAMES[i]);
@@ -166,7 +168,7 @@ public final class Library {
* @param libraryName the name of the library to load
*/
public static boolean initialize(String libraryName)
-throws Throwable
+throws Exception
{
if (_instance == null) {
if (libraryName == null)
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/SSL.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/SSL.java?rev=1671854r1=1671853r2=1671854view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/SSL.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/SSL.java Tue Apr 7
14:18:42 2015
@@ -139,6 +139,10 @@ public final class SSL {
public static final int SSL_OP_NO_SSLv2 =
0x0100;
public static final int SSL_OP_NO_SSLv3 =
0x0200;
public static final int SSL_OP_NO_TLSv1 =
0x0400;
+public static final int SSL_OP_NO_TLSv1_2 =
0x0800;
+public static final int SSL_OP_NO_TLSv1_1 =
0x1000;
+
+public static final int SSL_OP_NO_TICKET=
0x4000;
// SSL_OP_PKCS1_CHECK_1 and SSL_OP_PKCS1_CHECK_2 flags are unsupported
// in the current version of OpenSSL library. See ssl.h changes in commit
@@ -329,7 +333,7 @@ public final class SSL {
/**
* Generate temporary RSA key.
- * br /
+ * br
* Index can be one of:
* PRE
* SSL_TMP_KEY_RSA_512
@@ -345,7 +349,7 @@ public final class SSL {
/**
* Load temporary DSA key from file
- * br /
+ * br
* Index can be one of:
* PRE
* SSL_TMP_KEY_DH_512
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1671886 - /tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
Author: remm
Date: Tue Apr 7 16:43:58 2015
New Revision: 1671886
URL: http://svn.apache.org/r1671886
Log:
- Start experimenting with a state wrapper over NIO2 for scatter/gather
operations.
- This effectively bypasses the processor (the completion handler would get to
call it if it wants to).
- All in a single block for easy removal if not useful in the end.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1671886r1=1671885r2=1671886view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Tue Apr 7
16:43:58 2015
@@ -31,6 +31,8 @@ import java.nio.channels.AsynchronousSoc
import java.nio.channels.ClosedChannelException;
import java.nio.channels.CompletionHandler;
import java.nio.channels.FileChannel;
+import java.nio.channels.ReadPendingException;
+import java.nio.channels.WritePendingException;
import java.nio.file.StandardOpenOption;
import java.util.ArrayList;
import java.util.concurrent.ExecutionException;
@@ -1041,6 +1043,244 @@ public class Nio2Endpoint extends Abstra
}
}
+// TODO: NIO2 style scatter/gather methods.
+// TODO: SecureNio2Channel gather would need to be improved
+
+/**
+ * Internal state tracker for scatter/gather operations.
+ */
+private class OperationStateA {
+private final ByteBuffer[] buffers;
+private final int offset;
+private final int length;
+private final A attachment;
+private final long timeout;
+private final TimeUnit unit;
+private final CompletionCheck check;
+private final CompletionHandlerLong, ? super A handler;
+private OperationState(ByteBuffer[] buffers, int offset, int
length,
+long timeout, TimeUnit unit, A attachment, CompletionCheck
check,
+CompletionHandlerLong, ? super A handler) {
+this.buffers = buffers;
+this.offset = offset;
+this.length = length;
+this.timeout = timeout;
+this.unit = unit;
+this.attachment = attachment;
+this.check = check;
+this.handler = handler;
+this.pos = offset;
+}
+private long nBytes = 0;
+private int pos;
+private CompletionState state = CompletionState.PENDING;
+}
+
+private class GatherWriteCompletionHandlerA implements
CompletionHandlerLong, OperationStateA {
+@Override
+public void completed(Long nBytes, OperationStateA state) {
+if (nBytes.longValue() 0) {
+failed(new EOFException(), state);
+} else {
+state.nBytes += nBytes.longValue();
+if (state.pos == state.offset + state.length) {
+writePending.release();
+state.state = Nio2Endpoint.isInline() ?
CompletionState.INLINE : CompletionState.DONE;
+if (state.check == null
+|| state.check.callHandler(state.state,
state.buffers, state.offset, state.length)
+== CompletionHandlerCall.DONE) {
+
state.handler.completed(Long.valueOf(state.nBytes), state.attachment);
+}
+} else {
+if (state.check == null) {
+// Call completion handler
+writePending.release();
+
state.handler.completed(Long.valueOf(state.nBytes), state.attachment);
+} else {
+boolean inline = Nio2Endpoint.isInline();
+switch (state.check.callHandler(inline ?
CompletionState.INLINE : CompletionState.DONE,
+state.buffers, state.offset,
state.length)) {
+case CONTINUE:
+getSocket().write(state.buffers, state.offset,
state.length,
+state.timeout, state.unit, state,
this);
+break;
+case DONE:
+writePending.release();
+state.state = inline ? CompletionState.INLINE
: CompletionState.DONE;
+
state.handler.completed(Long.valueOf(state.nBytes), state.attachment);
+break;
+
buildbot exception in ASF Buildbot on tomcat-8-trunk
The Buildbot has detected a build exception on builder tomcat-8-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-8-trunk/builds/204 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' triggered this build Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1671864 Blamelist: markt BUILD FAILED: exception upload_2 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-8-trunk
The Buildbot has detected a restored build on builder tomcat-8-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-8-trunk/builds/203 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' triggered this build Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1671840 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: r1671937 - /tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
Author: remm
Date: Tue Apr 7 20:07:36 2015
New Revision: 1671937
URL: http://svn.apache.org/r1671937
Log:
Javadoc improvement (fix warning, in particular).
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1671937r1=1671936r2=1671937view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Tue Apr 7
20:07:36 2015
@@ -1171,8 +1171,14 @@ public class Nio2Endpoint extends Abstra
public interface CompletionCheck {
/**
* Return true if enough data has been read or written and the
- * handler should be notified.
- * @param dsts ByteBuffer[] that has been passed to the
+ * handler should be notified. Return false if the IO is
+ * incomplete (data has not been fully written while it should,
+ * or more data read is needed for further processing) and should
+ * be continued before the completion handler is called.
+ *
+ * @param state of the operation (done or done inline since the
+ *IO call is done)
+ * @param buffers ByteBuffer[] that has been passed to the
*original IO call
* @param offset that has been passed to the original IO call
* @param length that has been passed to the original IO call
@@ -1212,15 +1218,16 @@ public class Nio2Endpoint extends Abstra
* called if the callHandler method returned true. If no
* CompletionCheck object has been provided, the completion handler
* will be called.
- * @param dsts
- * @param offset
- * @param length
+ *
+ * @param dsts buffers
+ * @param offset in the buffer array
+ * @param length in the buffer array
* @param timeout
* @param unit
* @param attachment
- * @param check
- * @param handler
- * @return
+ * @param check for the IO operation completion
+ * @param handler to call when the IO is complete
+ * @return the completion state (done, done inline, or still pending)
*/
// FIXME: @Override
public A CompletionState read(ByteBuffer[] dsts,
@@ -1253,15 +1260,16 @@ public class Nio2Endpoint extends Abstra
* called if the callHandler method returned true. If no
* CompletionCheck object has been provided, the completion handler
* will be called.
- * @param srcs
- * @param offset
- * @param length
+ *
+ * @param srcs buffers
+ * @param offset in the buffer array
+ * @param length in the buffer array
* @param timeout
* @param unit
* @param attachment
- * @param check
- * @param handler
- * @return
+ * @param check for the IO operation completion
+ * @param handler to call when the IO is complete
+ * @return the completion state (done, done inline, or still pending)
*/
// FIXME: @Override
public A CompletionState write(ByteBuffer[] srcs,
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot exception in ASF Buildbot on tomcat-trunk
The Buildbot has detected a build exception on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/1105 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1671937 Blamelist: remm BUILD FAILED: exception upload_2 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-tc8.0.x-validate (in module tomcat-8.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc8.0.x-validate has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc8.0.x-validate : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-validate/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on checkstyle exists, no need to add for property checkstyle.jar. -INFO- Failed with reason build failed The following work was performed: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-validate/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-validate.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-validate (Type: Build) Work ended in a state of : Failed Elapsed: 52 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-6.6-SNAPSHOT.jar -Dexecute.validate=true validate [Working Directory: /srv/gump/public/workspace/tomcat-8.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/checkstyle/target/checkstyle-6.6-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20150408.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.3-SNAPSHOT.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/apache-commons/exec/target/commons-exec-1.3.1-SNAPSHOT.j ar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-20150408.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20150408.jar:/srv/gump/public/workspace/apache-commons/validator/dist/commons-validator-20150408.jar:/srv/gump/packages/guava/guava-18.0.jar - Buildfile: /srv/gump/public/workspace/tomcat-8.0.x/build.xml build-prepare: [delete] Deleting directory /srv/gump/public/workspace/tomcat-8.0.x/output/build/temp [mkdir] Created dir: /srv/gump/public/workspace/tomcat-8.0.x/output/build/temp compile-prepare: download-validate: testexist: [echo] Testing for /srv/gump/public/workspace/checkstyle/target/checkstyle-6.6-SNAPSHOT.jar setproxy: downloadfile: validate: [mkdir] Created dir: /srv/gump/public/workspace/tomcat-8.0.x/output/res/checkstyle [checkstyle] Running Checkstyle 6.6-SNAPSHOT on 2936 files [checkstyle] /srv/gump/public/workspace/tomcat-8.0.x/webapps/docs/changelog.xml:111: Line matches the illegal pattern '\s+$'. BUILD FAILED /srv/gump/public/workspace/tomcat-8.0.x/build.xml:537: Got 1 errors and 0 warnings. Total time: 51 seconds - To subscribe to this information via syndicated feeds: - RSS: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-validate/rss.xml - Atom: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-validate/atom.xml == Gump Tracking Only === Produced by Apache Gump(TM) version 2.3. Gump Run 2015040804, vmgump.apache.org:vmgump:2015040804 Gump E-mail Identifier (unique within run) #5. -- Apache Gump http://gump.apache.org/ [Instance: vmgump] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-tc8.0.x (in module tomcat-8.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc8.0.x has an issue affecting its community integration. This issue affects 4 projects. The current state of this project is 'Failed', with reason 'Missing Build Outputs'. For reference only, the following projects are affected by this: - tomcat-tc8.0.x : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... - tomcat-tc8.0.x-test-bio : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... - tomcat-tc8.0.x-test-nio : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... - tomcat-tc8.0.x-test-nio2 : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -DEBUG- Dependency on junit exists, no need to add for property junit.jar. -INFO- Optional dependency tomcat-tc8.0.x-validate failed with reason build failed -INFO- Made directory [/srv/gump/public/workspace/tomcat-8.0.x/tomcat-deps] -INFO- Failed with reason missing build outputs -ERROR- Missing Output: /srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-spdy.jar -ERROR- See Directory Listing Work for Missing Outputs -DEBUG- Extracted fallback artifacts from Gump Repository The following work was performed: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x (Type: Build) Work ended in a state of : Success Elapsed: 1 min 51 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150408-native-src.tar.gz -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150408-native-src.tar.gz -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150408.jar -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar [Working Directory: /srv/gump/public/workspace/tomcat-8.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/classes:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar:/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar:/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150408.jar - [mkdir] Created dir: /srv/gump/public/workspace/tomcat-8.0.x/output/jdbc-pool/build [mkdir] Created dir: /srv/gump/public/workspace/tomcat-8.0.x/output/jdbc-pool/classes [mkdir] Created dir: /srv/gump/public/workspace/tomcat-8.0.x/output/jdbc-pool/testclasses [copy] Copying 7 files to /srv/gump/public/workspace/tomcat-8.0.x/output/jdbc-pool download: build-src: [jar] Building jar: /srv/gump/public/workspace/tomcat-8.0.x/output/jdbc-pool/tomcat-jdbc-src.jar build: [javac] Compiling 32 source files to /srv/gump/public/workspace/tomcat-8.0.x/output/jdbc-pool/classes [jar] Building jar: /srv/gump/public/workspace/tomcat-8.0.x/output/jdbc-pool/tomcat-jdbc.jar [copy] Copying 1 file to /srv/gump/public/workspace/tomcat-8.0.x/output/build/lib compile-webapp-examples: [mkdir] Created dir: /srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes [javac] Compiling 72 source files to /srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes [mkdir] Created dir: /srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/jsp/plugin/applet [javac] Compiling 1 source file to
buildbot success in ASF Buildbot on tomcat-8-trunk
The Buildbot has detected a restored build on builder tomcat-8-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-8-trunk/builds/205 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' triggered this build Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1671999 Blamelist: kkolinko 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: r1671999 - /tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Wed Apr 8 03:07:33 2015 New Revision: 1671999 URL: http://svn.apache.org/r1671999 Log: Fix trailing whitespace, as reminded by checkstyle Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1671999r1=1671998r2=1671999view=diff == --- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Wed Apr 8 03:07:33 2015 @@ -108,7 +108,7 @@ Remove the experimental support for SPDY. No current user agent supports the version of SPDY that the experiment targetted. Note: HTTP/2 support is under development for Tomcat 9 and may be back-ported to Tomcat 8 -once complete. (markt) +once complete. (markt) /scode /changelog /subsection - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
