[GUMP@vmgump-vm3]: Project tomcat-trunk-test-nio2 (in module tomcat-trunk) 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-trunk-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-trunk-test-nio2 : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-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 bnd exists, no need to add for property bndlib.jar. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-NIO2 -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs] The following work was performed: http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio2/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio2.html Work Name: build_tomcat-trunk_tomcat-trunk-test-nio2 (Type: Build) Work ended in a state of : Failed Elapsed: 24 mins 35 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs -Dbnd.jar=/srv/gump/packages/bnd/bnd-4.0.0/biz.aQute.bnd-4.0.0.jar -Dsaaj-api.jar=/srv/gump/packages/saaj-api/saaj-api-1.3.5.jar -Djaxrpc-lib.jar=/srv/gump/packages/jaxrpc/geronimo-spec-jaxrpc-1.1-rc4.jar -Dtest.temp=output/test-tmp-NIO2 -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-trunk/true -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-3.1-SNAPSHOT.jar -Dexamples.sources.skip=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar -Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20190301/bin/openssl -Dexecute .test.nio=false -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dbndlib.jar=/srv/gump/packages/bnd/bndlib-4.0.0/biz.aQute.bndlib-4.0.0.jar -Dexecute.test.apr=false -Dwsdl4j-lib.jar=/srv/gump/packages/wsdl4j/wsdl4j-1.6.3.jar -Dtest.reports=output/logs-NIO2 -Dexecute.test.nio2=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.7.3a-201803300640/ecj-4.7.3a.jar -Dtest.relaxTiming=true -Dtest.excludePerformance=true -Dtest.accesslog=true -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-4.1-SNAPSHOT.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/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-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/
[tomcat] branch master updated: Fix new changelog item.
This is an automated email from the ASF dual-hosted git repository. rjung pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/master by this push: new 9ba0019 Fix new changelog item. 9ba0019 is described below commit 9ba00199d654d093cf432b06094a5e7b4119d1e3 Author: Rainer Jung AuthorDate: Thu Feb 28 23:53:18 2019 +0100 Fix new changelog item. --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index b524fa0..fe4b64c 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -146,7 +146,7 @@ with Apache Tomcat. (kkolinko) -Fix the artifactId of tomcat-i18n-de. (rjung) +Fix the artifactId of tomcat-i18n-cs. (rjung) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Fix the artifactId of tomcat-i18n-cs.
This is an automated email from the ASF dual-hosted git repository. rjung pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/master by this push: new 38268dd Fix the artifactId of tomcat-i18n-cs. 38268dd is described below commit 38268ddc33ff864327ccd53be2e3648d96dfcc5e Author: Rainer Jung AuthorDate: Thu Feb 28 23:41:20 2019 +0100 Fix the artifactId of tomcat-i18n-cs. --- res/maven/tomcat-i18n-cs.pom | 2 +- webapps/docs/changelog.xml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/res/maven/tomcat-i18n-cs.pom b/res/maven/tomcat-i18n-cs.pom index d637683..b9aa30c 100644 --- a/res/maven/tomcat-i18n-cs.pom +++ b/res/maven/tomcat-i18n-cs.pom @@ -21,7 +21,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";> 4.0.0 org.apache.tomcat - tomcat-i18n-de + tomcat-i18n-cs @MAVEN.DEPLOY.VERSION@ Czech translations https://tomcat.apache.org/ diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 1f52fbb..b524fa0 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -145,6 +145,9 @@ Expand the coverage and quality of the Russian translations provided with Apache Tomcat. (kkolinko) + +Fix the artifactId of tomcat-i18n-de. (rjung) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Add missing check in registerReadInterest
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new d3bd3f7 Add missing check in registerReadInterest
new 9e5d3f1 Merge branch 'master' of g...@github.com:apache/tomcat.git
d3bd3f7 is described below
commit d3bd3f71ea04c26f638a9a43586fb7d63bbf5ae8
Author: remm
AuthorDate: Thu Feb 28 23:12:52 2019 +0100
Add missing check in registerReadInterest
Follow up for 63182, and test with CI. Simplify test case a bit.
---
java/org/apache/tomcat/util/net/Nio2Endpoint.java| 20 ++--
.../catalina/nonblocking/TestNonBlockingAPI.java | 6 +-
2 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
index dbabe56..982dd44 100644
--- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
+++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
@@ -782,9 +782,7 @@ public class Nio2Endpoint extends
AbstractJsseEndpoint 0) {
+if (readNotify) {
+// The code that was notified is now reading its data
+readNotify = false;
+}
// This may be sufficient to complete the request and we
// don't want to trigger another read since if there is no
// more data to read and this request takes a while to
@@ -839,9 +841,7 @@ public class Nio2Endpoint extends
AbstractJsseEndpoint 0) {
+if (readNotify) {
+// The code that was notified is now reading its data
+readNotify = false;
+}
// This may be sufficient to complete the request and we
// don't want to trigger another read since if there is no
// more data to read and this request takes a while to
@@ -1490,6 +1494,10 @@ public class Nio2Endpoint extends
AbstractJsseEndpoint
[tomcat] branch master updated: Remove tomcat.extras.path and tomcat.extras.src.path which are no longer in use after removal of Tomcat extras in r1851232 (cb6726e077ba5b3f4fd31ba8138b8bcc26cbb0d8) an
This is an automated email from the ASF dual-hosted git repository. rjung pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/master by this push: new 0fd2cb4 Remove tomcat.extras.path and tomcat.extras.src.path which are no longer in use after removal of Tomcat extras in r1851232 (cb6726e077ba5b3f4fd31ba8138b8bcc26cbb0d8) and r1851243 (709a3595f995bceb5168698387d15dc60b8a970e). new 44ffc8a Merge branch 'master' of https://gitbox.apache.org/repos/asf/tomcat 0fd2cb4 is described below commit 0fd2cb48c03df784f00abcc51d8b83831fc1f454 Author: Rainer Jung AuthorDate: Thu Feb 28 23:09:26 2019 +0100 Remove tomcat.extras.path and tomcat.extras.src.path which are no longer in use after removal of Tomcat extras in r1851232 (cb6726e077ba5b3f4fd31ba8138b8bcc26cbb0d8) and r1851243 (709a3595f995bceb5168698387d15dc60b8a970e). --- res/maven/mvn.properties.default | 2 -- 1 file changed, 2 deletions(-) diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default index 03b8c55..c427f5d 100644 --- a/res/maven/mvn.properties.default +++ b/res/maven/mvn.properties.default @@ -48,8 +48,6 @@ tomcat.release.path=../../output/release tomcat.src.path=../../output/src-jars tomcat.embed.path=../../output/embed tomcat.embed.src.path=../../output/embed-src-jars -tomcat.extras.path=../../output/extras -tomcat.extras.src.path=../../output/extras-src-jars #Where do we find the POM files tomcat.pom.path=../../res/maven - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated (2976232 -> cf83ecd)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from 2976232 Fix additional typo in javac classpath for applet new de5854d Simplify configuration style checks new cf83ecd TLS session cache and timeout config now works with JSSE and OpenSSL The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../apache/tomcat/util/net/AbstractEndpoint.java | 3 - .../tomcat/util/net/AbstractJsseEndpoint.java | 13 java/org/apache/tomcat/util/net/AprEndpoint.java | 8 --- java/org/apache/tomcat/util/net/SSLHostConfig.java | 83 +++--- webapps/docs/changelog.xml | 6 ++ webapps/docs/config/http.xml | 2 - 6 files changed, 30 insertions(+), 85 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: TLS session cache and timeout config now works with JSSE and OpenSSL
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit cf83ecd8951756cc3eb2d7cff92801293d111cd7
Author: Mark Thomas
AuthorDate: Thu Feb 28 21:36:13 2019 +
TLS session cache and timeout config now works with JSSE and OpenSSL
---
java/org/apache/tomcat/util/net/SSLHostConfig.java | 46 +++---
webapps/docs/changelog.xml | 6 +++
webapps/docs/config/http.xml | 2 -
3 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/SSLHostConfig.java
b/java/org/apache/tomcat/util/net/SSLHostConfig.java
index eba04ab..56d8152 100644
--- a/java/org/apache/tomcat/util/net/SSLHostConfig.java
+++ b/java/org/apache/tomcat/util/net/SSLHostConfig.java
@@ -99,11 +99,11 @@ public class SSLHostConfig implements Serializable {
private List jsseCipherNames = null;
private String honorCipherOrder = null;
private Set protocols = new HashSet<>();
+private int sessionCacheSize = 0;
+private int sessionTimeout = 86400;
// JSSE
private String keyManagerAlgorithm =
KeyManagerFactory.getDefaultAlgorithm();
private boolean revocationEnabled = false;
-private int sessionCacheSize = 0;
-private int sessionTimeout = 86400;
private String sslProtocol = Constants.SSL_PROTO_TLS;
private String trustManagerClassName;
private String truststoreAlgorithm =
TrustManagerFactory.getDefaultAlgorithm();
@@ -496,6 +496,26 @@ public class SSLHostConfig implements Serializable {
}
+public void setSessionCacheSize(int sessionCacheSize) {
+this.sessionCacheSize = sessionCacheSize;
+}
+
+
+public int getSessionCacheSize() {
+return sessionCacheSize;
+}
+
+
+public void setSessionTimeout(int sessionTimeout) {
+this.sessionTimeout = sessionTimeout;
+}
+
+
+public int getSessionTimeout() {
+return sessionTimeout;
+}
+
+
// -- JSSE specific configuration
properties
// TODO: These certificate setters can be removed once it is no longer
@@ -573,28 +593,6 @@ public class SSLHostConfig implements Serializable {
}
-public void setSessionCacheSize(int sessionCacheSize) {
-setProperty("sessionCacheSize", Type.JSSE);
-this.sessionCacheSize = sessionCacheSize;
-}
-
-
-public int getSessionCacheSize() {
-return sessionCacheSize;
-}
-
-
-public void setSessionTimeout(int sessionTimeout) {
-setProperty("sessionTimeout", Type.JSSE);
-this.sessionTimeout = sessionTimeout;
-}
-
-
-public int getSessionTimeout() {
-return sessionTimeout;
-}
-
-
public void setSslProtocol(String sslProtocol) {
setProperty("sslProtocol", Type.JSSE);
this.sslProtocol = sslProtocol;
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index fd9bc49..bc882d1 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -121,6 +121,12 @@
style configuration - including JKS keystores - to be used with the
APR/Native connector. (markt)
+
+With the TLS configuration refactoring, the configuration attributes
+sessionCacheSize and sessionTimeout are no
+longer limited to JSSE implementations. They may now be used with
+OpenSSL implementations as well. (markt)
+
diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml
index 19ddb72..8cbf292 100644
--- a/webapps/docs/config/http.xml
+++ b/webapps/docs/config/http.xml
@@ -1319,14 +1319,12 @@
- JSSE only.
The number of SSL sessions to maintain in the session cache. Use 0 to
specify an unlimited cache size. If not specified, a default of 0 is
used.
- JSSE only.
The time, in seconds, after the creation of an SSL session that it
will
timeout. Use 0 to specify an unlimited timeout. If not specified, a
default of 86400 (24 hours) is used.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: TLS session cache and timeout config now works with JSSE and OpenSSL
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new f6ecb33 TLS session cache and timeout config now works with JSSE and
OpenSSL
f6ecb33 is described below
commit f6ecb33fe8c79e14f3d08143e77b518ce9500b64
Author: Mark Thomas
AuthorDate: Thu Feb 28 21:36:13 2019 +
TLS session cache and timeout config now works with JSSE and OpenSSL
---
java/org/apache/tomcat/util/net/SSLHostConfig.java | 46 +++---
webapps/docs/changelog.xml | 6 +++
webapps/docs/config/http.xml | 2 -
3 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/SSLHostConfig.java
b/java/org/apache/tomcat/util/net/SSLHostConfig.java
index 4bd539b..716ea1b 100644
--- a/java/org/apache/tomcat/util/net/SSLHostConfig.java
+++ b/java/org/apache/tomcat/util/net/SSLHostConfig.java
@@ -96,11 +96,11 @@ public class SSLHostConfig implements Serializable {
private List jsseCipherNames = null;
private boolean honorCipherOrder = false;
private Set protocols = new HashSet<>();
+private int sessionCacheSize = 0;
+private int sessionTimeout = 86400;
// JSSE
private String keyManagerAlgorithm =
KeyManagerFactory.getDefaultAlgorithm();
private boolean revocationEnabled = false;
-private int sessionCacheSize = 0;
-private int sessionTimeout = 86400;
private String sslProtocol = Constants.SSL_PROTO_TLS;
private String trustManagerClassName;
private String truststoreAlgorithm =
TrustManagerFactory.getDefaultAlgorithm();
@@ -485,6 +485,26 @@ public class SSLHostConfig implements Serializable {
}
+public void setSessionCacheSize(int sessionCacheSize) {
+this.sessionCacheSize = sessionCacheSize;
+}
+
+
+public int getSessionCacheSize() {
+return sessionCacheSize;
+}
+
+
+public void setSessionTimeout(int sessionTimeout) {
+this.sessionTimeout = sessionTimeout;
+}
+
+
+public int getSessionTimeout() {
+return sessionTimeout;
+}
+
+
// -- JSSE specific configuration
properties
// TODO: These certificate setters can be removed once it is no longer
@@ -562,28 +582,6 @@ public class SSLHostConfig implements Serializable {
}
-public void setSessionCacheSize(int sessionCacheSize) {
-setProperty("sessionCacheSize", Type.JSSE);
-this.sessionCacheSize = sessionCacheSize;
-}
-
-
-public int getSessionCacheSize() {
-return sessionCacheSize;
-}
-
-
-public void setSessionTimeout(int sessionTimeout) {
-setProperty("sessionTimeout", Type.JSSE);
-this.sessionTimeout = sessionTimeout;
-}
-
-
-public int getSessionTimeout() {
-return sessionTimeout;
-}
-
-
public void setSslProtocol(String sslProtocol) {
setProperty("sslProtocol", Type.JSSE);
this.sslProtocol = sslProtocol;
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2dacdc1..1f52fbb 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -83,6 +83,12 @@
style configuration - including JKS keystores - to be used with the
APR/Native connector. (markt)
+
+With the TLS configuration refactoring, the configuration attributes
+sessionCacheSize and sessionTimeout are no
+longer limited to JSSE implementations. They may now be used with
+OpenSSL implementations as well. (markt)
+
diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml
index 782c1dd..f3e3f7a 100644
--- a/webapps/docs/config/http.xml
+++ b/webapps/docs/config/http.xml
@@ -1318,14 +1318,12 @@
- JSSE only.
The number of SSL sessions to maintain in the session cache. Use 0 to
specify an unlimited cache size. If not specified, a default of 0 is
used.
- JSSE only.
The time, in seconds, after the creation of an SSL session that it
will
timeout. Use 0 to specify an unlimited timeout. If not specified, a
default of 86400 (24 hours) is used.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Simplify configuration style checks
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit de5854d4af75aed5ae5cf737f89303bddbb85b16
Author: Mark Thomas
AuthorDate: Thu Feb 28 20:28:19 2019 +
Simplify configuration style checks
Now all TLS capable connectors support both JSSE and OpenSSL
configuration styles, the code that checks for a compatible
configuration style can be a lot simpler.
---
.../apache/tomcat/util/net/AbstractEndpoint.java | 3 --
.../tomcat/util/net/AbstractJsseEndpoint.java | 13
java/org/apache/tomcat/util/net/AprEndpoint.java | 8 -
java/org/apache/tomcat/util/net/SSLHostConfig.java | 37 ++
4 files changed, 2 insertions(+), 59 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
index fd8ee01..603bb47 100644
--- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
@@ -241,7 +241,6 @@ public abstract class AbstractEndpoint {
}
if (bindState != BindState.UNBOUND && bindState !=
BindState.SOCKET_CLOSED_ON_STOP &&
isSSLEnabled()) {
-sslHostConfig.setConfigType(getSslConfigType());
try {
createSSLContext(sslHostConfig);
} catch (Exception e) {
@@ -320,8 +319,6 @@ public abstract class AbstractEndpoint {
return sslHostConfigs.values().toArray(new SSLHostConfig[0]);
}
-protected abstract SSLHostConfig.Type getSslConfigType();
-
/**
* Create the SSLContextfor the the given SSLHostConfig.
*
diff --git a/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
b/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
index 431c8dd..5f95cfa 100644
--- a/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
@@ -29,7 +29,6 @@ import javax.net.ssl.SSLEngine;
import javax.net.ssl.SSLParameters;
import org.apache.tomcat.util.compat.JreCompat;
-import org.apache.tomcat.util.net.SSLHostConfig.Type;
import org.apache.tomcat.util.net.openssl.OpenSSLImplementation;
import org.apache.tomcat.util.net.openssl.ciphers.Cipher;
@@ -65,23 +64,11 @@ public abstract class AbstractJsseEndpoint extends
AbstractEndpoint {
}
-
-@Override
-protected Type getSslConfigType() {
-if
(OpenSSLImplementation.class.getName().equals(sslImplementationName)) {
-return SSLHostConfig.Type.EITHER;
-} else {
-return SSLHostConfig.Type.JSSE;
-}
-}
-
-
protected void initialiseSsl() throws Exception {
if (isSSLEnabled()) {
sslImplementation =
SSLImplementation.getInstance(getSslImplementationName());
for (SSLHostConfig sslHostConfig : sslHostConfigs.values()) {
-sslHostConfig.setConfigType(getSslConfigType());
createSSLContext(sslHostConfig);
}
diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index e78eb44..470cf46 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -55,7 +55,6 @@ import org.apache.tomcat.util.buf.ByteBufferUtils;
import org.apache.tomcat.util.collections.SynchronizedStack;
import org.apache.tomcat.util.net.AbstractEndpoint.Acceptor.AcceptorState;
import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
-import org.apache.tomcat.util.net.SSLHostConfig.Type;
import org.apache.tomcat.util.net.openssl.OpenSSLContext;
import org.apache.tomcat.util.net.openssl.OpenSSLUtil;
@@ -192,12 +191,6 @@ public class AprEndpoint extends AbstractEndpoint
implements SNICallBack {
@Override
-protected Type getSslConfigType() {
-return SSLHostConfig.Type.EITHER;
-}
-
-
-@Override
public InetSocketAddress getLocalAddress() throws IOException {
long s = serverSock;
if (s == 0) {
@@ -372,7 +365,6 @@ public class AprEndpoint extends AbstractEndpoint
implements SNICallBack {
// Initialize SSL if needed
if (isSSLEnabled()) {
for (SSLHostConfig sslHostConfig : sslHostConfigs.values()) {
-sslHostConfig.setConfigType(getSslConfigType());
createSSLContext(sslHostConfig);
}
SSLHostConfig defaultSSLHostConfig =
sslHostConfigs.get(getDefaultSSLHostConfigName());
diff --git a/java/org/apache/tomcat/util/net/SSLHostConfig.java
b/java/org/apache/tomcat/util/net/SSLHostConfig.java
index f25cca1..eba04ab 100644
--- a/java/org/apache/tomcat/util/net/SSLHostConfig.java
+++ b/java/org/apache/tomcat/util/net/SSLHostConfig.java
@@ -22,11 +22,9 @@ import java.io.IOException;
import java.io.Serializable;
[GUMP@vmgump-vm3]: Project tomcat-trunk-test-nio2 (in module tomcat-trunk) 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-trunk-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-trunk-test-nio2 : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-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 bnd exists, no need to add for property bndlib.jar. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-NIO2 -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs] The following work was performed: http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio2/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio2.html Work Name: build_tomcat-trunk_tomcat-trunk-test-nio2 (Type: Build) Work ended in a state of : Failed Elapsed: 24 mins 14 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs -Dbnd.jar=/srv/gump/packages/bnd/bnd-4.0.0/biz.aQute.bnd-4.0.0.jar -Dsaaj-api.jar=/srv/gump/packages/saaj-api/saaj-api-1.3.5.jar -Djaxrpc-lib.jar=/srv/gump/packages/jaxrpc/geronimo-spec-jaxrpc-1.1-rc4.jar -Dtest.temp=output/test-tmp-NIO2 -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-trunk/true -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-3.1-SNAPSHOT.jar -Dexamples.sources.skip=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar -Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20190228/bin/openssl -Dexecute .test.nio=false -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dbndlib.jar=/srv/gump/packages/bnd/bndlib-4.0.0/biz.aQute.bndlib-4.0.0.jar -Dexecute.test.apr=false -Dwsdl4j-lib.jar=/srv/gump/packages/wsdl4j/wsdl4j-1.6.3.jar -Dtest.reports=output/logs-NIO2 -Dexecute.test.nio2=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.7.3a-201803300640/ecj-4.7.3a.jar -Dtest.relaxTiming=true -Dtest.excludePerformance=true -Dtest.accesslog=true -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-4.1-SNAPSHOT.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/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-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib
[tomcat] branch master updated: Simplify configuration style checks
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new ca22e19 Simplify configuration style checks
ca22e19 is described below
commit ca22e193b0d6293b3331ed9478b131897c1c3019
Author: Mark Thomas
AuthorDate: Thu Feb 28 20:28:19 2019 +
Simplify configuration style checks
Now all TLS capable connectors support both JSSE and OpenSSL
configuration styles, the code that checks for a compatible
configuration style can be a lot simpler.
---
.../apache/tomcat/util/net/AbstractEndpoint.java | 3 --
.../tomcat/util/net/AbstractJsseEndpoint.java | 13
java/org/apache/tomcat/util/net/AprEndpoint.java | 8 -
java/org/apache/tomcat/util/net/SSLHostConfig.java | 37 ++
4 files changed, 2 insertions(+), 59 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
index c4a4583..6a6f86e 100644
--- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
@@ -223,7 +223,6 @@ public abstract class AbstractEndpoint {
}
if (bindState != BindState.UNBOUND && bindState !=
BindState.SOCKET_CLOSED_ON_STOP &&
isSSLEnabled()) {
-sslHostConfig.setConfigType(getSslConfigType());
try {
createSSLContext(sslHostConfig);
} catch (Exception e) {
@@ -302,8 +301,6 @@ public abstract class AbstractEndpoint {
return sslHostConfigs.values().toArray(new SSLHostConfig[0]);
}
-protected abstract SSLHostConfig.Type getSslConfigType();
-
/**
* Create the SSLContextfor the the given SSLHostConfig.
*
diff --git a/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
b/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
index dba6c4c..1ebc873 100644
--- a/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
@@ -29,8 +29,6 @@ import javax.net.ssl.SSLEngine;
import javax.net.ssl.SSLParameters;
import org.apache.tomcat.util.compat.JreCompat;
-import org.apache.tomcat.util.net.SSLHostConfig.Type;
-import org.apache.tomcat.util.net.openssl.OpenSSLImplementation;
import org.apache.tomcat.util.net.openssl.ciphers.Cipher;
public abstract class AbstractJsseEndpoint extends AbstractEndpoint {
@@ -65,22 +63,11 @@ public abstract class AbstractJsseEndpoint extends
AbstractEndpoint {
}
-@Override
-protected Type getSslConfigType() {
-if
(OpenSSLImplementation.class.getName().equals(sslImplementationName)) {
-return SSLHostConfig.Type.EITHER;
-} else {
-return SSLHostConfig.Type.JSSE;
-}
-}
-
-
protected void initialiseSsl() throws Exception {
if (isSSLEnabled()) {
sslImplementation =
SSLImplementation.getInstance(getSslImplementationName());
for (SSLHostConfig sslHostConfig : sslHostConfigs.values()) {
-sslHostConfig.setConfigType(getSslConfigType());
createSSLContext(sslHostConfig);
}
diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index 737e8d2..b9f15d0 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -55,7 +55,6 @@ import org.apache.tomcat.util.buf.ByteBufferUtils;
import org.apache.tomcat.util.collections.SynchronizedStack;
import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
import org.apache.tomcat.util.net.Acceptor.AcceptorState;
-import org.apache.tomcat.util.net.SSLHostConfig.Type;
import org.apache.tomcat.util.net.openssl.OpenSSLContext;
import org.apache.tomcat.util.net.openssl.OpenSSLUtil;
@@ -192,12 +191,6 @@ public class AprEndpoint extends
AbstractEndpoint implements SNICallB
@Override
-protected Type getSslConfigType() {
-return SSLHostConfig.Type.EITHER;
-}
-
-
-@Override
public InetSocketAddress getLocalAddress() throws IOException {
long s = serverSock;
if (s == 0) {
@@ -371,7 +364,6 @@ public class AprEndpoint extends
AbstractEndpoint implements SNICallB
// Initialize SSL if needed
if (isSSLEnabled()) {
for (SSLHostConfig sslHostConfig : sslHostConfigs.values()) {
-sslHostConfig.setConfigType(getSslConfigType());
createSSLContext(sslHostConfig);
}
SSLHostConfig defaultSSLHostConfig =
sslHostConfigs.get(getDefaultSSLHostConfigName());
diff --git a/java/org/apache/tomcat/util/net/SSLHostConfig.java
b/java/org/apache/tomcat/util/net/SSLHostConfig.java
index b88aa2b..4bd539b 100
buildbot failure in on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/4094 Buildbot URL: https://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 master] d13a54413cc6a7084da8c4225e4918038fc8f6d9 Blamelist: remm 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
[tomcat] branch master updated: Refactor read notification
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new d13a544 Refactor read notification
d13a544 is described below
commit d13a54413cc6a7084da8c4225e4918038fc8f6d9
Author: remm
AuthorDate: Thu Feb 28 18:30:21 2019 +0100
Refactor read notification
Another attempt for 63182. The rationale is that it is better to
consider a non blocking read is pending until the "client" code actually
reads.
---
java/org/apache/tomcat/util/net/Nio2Endpoint.java | 65 +--
1 file changed, 37 insertions(+), 28 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
index b1dbb7c..dbabe56 100644
--- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
+++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
@@ -476,6 +476,7 @@ public class Nio2Endpoint extends
AbstractJsseEndpoint
readCompletionHandler;
private final Semaphore readPending = new Semaphore(1);
private boolean readInterest = false; // Guarded by
readCompletionHandler
+private boolean readNotify = false;
private final CompletionHandler
writeCompletionHandler;
private final CompletionHandler
gatheringWriteCompletionHandler;
@@ -493,6 +494,7 @@ public class Nio2Endpoint extends
AbstractJsseEndpoint() {
@Override
public void completed(Integer nBytes, ByteBuffer attachment) {
-boolean readNotify = false;
if (log.isDebugEnabled()) {
log.debug("Socket: [" + Nio2SocketWrapper.this + "],
Interest: [" + readInterest + "]");
}
+readNotify = false;
synchronized (readCompletionHandler) {
if (nBytes.intValue() < 0) {
failed(new EOFException(), attachment);
@@ -742,6 +744,10 @@ public class Nio2Endpoint extends
AbstractJsseEndpoint 0) {
nRead = populateReadBuffer(to);
-} else if (nRead == 0 && !block &&
ContainerThreadMarker.isContainerThread()) {
+} else if (nRead == 0 && !block) {
readInterest = true;
}
}
@@ -1720,11 +1734,6 @@ public class Nio2Endpoint extends
AbstractJsseEndpoint
buildbot success in on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/4093 Buildbot URL: https://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 master] bc3c0724a558ba2014b91e452779f1f388f3fe7b Blamelist: Mark Thomas Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 63213] Logging Unbalanced parenthesis error in catalina log during user login
https://bz.apache.org/bugzilla/show_bug.cgi?id=63213 Mark Thomas changed: What|Removed |Added Status|NEW |NEEDINFO --- Comment #3 from Mark Thomas --- 8.0.x is no longer supported. Please test with the latest 8.5.x release and report back. -- 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: New git based merging workflow?
On 28/02/2019 15:28, Emmanuel Bourg wrote: > Le 28/02/2019 à 16:19, Rémy Maucherat a écrit : > >> Nice try ! :D > > :P > > We could also just have a pom.xml file to be used as a mere project > descriptor for the IDE, and retain the main build with Ant. Neat trick. I've got used to having separate projects for each major version. I'm not sure if my current workflow needs separate projects or if it is just what I am used to. Something to think about. Nice to know that there is an option for those that do prefer the single project option. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Fix SpotBugs warnings
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new bc3c072 Fix SpotBugs warnings
bc3c072 is described below
commit bc3c0724a558ba2014b91e452779f1f388f3fe7b
Author: Mark Thomas
AuthorDate: Thu Feb 28 16:49:42 2019 +
Fix SpotBugs warnings
int -> AtomicInteger to address atomicity issues
Refactoring to address Serialization issues
---
.../catalina/nonblocking/TestNonBlockingAPI.java | 49 --
1 file changed, 27 insertions(+), 22 deletions(-)
diff --git a/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
b/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
index 60d894a..8725623 100644
--- a/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
+++ b/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
@@ -32,6 +32,7 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
import javax.net.SocketFactory;
import javax.servlet.AsyncContext;
@@ -57,11 +58,15 @@ import org.apache.catalina.startup.TesterServlet;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.catalina.valves.TesterAccessLogValve;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.net.ContainerThreadMarker;
public class TestNonBlockingAPI extends TomcatBaseTest {
+private static final Log log = LogFactory.getLog(TestNonBlockingAPI.class);
+
private static final int CHUNK_SIZE = 1024 * 1024;
private static final int WRITE_SIZE = CHUNK_SIZE * 10;
private static final byte[] DATA = new byte[WRITE_SIZE];
@@ -125,8 +130,8 @@ public class TestNonBlockingAPI extends TomcatBaseTest {
if (async) {
Assert.assertEquals(200 * 8, servlet.listener.body.length());
TestAsyncReadListener listener = (TestAsyncReadListener)
servlet.listener;
-Assert.assertTrue(Math.abs(listener.containerThreadCount -
listener.notReadyCount) <= 1);
-Assert.assertEquals(listener.isReadyCount,
listener.nonContainerThreadCount);
+Assert.assertTrue(Math.abs(listener.containerThreadCount.get() -
listener.notReadyCount.get()) <= 1);
+Assert.assertEquals(listener.isReadyCount.get(),
listener.nonContainerThreadCount.get());
} else {
Assert.assertEquals(5 * 8, servlet.listener.body.length());
}
@@ -470,11 +475,11 @@ public class TestNonBlockingAPI extends TomcatBaseTest {
}
@WebServlet(asyncSupported = true)
-public class NBReadServlet extends TesterServlet {
+public static class NBReadServlet extends TesterServlet {
private static final long serialVersionUID = 1L;
private final boolean async;
private final boolean ignoreIsReady;
-TestReadListener listener;
+transient TestReadListener listener;
public NBReadServlet(boolean ignoreIsReady, boolean async) {
this.async = async;
@@ -524,10 +529,10 @@ public class TestNonBlockingAPI extends TomcatBaseTest {
}
@WebServlet(asyncSupported = true)
-public class NBWriteServlet extends TesterServlet {
+public static class NBWriteServlet extends TesterServlet {
private static final long serialVersionUID = 1L;
-public volatile TestWriteListener wlistener;
-public volatile TestReadListener rlistener;
+public transient volatile TestWriteListener wlistener;
+public transient volatile TestReadListener rlistener;
@Override
protected void service(HttpServletRequest req, HttpServletResponse
resp) throws ServletException, IOException {
@@ -570,9 +575,9 @@ public class TestNonBlockingAPI extends TomcatBaseTest {
}
@WebServlet(asyncSupported = true)
-public class NBReadWriteServlet extends TesterServlet {
+public static class NBReadWriteServlet extends TesterServlet {
private static final long serialVersionUID = 1L;
-public volatile TestReadWriteListener rwlistener;
+public transient volatile TestReadWriteListener rwlistener;
@Override
protected void service(HttpServletRequest req, HttpServletResponse
resp) throws ServletException, IOException {
@@ -587,7 +592,7 @@ public class TestNonBlockingAPI extends TomcatBaseTest {
}
}
-private class TestReadListener implements ReadListener {
+private static class TestReadListener implements ReadListener {
protected final AsyncContext ctx;
protected final boolean usingNonBlockingWrite;
protected final boolean ignoreIsReady;
[Bug 57665] support x-forwarded-host
https://bz.apache.org/bugzilla/show_bug.cgi?id=57665 --- Comment #22 from Michael Osipov --- Here is possible use case: > > maxHttpHeaderSize="24576" redirectPort="8444" maxThreads="250" > /> > > maxHttpHeaderSize="24576" maxThreads="250" > SSLEnabled="true" scheme="https" secure="true" > defaultSSLHostConfigName="blnn719x.ad001.siemens.net"> >protocols="TLSv1.2" > honorCipherOrder="true" > ciphers="HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!3DES:!MD5:!PSK:!DSS"> >certificateFile="/etc/ssl/blnn719x.ad001.siemens.net/cert/public.pem" > > certificateKeyFile="/etc/ssl/blnn719x.ad001.siemens.net/key/private.pem" > type="RSA" /> > > > > >unpackWARs="true" autoDeploy="true"> >className="org.apache.catalina.valves.RemoteIpValve" > protocolHeader="X-Forwarded-Proto" /> > > > > Tomcat is serving the stuff itself via HTTPS while the Apache Webserver on the same host has another hostname. Traffic might go to localhost or blnn719x.ad001.siemens.net. I don't see a reason not to support it. -- 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: New git based merging workflow?
Le 28/02/2019 à 16:19, Rémy Maucherat a écrit : > Nice try ! :D :P We could also just have a pom.xml file to be used as a mere project descriptor for the IDE, and retain the main build with Ant. Emmanuel Bourg - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: New git based merging workflow?
On Thu, Feb 28, 2019 at 4:03 PM Emmanuel Bourg wrote: > Le 28/02/2019 à 15:25, Mark Thomas a écrit : > > > The main reason I don't do that is that I want to have each branch setup > > correctly (Java version, dependencies, etc.) in an IDE. Eclipse, at > > least, doesn't cope well with that. > > That sounds like a good reason to use Maven. IntelliJ detects the > changes to the pom and then adapts the dependencies and the language > level. I don't think this is possible with an Ant based project. > Nice try ! :D Rémy > > Emmanuel Bourg > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
Re: New git based merging workflow?
Le 28/02/2019 à 15:25, Mark Thomas a écrit : > The main reason I don't do that is that I want to have each branch setup > correctly (Java version, dependencies, etc.) in an IDE. Eclipse, at > least, doesn't cope well with that. That sounds like a good reason to use Maven. IntelliJ detects the changes to the pom and then adapts the dependencies and the language level. I don't think this is possible with an Ant based project. Emmanuel Bourg - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: New git based merging workflow?
On 28/02/2019 13:29, Coty Sutherland wrote: > On Thu, Feb 28, 2019 at 6:10 AM Emmanuel Bourg wrote: > >> Le 28/02/2019 à 11:47, Rainer Jung a écrit : >>> Thanks a bunch. Looks like what I was searching for, will try it. >>> >>> Rainer >> >> You could play with a single repository too: >> > > +1, that's what I do. The main reason I don't do that is that I want to have each branch setup correctly (Java version, dependencies, etc.) in an IDE. Eclipse, at least, doesn't cope well with that. It seems that Git does offer greater flexibility in this area which gives all of us the opportunity to tweak things to our personal liking. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in on tomcat-7-trunk
The Buildbot has detected a restored build on builder tomcat-7-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-7-trunk/builds/1276 Buildbot URL: https://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 7.0.x] eaef714a288253b7ebac3e947c403905ad0e82ab Blamelist: Mark Thomas Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: New git based merging workflow?
On Thu, Feb 28, 2019 at 6:10 AM Emmanuel Bourg wrote: > Le 28/02/2019 à 11:47, Rainer Jung a écrit : > > Thanks a bunch. Looks like what I was searching for, will try it. > > > > Rainer > > You could play with a single repository too: > +1, that's what I do. > > # Initial setup > cd ~/repos > git clone g...@github.com:apache/tomcat.git > > # Commit... > cd ~/repos/tomcat > # edit files > git commit -a -m "Some message" > git push > > # ...and backport > git checkout 8.5.x > git cherry-pick > git push origin 8.5.x > > git checkout master > Sometimes I also create a local branch to do the work in so that I don't have to worry about putting everything in one commit from the start. After I'm done with the bug/feature, then I squash that whole local branch into one commit and merge it into master (or whatever branch). From there you can cherry-pick that single commit to wherever it's needed. > > Emmanuel Bourg > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
buildbot failure in on tomcat-7-trunk
The Buildbot has detected a new failure on builder tomcat-7-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-7-trunk/builds/1275 Buildbot URL: https://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 7.0.x] 428d6843fcee17315b46bc2373ef0b01761b4956 Blamelist: Mark Thomas ,Rainer Jung 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
[tomcat] branch 7.0.x updated: Update test key/cert files
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/7.0.x by this push: new eaef714 Update test key/cert files eaef714 is described below commit eaef714a288253b7ebac3e947c403905ad0e82ab Author: Mark Thomas AuthorDate: Thu Feb 28 11:49:37 2019 + Update test key/cert files Certs used by 7.0.x ahve expired. Copy files from 9.0.x which are still valid. --- test/org/apache/tomcat/util/net/ca.jks | Bin 952 -> 1766 bytes test/org/apache/tomcat/util/net/localhost-cert.pem | 142 - .../org/apache/tomcat/util/net/localhost-copy1.jks | Bin 2196 -> 4404 bytes test/org/apache/tomcat/util/net/localhost-key.pem | 52 test/org/apache/tomcat/util/net/localhost.jks | Bin 2196 -> 4404 bytes test/org/apache/tomcat/util/net/user1.jks | Bin 2193 -> 2666 bytes 6 files changed, 110 insertions(+), 84 deletions(-) diff --git a/test/org/apache/tomcat/util/net/ca.jks b/test/org/apache/tomcat/util/net/ca.jks index cb9c21b..61076e4 100644 Binary files a/test/org/apache/tomcat/util/net/ca.jks and b/test/org/apache/tomcat/util/net/ca.jks differ diff --git a/test/org/apache/tomcat/util/net/localhost-cert.pem b/test/org/apache/tomcat/util/net/localhost-cert.pem index 1d567ca..513e86c 100644 --- a/test/org/apache/tomcat/util/net/localhost-cert.pem +++ b/test/org/apache/tomcat/util/net/localhost-cert.pem @@ -1,35 +1,35 @@ Certificate: Data: Version: 3 (0x2) -Serial Number: 4109 (0x100d) +Serial Number: 4096 (0x1000) Signature Algorithm: sha256WithRSAEncryption -Issuer: C=US, CN=ca-test.tomcat.apache.org +Issuer: C=US, ST=MA, L=Wakefield, O=The Apache Software Foundation, OU=Apache Tomcat PMC, CN=Apache Tomcat Test CA Validity -Not Before: Feb 27 23:25:29 2017 GMT -Not After : Feb 27 23:25:29 2019 GMT -Subject: C=US, CN=localhost +Not Before: Aug 8 10:41:05 2017 GMT +Not After : Aug 8 10:41:05 2019 GMT +Subject: C=US, ST=MA, L=Wakefield, O=The Apache Software Foundation, OU=Apache Tomcat PMC, CN=localhost Subject Public Key Info: Public Key Algorithm: rsaEncryption Public-Key: (2048 bit) Modulus: -00:ba:d6:b2:32:de:10:53:1f:5d:af:da:d4:3f:64: -b3:22:37:fd:4e:16:a3:f0:d6:9e:6e:d3:ee:47:ec: -15:b4:b3:0d:80:bf:fc:21:96:8b:1d:40:16:6d:89: -35:03:8a:45:8c:c6:6e:2b:66:67:0f:1c:19:cf:62: -d5:e6:08:48:a8:df:10:da:4c:47:79:7c:02:97:54: -f9:a8:e9:59:50:33:cd:a0:72:fd:e1:e7:5e:3a:43: -5c:ff:0c:69:9e:f6:c2:86:71:07:a5:eb:b5:c7:61: -f9:e9:fe:3f:26:55:2c:f4:04:7c:c0:bd:cd:2b:88: -9c:69:4d:ce:3c:1e:ad:2e:18:96:aa:a0:eb:72:2b: -95:99:47:16:90:b5:59:ed:f1:78:cc:8b:01:33:40: -c4:e9:b0:3f:ec:89:04:13:5c:9b:22:01:cc:25:cf: -40:c1:40:fa:04:a0:b9:b7:f7:d8:73:91:7f:b8:7e: -e9:82:20:1f:e9:9c:89:25:28:b5:fa:6f:b7:4a:88: -28:68:59:d5:30:52:f9:e4:5b:a6:b4:f8:e4:ed:2f: -03:d8:50:61:9a:53:86:1f:ad:aa:0d:5f:f8:52:b5: -27:dd:05:82:25:13:a0:d0:10:3c:dd:c0:70:15:24: -63:89:22:0e:f0:5a:9a:fa:b0:75:56:06:aa:7f:b0: -f7:9b +00:a8:1a:8f:78:58:24:43:9d:90:e1:f2:d5:65:5d: +61:9d:0f:a8:08:20:2c:82:75:8b:b0:ce:96:ba:5b: +99:d3:6b:a2:f8:54:92:6d:07:cc:b3:66:84:8a:8b: +5f:1c:c8:53:eb:a2:c3:54:8c:ce:d0:a7:ff:11:da: +e8:78:a2:07:ea:ed:59:db:97:76:25:f7:c0:e8:6d: +43:07:fc:fe:1c:22:82:8a:5a:5c:63:82:8e:fb:53: +9b:46:47:81:34:95:79:75:15:0a:8d:c4:d8:d8:84: +df:30:53:d0:6e:40:2c:ba:3b:e2:a1:44:4d:43:de: +cf:b0:9e:44:a1:00:26:8f:ca:39:57:14:30:a7:6d: +9a:cc:e4:24:b0:44:1c:28:d3:c3:33:c1:e7:f7:0a: +2a:60:18:60:ed:34:d8:5f:86:a1:ce:c7:fe:cc:56: +b0:68:18:46:d2:a0:5a:70:2c:bd:ce:22:1b:41:05: +c7:a2:82:49:b2:85:a1:56:14:38:46:27:de:cd:f4: +fa:13:0d:9a:80:02:14:d2:1b:47:5f:2c:c9:0c:9f: +70:18:e1:bf:2f:a4:2e:73:7d:ce:0e:6e:2e:11:72: +dd:39:1a:37:29:5c:c7:4a:7b:4a:66:47:8a:70:67: +52:24:a7:6b:2a:55:ba:80:da:28:b5:8b:2f:ae:48: +d7:8b Exponent: 65537 (0x10001) X509v3 extensions: X509v3 Basic Constraints: @@ -37,43 +37,69 @@ Certificate: Netscape Comment: OpenSSL Generated Certificate
[tomcat] 02/02: Remove unnecessary null check
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 9e052debfe53cbc30cf6bec48670d3c1db848817
Author: Mark Thomas
AuthorDate: Thu Feb 28 11:31:37 2019 +
Remove unnecessary null check
---
java/org/apache/catalina/startup/Catalina.java | 10 +++---
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/java/org/apache/catalina/startup/Catalina.java
b/java/org/apache/catalina/startup/Catalina.java
index d89bdba..f6b1446 100644
--- a/java/org/apache/catalina/startup/Catalina.java
+++ b/java/org/apache/catalina/startup/Catalina.java
@@ -566,13 +566,9 @@ public class Catalina {
digester.push(this);
digester.parse(inputSource);
} catch (Exception e) {
-if (file == null) {
-log.warn(sm.getString("catalina.configFail", getConfigFile() +
"] or [server-embed.xml"), e);
-} else {
-log.warn(sm.getString("catalina.configFail",
file.getAbsolutePath()), e);
-if (file.exists() && !file.canRead()) {
-log.warn(sm.getString("catalina.incorrectPermissions"));
-}
+log.warn(sm.getString("catalina.configFail",
file.getAbsolutePath()), e);
+if (file.exists() && !file.canRead()) {
+log.warn(sm.getString("catalina.incorrectPermissions"));
}
return;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Finializer should be protected
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit cd1e1ebef3907a3f8eaf778ea5ae3a9d9f6b6bdf
Author: Mark Thomas
AuthorDate: Thu Feb 28 11:29:36 2019 +
Finializer should be protected
---
java/org/apache/tomcat/util/net/NioBlockingSelector.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/NioBlockingSelector.java
b/java/org/apache/tomcat/util/net/NioBlockingSelector.java
index 62462e9..322b172 100644
--- a/java/org/apache/tomcat/util/net/NioBlockingSelector.java
+++ b/java/org/apache/tomcat/util/net/NioBlockingSelector.java
@@ -471,7 +471,7 @@ public class NioBlockingSelector {
SelectionKey key = null;
@Override
-public void finalize() {
+protected void finalize() {
if (key!=null && key.isValid()) {
log.warn(sm.getString("nioBlockingSelector.possibleLeak"));
try {key.cancel();}catch (Exception ignore){}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated (7a1a304 -> 9e052de)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git. from 7a1a304 Finializer should be protected new cd1e1eb Finializer should be protected new 9e052de Remove unnecessary null check The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: java/org/apache/catalina/startup/Catalina.java | 10 +++--- java/org/apache/tomcat/util/net/NioBlockingSelector.java | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/4091 Buildbot URL: https://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 master] 4dccc3d3ec6f4c6416e500b2e086da21161b13c3 Blamelist: Mark Thomas 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
Re: New git based merging workflow?
Le 28/02/2019 à 11:47, Rainer Jung a écrit : > Thanks a bunch. Looks like what I was searching for, will try it. > > Rainer You could play with a single repository too: # Initial setup cd ~/repos git clone g...@github.com:apache/tomcat.git # Commit... cd ~/repos/tomcat # edit files git commit -a -m "Some message" git push # ...and backport git checkout 8.5.x git cherry-pick git push origin 8.5.x git checkout master Emmanuel Bourg - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in on tomcat-85-trunk
The Buildbot has detected a restored build on builder tomcat-85-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-85-trunk/builds/1671 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-85-commit' triggered this build Build Source Stamp: [branch 8.5.x] 29762323bf437f05998f572a598e4ad31926b675 Blamelist: Mark Thomas ,Rainer Jung Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated (4dccc3d -> 7a1a304)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git. from 4dccc3d Fix additional typo in javac classpath for applet new 6c92d1f Finializer should be protected new 7a1a304 Finializer should be protected The 20571 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: java/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java | 2 +- java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: New git based merging workflow?
Thanks a bunch. Looks like what I was searching for, will try it. Rainer Am 28.02.2019 um 11:41 schrieb Mark Thomas: Hi, I'm swapping a bit between IDE, gitk and the command line much like I did with svn. I'm also still trying to iron out some wrinkles in the process. Mostly I think that is getting git configured correctly. I'm just going to use master and 8.5.x below but it should work with 7.0.x as well. Initial setup cd ~/repos git clone g...@github.com:apache/tomcat.git asf-tomcat-9.0.x git clone g...@github.com:apache/tomcat.git asf-tomcat-8.5.x cd asf-tomcat-8.5.x git checkout 8.5.x # I don't want a tracking branch for master in this clone # because if I do git push complains that it isn't up to date git co master git branch --unset-upstream git checkout 8.5.x git branch -D master #Commit ... cd ~/repos/asf-tomcat-9.0.x # edit files git commit -a -m "Some message" git push # ... and backport cd ~/repos/asf-tomcat-8.5.x git fetch git cherry-pick git push I am sure there are many different ways to handle this. If you wanted all the tracking branches in each clone, I am sure you could configure git push to just push the relevant branch for that clone. I can probably do more in the IDE than I am currently doing. I'm still finding my way a bit and figuring out what process works best for me. HTH, Mark On 28/02/2019 10:04, Rainer Jung wrote: Hi there, I am struggling a bit with the new merging workflow from master to the branches. I did a short read on the workspaces and tried cherry-picking with and without workspaces. It seems workspaces are not for doing actual commits that should at the end et pushed to origin. And when using cherry-pick into a checked out 8.5.x branch I end up with a detached head state. Assuming commits that apply cleanly to the branches, what is the proposed workflow? Something like: git checkout master ... apply changes ... git add git commit git push git checkout 8.5.x git push git checkout 7.0.x git push Any initial recommendations? I am talking here about simply short commits that might not warrant creating a local branch (eg. b5c4c30b8037b587b8804f1e6e764bbfd4ffb727). But that's probably independent of the backport workflow. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 7.0.x updated (dfb4c5f -> 428d684)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from dfb4c5f Update the release date for 7.0.93 new 93f0d11 Fix typo in variable name in the javac classpath definition for webapps/examples/jsp/plugin/applet. Hopefully the fix doesn't break something by uncovering other bugs. new 428d684 Fix additional typo in javac classpath for applet The 11867 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/4090 Buildbot URL: https://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 master] f7fd048f2d130c4db3d86058df73124a9443362e Blamelist: Mark Thomas Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: New git based merging workflow?
Hi, I'm swapping a bit between IDE, gitk and the command line much like I did with svn. I'm also still trying to iron out some wrinkles in the process. Mostly I think that is getting git configured correctly. I'm just going to use master and 8.5.x below but it should work with 7.0.x as well. Initial setup cd ~/repos git clone g...@github.com:apache/tomcat.git asf-tomcat-9.0.x git clone g...@github.com:apache/tomcat.git asf-tomcat-8.5.x cd asf-tomcat-8.5.x git checkout 8.5.x # I don't want a tracking branch for master in this clone # because if I do git push complains that it isn't up to date git co master git branch --unset-upstream git checkout 8.5.x git branch -D master #Commit ... cd ~/repos/asf-tomcat-9.0.x # edit files git commit -a -m "Some message" git push # ... and backport cd ~/repos/asf-tomcat-8.5.x git fetch git cherry-pick git push I am sure there are many different ways to handle this. If you wanted all the tracking branches in each clone, I am sure you could configure git push to just push the relevant branch for that clone. I can probably do more in the IDE than I am currently doing. I'm still finding my way a bit and figuring out what process works best for me. HTH, Mark On 28/02/2019 10:04, Rainer Jung wrote: > Hi there, > > I am struggling a bit with the new merging workflow from master to the > branches. I did a short read on the workspaces and tried cherry-picking > with and without workspaces. It seems workspaces are not for doing > actual commits that should at the end et pushed to origin. And when > using cherry-pick into a checked out 8.5.x branch I end up with a > detached head state. > > Assuming commits that apply cleanly to the branches, what is the > proposed workflow? > > Something like: > > git checkout master > > ... apply changes ... > > git add > git commit > git push > > git checkout 8.5.x > > git push > > git checkout 7.0.x > > git push > > Any initial recommendations? I am talking here about simply short > commits that might not warrant creating a local branch (eg. > b5c4c30b8037b587b8804f1e6e764bbfd4ffb727). But that's probably > independent of the backport workflow. > > Regards, > > Rainer > > - > 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
[tomcat] branch 8.5.x updated (4996bd2 -> 2976232)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from 4996bd2 Correct regression in refactoring that broke TLS with a single cert new aecf75e Fix typo in variable name in the javac classpath definition for webapps/examples/jsp/plugin/applet. Hopefully the fix doesn't break something by uncovering other bugs. new 2976232 Fix additional typo in javac classpath for applet The 19057 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Fix additional typo in javac classpath for applet
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 4dccc3d Fix additional typo in javac classpath for applet
4dccc3d is described below
commit 4dccc3d3ec6f4c6416e500b2e086da21161b13c3
Author: Mark Thomas
AuthorDate: Thu Feb 28 10:30:03 2019 +
Fix additional typo in javac classpath for applet
---
build.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.xml b/build.xml
index 95c6fc6..f411368 100644
--- a/build.xml
+++ b/build.xml
@@ -1205,7 +1205,7 @@
source="${compile.source}"
target="${compile.target}"
release="${compile.release}"
- classpath="$tomcat.classes}"
+ classpath="${tomcat.classes}"
excludes="**/CVS/**,**/.svn/**"
encoding="ISO-8859-1"
includeantruntime="false">
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump-vm3]: Project tomcat-tc7.0.x-test-apr (in module tomcat-7.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-tc7.0.x-test-apr 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-tc7.0.x-test-apr : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump-vm3.apache.org/tomcat-7.0.x/tomcat-tc7.0.x-test-apr/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-APR/logs The following work was performed: http://vmgump-vm3.apache.org/tomcat-7.0.x/tomcat-tc7.0.x-test-apr/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 20 mins 20 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dbase.path=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-build-libs -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dtest.temp=output/test-tmp-APR -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-3.1-SNAPSHOT.jar -Dexamples.sources.skip=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps -Dtest.exclude=**/TestFlushableGZIPOutputStream.java -Dtest.excludePerformance=true -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.j ar -Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x -Dexecute.test.apr=true -Dexecute.test.bio=false -Dtest.reports=output/logs-APR -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.7.3a-201803300640/ecj-4.7.3a.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-1.2-1.0.2/dest-20190228/lib -Dtest.relaxTiming=true -Dexecute.test.nio=false -Dtest.accesslog=true -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20190228.jar -Deasymock.jar=/srv/gump/packages/easymock3/easymock-3.6.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.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-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-7.
[tomcat] branch 8.5.x updated: Correct regression in refactoring that broke TLS with a single cert
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 4996bd2 Correct regression in refactoring that broke TLS with a
single cert
4996bd2 is described below
commit 4996bd2e417dba57d44c4b5f66787e152ab27a21
Author: Mark Thomas
AuthorDate: Thu Feb 28 10:23:37 2019 +
Correct regression in refactoring that broke TLS with a single cert
When a single certificate is used the type is likely to be undefined.
That caused the lookup of the storage slot to return an incorrect value.
In this case just use the RSA slot as it is only convention that maps a
given slot to a specific type. Tomcat Native and OpenSSL don't actually
care.
---
java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
b/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
index 9f3bb58..61fd8b4 100644
--- a/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
+++ b/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
@@ -425,7 +425,9 @@ public class OpenSSLContext implements
org.apache.tomcat.util.net.SSLContext {
private static int getCertificateIndex(SSLHostConfigCertificate
certificate) {
int result;
-if (certificate.getType() == Type.RSA) {
+// If the type is undefined there will only be one certificate
(enforced
+// in SSLHostConfig) so use the RSA slot.
+if (certificate.getType() == Type.RSA || certificate.getType() ==
Type.UNDEFINED) {
result = SSL.SSL_AIDX_RSA;
} else if (certificate.getType() == Type.EC) {
result = SSL.SSL_AIDX_ECC;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Correct regression in refactoring that broke TLS with a single cert
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new f7fd048 Correct regression in refactoring that broke TLS with a
single cert
f7fd048 is described below
commit f7fd048f2d130c4db3d86058df73124a9443362e
Author: Mark Thomas
AuthorDate: Thu Feb 28 10:23:37 2019 +
Correct regression in refactoring that broke TLS with a single cert
When a single certificate is used the type is likely to be undefined.
That caused the lookup of the storage slot to return an incorrect value.
In this case just use the RSA slot as it is only convention that maps a
given slot to a specific type. Tomcat Native and OpenSSL don't actually
care.
---
java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
b/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
index 7f13859..fd8fc5c 100644
--- a/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
+++ b/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
@@ -416,7 +416,9 @@ public class OpenSSLContext implements
org.apache.tomcat.util.net.SSLContext {
private static int getCertificateIndex(SSLHostConfigCertificate
certificate) {
int result;
-if (certificate.getType() == Type.RSA) {
+// If the type is undefined there will only be one certificate
(enforced
+// in SSLHostConfig) so use the RSA slot.
+if (certificate.getType() == Type.RSA || certificate.getType() ==
Type.UNDEFINED) {
result = SSL.SSL_AIDX_RSA;
} else if (certificate.getType() == Type.EC) {
result = SSL.SSL_AIDX_ECC;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump-vm3]: Project tomcat-trunk-test-apr (in module tomcat-trunk) 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-trunk-test-apr 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-trunk-test-apr : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-apr/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on bnd exists, no need to add for property bndlib.jar. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs] The following work was performed: http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 27 mins 21 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs -Dbnd.jar=/srv/gump/packages/bnd/bnd-4.0.0/biz.aQute.bnd-4.0.0.jar -Dsaaj-api.jar=/srv/gump/packages/saaj-api/saaj-api-1.3.5.jar -Djaxrpc-lib.jar=/srv/gump/packages/jaxrpc/geronimo-spec-jaxrpc-1.1-rc4.jar -Dtest.temp=output/test-tmp-APR -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-trunk/true -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-3.1-SNAPSHOT.jar -Dexamples.sources.skip=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar -Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20190228/bin/openssl -Dexecute. test.nio=false -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dbndlib.jar=/srv/gump/packages/bnd/bndlib-4.0.0/biz.aQute.bndlib-4.0.0.jar -Dexecute.test.apr=true -Dwsdl4j-lib.jar=/srv/gump/packages/wsdl4j/wsdl4j-1.6.3.jar -Dtest.reports=output/logs-APR -Dexecute.test.nio2=false -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.7.3a-201803300640/ecj-4.7.3a.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-trunk/dest-20190228/lib -Dtest.relaxTiming=true -Dtest.excludePerformance=true -Dtest.accesslog=true -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-4.1-SNAPSHOT.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/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-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/li
New git based merging workflow?
Hi there, I am struggling a bit with the new merging workflow from master to the branches. I did a short read on the workspaces and tried cherry-picking with and without workspaces. It seems workspaces are not for doing actual commits that should at the end et pushed to origin. And when using cherry-pick into a checked out 8.5.x branch I end up with a detached head state. Assuming commits that apply cleanly to the branches, what is the proposed workflow? Something like: git checkout master ... apply changes ... git add git commit git push git checkout 8.5.x git push git checkout 7.0.x git push Any initial recommendations? I am talking here about simply short commits that might not warrant creating a local branch (eg. b5c4c30b8037b587b8804f1e6e764bbfd4ffb727). But that's probably independent of the backport workflow. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump-vm3]: Project tomcat-tc8.5.x-test-apr (in module tomcat-8.5.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.5.x-test-apr 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.5.x-test-apr : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump-vm3.apache.org/tomcat-8.5.x/tomcat-tc8.5.x-test-apr/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.5.x/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.5.x/output/test-tmp-APR/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-8.5.x/output/test-tmp-APR/logs] The following work was performed: http://vmgump-vm3.apache.org/tomcat-8.5.x/tomcat-tc8.5.x-test-apr/gump_work/build_tomcat-8.5.x_tomcat-tc8.5.x-test-apr.html Work Name: build_tomcat-8.5.x_tomcat-tc8.5.x-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 19 mins 11 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true 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 -Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-8.5.x/true -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-3.1-SNAPSHOT.jar -Dtest.reports=output/logs-APR -Dexecute.test.nio2=false -Dexamples.sources.skip=true -Dbase.path=/srv/gump/public/workspace/tomcat-8.5.x/tomcat-build-libs -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.7.3a-201803300640/ecj-4.7.3a.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-1.2-1.1.1/dest-20190228/lib -Dtest.relaxTiming=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.op enssl.path=/srv/gump/public/workspace/openssl-1.1.1/dest-20190228/bin/openssl -Dexecute.test.bio=false -Dexecute.test.apr=true -Dtest.excludePerformance=true -Deasymock.jar=/srv/gump/packages/easymock3/easymock-3.6.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.5.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.5.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.5.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/bu ild/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/tomcat-util.jar:/srv/gump/public/workspace
[GUMP@vmgump-vm3]: Project tomcat-tc7.0.x-test-nio (in module tomcat-7.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-tc7.0.x-test-nio 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-tc7.0.x-test-nio : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump-vm3.apache.org/tomcat-7.0.x/tomcat-tc7.0.x-test-nio/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/logs-NIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-NIO/logs The following work was performed: http://vmgump-vm3.apache.org/tomcat-7.0.x/tomcat-tc7.0.x-test-nio/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio (Type: Build) Work ended in a state of : Failed Elapsed: 17 mins 18 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dbase.path=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-build-libs -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dtest.temp=output/test-tmp-NIO -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-3.1-SNAPSHOT.jar -Dexamples.sources.skip=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps -Dtest.exclude=**/TestFlushableGZIPOutputStream.java -Dtest.excludePerformance=true -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.j ar -Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x -Dexecute.test.apr=false -Dexecute.test.bio=false -Dtest.reports=output/logs-NIO -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.7.3a-201803300640/ecj-4.7.3a.jar -Dtest.relaxTiming=true -Dexecute.test.nio=true -Dtest.accesslog=true -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20190228.jar -Deasymock.jar=/srv/gump/packages/easymock3/easymock-3.6.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.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-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-util.jar:/srv/gump/public/workspace/tomcat-7.0.x/output
