Reg: Bug 56438
Hi Mark, Its regarding the another bug that you shared to me: https://bz.apache.org/bugzilla/show_bug.cgi?id=56438 This bug involves migration from 5.5 to 7.0, and i am new to migration of Tomcat releases. Hence can you assign me some other issues which can handle with code directly? Or please let me know the search criteria to find out the right issues based on my expertise. Thanks, Pravallika(VIN)
svn commit: r1660266 - in /tomcat/tc8.0.x/trunk: java/org/apache/catalina/tribes/tipis/ReplicatedMap.java webapps/docs/changelog.xml
Author: kfujino
Date: Tue Feb 17 02:20:11 2015
New Revision: 1660266
URL: http://svn.apache.org/r1660266
Log:
Make sure that add to the backup node of the map entry when map member has been
added to ReplicatedMap.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java?rev=1660266&r1=1660265&r2=1660266&view=diff
==
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
Tue Feb 17 02:20:11 2015
@@ -203,4 +203,29 @@ public class ReplicatedMap extends
long complete = System.currentTimeMillis() - start;
if (log.isInfoEnabled()) log.info("Relocation of map entries was
complete in " + complete + " ms.");
}
+
+public void mapMemberAdded(Member member) {
+if ( member.equals(getChannel().getLocalMember(false)) ) return;
+boolean memberAdded = false;
+synchronized (mapMembers) {
+if (!mapMembers.containsKey(member) ) {
+mapMembers.put(member, new Long(System.currentTimeMillis()));
+memberAdded = true;
+}
+}
+if ( memberAdded ) {
+synchronized (stateMutex) {
+Member[] backup = getMapMembers();
+Iterator>> i =
innerMap.entrySet().iterator();
+while (i.hasNext()) {
+Map.Entry> e = i.next();
+MapEntry entry = innerMap.get(e.getKey());
+if ( entry == null ) continue;
+if (entry.isPrimary() &&
!inSet(member,entry.getBackupNodes())) {
+entry.setBackupNodes(backup);
+}
+}
+}
+}
+}
}
\ No newline at end of file
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1660266&r1=1660265&r2=1660266&view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Tue Feb 17 02:20:11 2015
@@ -55,6 +55,14 @@
+
+
+
+Make sure that add to the backup node of the map entry when map member
+has been added to ReplicatedMap. (kfujino)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1660265 - /tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
Author: kfujino
Date: Tue Feb 17 02:17:16 2015
New Revision: 1660265
URL: http://svn.apache.org/r1660265
Log:
Make sure that add to the backup node of the map entry when map member has been
added to ReplicatedMap.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
Modified: tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java?rev=1660265&r1=1660264&r2=1660265&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java Tue
Feb 17 02:17:16 2015
@@ -203,4 +203,29 @@ public class ReplicatedMap extends
long complete = System.currentTimeMillis() - start;
if (log.isInfoEnabled()) log.info("Relocation of map entries was
complete in " + complete + " ms.");
}
+
+public void mapMemberAdded(Member member) {
+if ( member.equals(getChannel().getLocalMember(false)) ) return;
+boolean memberAdded = false;
+synchronized (mapMembers) {
+if (!mapMembers.containsKey(member) ) {
+mapMembers.put(member, new Long(System.currentTimeMillis()));
+memberAdded = true;
+}
+}
+if ( memberAdded ) {
+synchronized (stateMutex) {
+Member[] backup = getMapMembers();
+Iterator>> i =
innerMap.entrySet().iterator();
+while (i.hasNext()) {
+Map.Entry> e = i.next();
+MapEntry entry = innerMap.get(e.getKey());
+if ( entry == null ) continue;
+if (entry.isPrimary() &&
!inSet(member,entry.getBackupNodes())) {
+entry.setBackupNodes(backup);
+}
+}
+}
+}
+}
}
\ No newline at end of file
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57587] New: JNDI Datasource HOW-TO refers to obsolete DBCP config property
https://bz.apache.org/bugzilla/show_bug.cgi?id=57587 Bug ID: 57587 Summary: JNDI Datasource HOW-TO refers to obsolete DBCP config property Product: Tomcat 8 Version: trunk Hardware: PC OS: Mac OS X 10.1 Status: NEW Severity: normal Priority: P5 Component: Documentation Assignee: dev@tomcat.apache.org Reporter: p...@steitz.com Created attachment 32484 --> https://bz.apache.org/bugzilla/attachment.cgi?id=32484&action=edit Update to use the new properties. The DBCP example in the JNDI Datasource HOW-TO refers to the removeAbandoned property, which in DBCP2 has been replaced by removeAbandonedOnBorrow and removeAbandonedOnMaintenance. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [GUMP@vmgump]: Project tomcat-tc8.0.x-test-nio2 (in module tomcat-8.0.x) failed
On 16/02/2015 16:41, Rainer Jung wrote: > Am 16.02.2015 um 16:09 schrieb Mark Thomas: >> On 16/02/2015 14:49, Bill Barker wrote: >> >> >> >>> test: >>> [concat] Testsuites with skipped tests: >>> [concat] TEST-org.apache.catalina.connector.TestRequest.NIO2.txt >>> [concat] >>> TEST-org.apache.tomcat.util.net.jsse.openssl.TestOpenSSLCipherConfigurationParser.NIO2.txt >>> >>> [concat] Testsuites with failed tests: >>> [concat] >>> TEST-org.apache.catalina.loader.TestWebappClassLoaderThreadLocalMemoryLeak.NIO2.txt >>> >> >> This is just plain strange. It is doing it consistently at least but >> only for Gump not for buildbot and not when I run the tests locally on >> Linux. I wonder if it is related to how Gump sets up the class path. >> I'll take a look. > > One of the failing openssl tests earlier today also contained a log line > about IBM JVM. Haven't checked though, what JVM Gump is using. The tests keep a record of all the known Ciphers supported by IBM and Oracle JVMs and a list of ciphers implemented by OpenSSL that are known not to supported. The idea is when OpenSSL adds support for a new cipher either the name matches one of the known supported or unsupported ciphers and if not, the test fails so we realise we have to explicitly add the mapping or known unsupported entry. In this case it was a new cipher not supported by IBM. I believe I have fixed the OpenSSL Gump failures for trunk (OpenSSL 1.1.0) and 8.0.x (OpenSSL 1.0.2). There are still other failures to look at but it is getting late here so I'll leave that for another day. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1660257 - /tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
Author: markt
Date: Tue Feb 17 00:05:46 2015
New Revision: 1660257
URL: http://svn.apache.org/r1660257
Log:
Add more Cipher info. Align with trunk.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java?rev=1660257&r1=1660256&r2=1660257&view=diff
==
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
Tue Feb 17 00:05:46 2015
@@ -1675,6 +1675,174 @@ public enum Cipher {
256,
256
),
+// Cipher BA
+TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256(
+"CAMELLIA128-SHA256",
+KeyExchange.RSA,
+Authentication.RSA,
+Encryption.CAMELLIA128,
+MessageDigest.SHA256,
+Protocol.TLSv1_2,
+false,
+EncryptionLevel.HIGH,
+false,
+128,
+128
+),
+// Cipher BB
+TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA256(
+"DH-DSS-CAMELLIA128-SHA256",
+KeyExchange.DHd,
+Authentication.DH,
+Encryption.CAMELLIA128,
+MessageDigest.SHA256,
+Protocol.TLSv1_2,
+false,
+EncryptionLevel.HIGH,
+false,
+128,
+128
+),
+// Cipher BC
+TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA256(
+"DH-RSA-CAMELLIA128-SHA256",
+KeyExchange.DHr,
+Authentication.DH,
+Encryption.CAMELLIA128,
+MessageDigest.SHA256,
+Protocol.TLSv1_2,
+false,
+EncryptionLevel.HIGH,
+false,
+128,
+128
+),
+// Cipher BD
+TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256(
+"DHE-DSS-CAMELLIA128-SHA256",
+KeyExchange.EDH,
+Authentication.DSS,
+Encryption.CAMELLIA128,
+MessageDigest.SHA256,
+Protocol.TLSv1_2,
+false,
+EncryptionLevel.HIGH,
+false,
+128,
+128
+),
+// Cipher BE
+TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256(
+"DHE-RSA-CAMELLIA128-SHA256",
+KeyExchange.EDH,
+Authentication.RSA,
+Encryption.CAMELLIA128,
+MessageDigest.SHA256,
+Protocol.TLSv1_2,
+false,
+EncryptionLevel.HIGH,
+false,
+128,
+128
+),
+// Cipher BF
+TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA256(
+"ADH-CAMELLIA128-SHA256",
+KeyExchange.EDH,
+Authentication.aNULL,
+Encryption.CAMELLIA128,
+MessageDigest.SHA256,
+Protocol.TLSv1_2,
+false,
+EncryptionLevel.HIGH,
+false,
+128,
+128
+),
+// Cipher C0
+TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256(
+"CAMELLIA256-SHA256",
+KeyExchange.RSA,
+Authentication.RSA,
+Encryption.CAMELLIA256,
+MessageDigest.SHA256,
+Protocol.TLSv1_2,
+false,
+EncryptionLevel.HIGH,
+false,
+256,
+256
+),
+// Cipher C1
+TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA256(
+"DH-DSS-CAMELLIA256-SHA256",
+KeyExchange.DHd,
+Authentication.DH,
+Encryption.CAMELLIA256,
+MessageDigest.SHA256,
+Protocol.TLSv1_2,
+false,
+EncryptionLevel.HIGH,
+false,
+256,
+256
+),
+// Cipher C2
+TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA256(
+"DH-RSA-CAMELLIA256-SHA256",
+KeyExchange.DHr,
+Authentication.DH,
+Encryption.CAMELLIA256,
+MessageDigest.SHA256,
+Protocol.TLSv1_2,
+false,
+EncryptionLevel.HIGH,
+false,
+256,
+256
+),
+// Cipher C3
+TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256(
+"DHE-DSS-CAMELLIA256-SHA256",
+KeyExchange.EDH,
+Authentication.DSS,
+Encryption.CAMELLIA256,
+MessageDigest.SHA256,
+Protocol.TLSv1_2,
+false,
+EncryptionLevel.HIGH,
+false,
+256,
+256
+),
+// Cipher C4
+TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256(
+"DHE-RSA-CAMELLIA256-SHA256",
+KeyExchange.EDH,
+Authentication.RSA,
+Encryption.CAMELLIA256,
+MessageDigest.SHA256,
+
svn commit: r1660256 - /tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
Author: markt
Date: Mon Feb 16 23:50:59 2015
New Revision: 1660256
URL: http://svn.apache.org/r1660256
Log:
Add note
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java?rev=1660256&r1=1660255&r2=1660256&view=diff
==
---
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
Mon Feb 16 23:50:59 2015
@@ -47,6 +47,8 @@ public class TesterOpenSSL {
Cipher.TLS_RSA_EXPORT1024_WITH_RC4_56_MD5)));
static {
+// Note: The tests are configured for OpenSSL 1.1.0. Running with a
+// different version is likely to trigger failures
String expected_version =
System.getProperty("tomcat.test.openssl.version", "");
String versionString = null;
try {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1660255 - /tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
Author: markt
Date: Mon Feb 16 23:50:46 2015
New Revision: 1660255
URL: http://svn.apache.org/r1660255
Log:
Add note
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java?rev=1660255&r1=1660254&r2=1660255&view=diff
==
---
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
(original)
+++
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
Mon Feb 16 23:50:46 2015
@@ -47,6 +47,8 @@ public class TesterOpenSSL {
Cipher.TLS_RSA_EXPORT1024_WITH_RC4_56_MD5)));
static {
+// Note: The tests are configured for OpenSSL 1.0.2. Running with a
+// different version is likely to trigger failures
String expected_version =
System.getProperty("tomcat.test.openssl.version", "");
String versionString = null;
try {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1660254 - /tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Author: markt
Date: Mon Feb 16 23:48:15 2015
New Revision: 1660254
URL: http://svn.apache.org/r1660254
Log:
Unknown to IBM
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java?rev=1660254&r1=1660253&r2=1660254&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Mon Feb 16 23:48:15 2015
@@ -539,6 +539,8 @@ public class TestCipher {
Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
"ADH-CAMELLIA128-SHA+SSLv3",
"ADH-CAMELLIA256-SHA+SSLv3",
+"ADH-CAMELLIA128-SHA256+TLSv1.2",
+"ADH-CAMELLIA256-SHA256+TLSv1.2",
"ADH-SEED-SHA+SSLv3",
"CAMELLIA128-SHA+SSLv3",
"CAMELLIA256-SHA+SSLv3",
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1660253 - /tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
Author: markt
Date: Mon Feb 16 23:45:01 2015
New Revision: 1660253
URL: http://svn.apache.org/r1660253
Log:
Fix copy/paste oversight
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java?rev=1660253&r1=1660252&r2=1660253&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java Mon
Feb 16 23:45:01 2015
@@ -1829,19 +1829,19 @@ public enum Cipher {
256,
256
),
-// + 0x00,0xC5 - ADH-CAMELLIA256-SHA256 TLSv1.2 Kx=DH Au=None
Enc=Camellia(256) Mac=SHA256
+// Cipher C5
TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA256(
-"DHE-RSA-CAMELLIA128-SHA256",
+"ADH-CAMELLIA256-SHA256",
KeyExchange.EDH,
-Authentication.RSA,
-Encryption.CAMELLIA128,
+Authentication.aNULL,
+Encryption.CAMELLIA256,
MessageDigest.SHA256,
Protocol.TLSv1_2,
false,
EncryptionLevel.HIGH,
false,
-128,
-128
+256,
+256
),
/* ECC ciphersuites from draft-ietf-tls-ecc-01.txt (
Mar 15, 2001) */
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1660252 - /tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Author: markt
Date: Mon Feb 16 23:43:21 2015
New Revision: 1660252
URL: http://svn.apache.org/r1660252
Log:
Unknown to IBM
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java?rev=1660252&r1=1660251&r2=1660252&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Mon Feb 16 23:43:21 2015
@@ -542,6 +542,8 @@ public class TestCipher {
"ADH-SEED-SHA+SSLv3",
"CAMELLIA128-SHA+SSLv3",
"CAMELLIA256-SHA+SSLv3",
+"CAMELLIA128-SHA256+TLSv1.2",
+"CAMELLIA256-SHA256+TLSv1.2",
"DES-CBC-MD5+SSLv2",
"DES-CBC3-MD5+SSLv2",
"DH-DSS-AES128-GCM-SHA256+TLSv1.2",
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1660251 - /tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
Author: markt
Date: Mon Feb 16 23:40:51 2015
New Revision: 1660251
URL: http://svn.apache.org/r1660251
Log:
Remaining new ciphers
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java?rev=1660251&r1=1660250&r2=1660251&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java Mon
Feb 16 23:40:51 2015
@@ -1675,52 +1675,94 @@ public enum Cipher {
256,
256
),
-// Cipher C1
-TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA256(
-"DH-DSS-CAMELLIA256-SHA256",
+// Cipher BA
+TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256(
+"CAMELLIA128-SHA256",
+KeyExchange.RSA,
+Authentication.RSA,
+Encryption.CAMELLIA128,
+MessageDigest.SHA256,
+Protocol.TLSv1_2,
+false,
+EncryptionLevel.HIGH,
+false,
+128,
+128
+),
+// Cipher BB
+TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA256(
+"DH-DSS-CAMELLIA128-SHA256",
KeyExchange.DHd,
Authentication.DH,
-Encryption.CAMELLIA256,
+Encryption.CAMELLIA128,
MessageDigest.SHA256,
Protocol.TLSv1_2,
false,
EncryptionLevel.HIGH,
false,
-256,
-256
+128,
+128
),
-// Cipher C2
-TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA256(
-"DH-RSA-CAMELLIA256-SHA256",
+// Cipher BC
+TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA256(
+"DH-RSA-CAMELLIA128-SHA256",
KeyExchange.DHr,
Authentication.DH,
-Encryption.CAMELLIA256,
+Encryption.CAMELLIA128,
MessageDigest.SHA256,
Protocol.TLSv1_2,
false,
EncryptionLevel.HIGH,
false,
-256,
-256
+128,
+128
),
-// Cipher C3
-TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256(
-"DHE-DSS-CAMELLIA256-SHA256",
+// Cipher BD
+TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256(
+"DHE-DSS-CAMELLIA128-SHA256",
KeyExchange.EDH,
Authentication.DSS,
-Encryption.CAMELLIA256,
+Encryption.CAMELLIA128,
MessageDigest.SHA256,
Protocol.TLSv1_2,
false,
EncryptionLevel.HIGH,
false,
-256,
-256
+128,
+128
),
-// Cipher C4
-TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256(
-"DHE-RSA-CAMELLIA256-SHA256",
+// Cipher BE
+TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256(
+"DHE-RSA-CAMELLIA128-SHA256",
+KeyExchange.EDH,
+Authentication.RSA,
+Encryption.CAMELLIA128,
+MessageDigest.SHA256,
+Protocol.TLSv1_2,
+false,
+EncryptionLevel.HIGH,
+false,
+128,
+128
+),
+// Cipher BF
+TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA256(
+"ADH-CAMELLIA128-SHA256",
KeyExchange.EDH,
+Authentication.aNULL,
+Encryption.CAMELLIA128,
+MessageDigest.SHA256,
+Protocol.TLSv1_2,
+false,
+EncryptionLevel.HIGH,
+false,
+128,
+128
+),
+// Cipher C0
+TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256(
+"CAMELLIA256-SHA256",
+KeyExchange.RSA,
Authentication.RSA,
Encryption.CAMELLIA256,
MessageDigest.SHA256,
@@ -1731,50 +1773,64 @@ public enum Cipher {
256,
256
),
-// Cipher BB
-TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA256(
-"DH-DSS-CAMELLIA128-SHA256",
+// Cipher C1
+TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA256(
+"DH-DSS-CAMELLIA256-SHA256",
KeyExchange.DHd,
Authentication.DH,
-Encryption.CAMELLIA128,
+Encryption.CAMELLIA256,
MessageDigest.SHA256,
Protocol.TLSv1_2,
false,
EncryptionLevel.HIGH,
false,
-128,
-128
+256,
+256
),
-// Cipher BC
-TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA256(
-"DH-RSA-CAMELLIA128-SHA256",
+// Cipher C2
+TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA256(
+"DH-RSA-CAMELLIA256-SHA256",
KeyExchange.DHr,
Authentication.DH,
-Encryption.CAMELLIA128,
+Encryption.CAM
svn commit: r1660248 - in /tomcat/trunk: java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Author: markt
Date: Mon Feb 16 23:21:26 2015
New Revision: 1660248
URL: http://svn.apache.org/r1660248
Log:
EDH ciphers not unsupported but renamed to DHE
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java?rev=1660248&r1=1660247&r2=1660248&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java Mon
Feb 16 23:21:26 2015
@@ -280,7 +280,7 @@ public enum Cipher {
/* The Ephemeral DH ciphers */
// Cipher 11
TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA(
-"EXP-EDH-DSS-DES-CBC-SHA",
+"EXP-DHE-DSS-DES-CBC-SHA",
KeyExchange.EDH,
Authentication.DSS,
Encryption.DES,
@@ -295,7 +295,7 @@ public enum Cipher {
),
// Cipher 12
TLS_DHE_DSS_WITH_DES_CBC_SHA(
-"EDH-DSS-DES-CBC-SHA",
+"DHE-DSS-DES-CBC-SHA",
KeyExchange.EDH,
Authentication.DSS,
Encryption.DES,
@@ -310,7 +310,7 @@ public enum Cipher {
),
// Cipher 13
TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA(
-"EDH-DSS-DES-CBC3-SHA",
+"DHE-DSS-DES-CBC3-SHA",
KeyExchange.EDH,
Authentication.DSS,
Encryption.TRIPLE_DES,
@@ -325,7 +325,7 @@ public enum Cipher {
),
// Cipher 14
TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA(
-"EXP-EDH-RSA-DES-CBC-SHA",
+"EXP-DHE-RSA-DES-CBC-SHA",
KeyExchange.EDH,
Authentication.RSA,
Encryption.DES,
@@ -340,7 +340,7 @@ public enum Cipher {
),
// Cipher 15
TLS_DHE_RSA_WITH_DES_CBC_SHA(
-"EDH-RSA-DES-CBC-SHA",
+"DHE-RSA-DES-CBC-SHA",
KeyExchange.EDH,
Authentication.RSA,
Encryption.DES,
@@ -355,7 +355,7 @@ public enum Cipher {
),
// Cipher 16
TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA(
-"EDH-RSA-DES-CBC3-SHA",
+"DHE-RSA-DES-CBC3-SHA",
KeyExchange.EDH,
Authentication.RSA,
Encryption.TRIPLE_DES,
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java?rev=1660248&r1=1660247&r2=1660248&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Mon Feb 16 23:21:26 2015
@@ -111,11 +111,6 @@ public class TestCipher {
if (cipher.getProtocol().equals(Protocol.SSLv2)) {
continue;
}
-// As of OpenSSl 1.1.0, EDH ciphers are not supported to exclude
-// them from the expected list
-if (openSSLAlias.contains("EDH-")) {
-continue;
-}
expectedCipherSuites.add(openSSLAlias + "+" +
cipher.getProtocol().getOpenSSLName());
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1660244 - /tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
On 16/02/2015 23:12, ma...@apache.org wrote:
> Author: markt
> Date: Mon Feb 16 23:12:43 2015
> New Revision: 1660244
>
> URL: http://svn.apache.org/r1660244
> Log:
> OpenSSL 1.1.0 drops support for a number of ciphers. Remove them from the
> expected list.
This has the added advantage that the full list of missing ciphers is
now reported in the test failure.
10 more to go.
Mark
>
> Modified:
> tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
>
> Modified:
> tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java?rev=1660244&r1=1660243&r2=1660244&view=diff
> ==
> --- tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
> (original)
> +++ tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
> Mon Feb 16 23:12:43 2015
> @@ -106,6 +106,16 @@ public class TestCipher {
> if (openSSLAlias.contains("RC2-MD5")) {
> continue;
> }
> +// As of OpenSSL 1.1.0, SSLv2 ciphers are not suported so exclude
> +// them from the expected list
> +if (cipher.getProtocol().equals(Protocol.SSLv2)) {
> +continue;
> +}
> +// As of OpenSSl 1.1.0, EDH ciphers are not supported to exclude
> +// them from the expected list
> +if (openSSLAlias.contains("EDH-")) {
> +continue;
> +}
> expectedCipherSuites.add(openSSLAlias + "+" +
> cipher.getProtocol().getOpenSSLName());
> }
>
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1660244 - /tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Author: markt
Date: Mon Feb 16 23:12:43 2015
New Revision: 1660244
URL: http://svn.apache.org/r1660244
Log:
OpenSSL 1.1.0 drops support for a number of ciphers. Remove them from the
expected list.
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java?rev=1660244&r1=1660243&r2=1660244&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Mon Feb 16 23:12:43 2015
@@ -106,6 +106,16 @@ public class TestCipher {
if (openSSLAlias.contains("RC2-MD5")) {
continue;
}
+// As of OpenSSL 1.1.0, SSLv2 ciphers are not suported so exclude
+// them from the expected list
+if (cipher.getProtocol().equals(Protocol.SSLv2)) {
+continue;
+}
+// As of OpenSSl 1.1.0, EDH ciphers are not supported to exclude
+// them from the expected list
+if (openSSLAlias.contains("EDH-")) {
+continue;
+}
expectedCipherSuites.add(openSSLAlias + "+" +
cipher.getProtocol().getOpenSSLName());
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1660243 - in /tomcat/trunk: java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Author: markt
Date: Mon Feb 16 23:00:46 2015
New Revision: 1660243
URL: http://svn.apache.org/r1660243
Log:
4 new ciphers supported in OpenSSL 1.1.0
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java?rev=1660243&r1=1660242&r2=1660243&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java Mon
Feb 16 23:00:46 2015
@@ -2505,6 +2505,34 @@ public enum Cipher {
128,
128
),
+// Cipher C073
+TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384(
+"ECDHE-ECDSA-CAMELLIA256-SHA384",
+KeyExchange.ECDHe,
+Authentication.ECDSA,
+Encryption.CAMELLIA256,
+MessageDigest.SHA384,
+Protocol.TLSv1_2,
+false,
+EncryptionLevel.HIGH,
+true,
+256,
+256
+),
+// Cipher C074
+TLS_ECDH_ECDSA_WITH_CAMELLIA_128_CBC_SHA256(
+"ECDH-ECDSA-CAMELLIA128-SHA256",
+KeyExchange.ECDHr,
+Authentication.ECDSA,
+Encryption.CAMELLIA128,
+MessageDigest.SHA256,
+Protocol.TLSv1_2,
+false,
+EncryptionLevel.HIGH,
+true,
+128,
+128
+),
// Cipher C075
TLS_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384(
"ECDH-ECDSA-CAMELLIA256-SHA384",
@@ -2526,6 +2554,34 @@ public enum Cipher {
Authentication.RSA,
Encryption.CAMELLIA128,
MessageDigest.SHA256,
+Protocol.TLSv1_2,
+false,
+EncryptionLevel.HIGH,
+true,
+128,
+128
+),
+// Cipher C077
+TLS_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384(
+"ECDHE-RSA-CAMELLIA256-SHA384",
+KeyExchange.ECDHe,
+Authentication.RSA,
+Encryption.CAMELLIA256,
+MessageDigest.SHA384,
+Protocol.TLSv1_2,
+false,
+EncryptionLevel.HIGH,
+true,
+256,
+256
+),
+// Cipher C078
+TLS_ECDH_RSA_WITH_CAMELLIA_128_CBC_SHA256(
+"ECDH-RSA-CAMELLIA128-SHA256",
+KeyExchange.ECDHr,
+Authentication.RSA,
+Encryption.CAMELLIA128,
+MessageDigest.SHA256,
Protocol.TLSv1_2,
false,
EncryptionLevel.HIGH,
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java?rev=1660243&r1=1660242&r2=1660243&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Mon Feb 16 23:00:46 2015
@@ -383,10 +383,14 @@ public class TestCipher {
Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
"DES-CBC-MD5+SSLv2",
"DES-CBC3-MD5+SSLv2",
+"ECDH-ECDSA-CAMELLIA128-SHA256+TLSv1.2",
"ECDH-ECDSA-CAMELLIA256-SHA384+TLSv1.2",
+"ECDH-RSA-CAMELLIA128-SHA256+TLSv1.2",
"ECDH-RSA-CAMELLIA256-SHA384+TLSv1.2",
"ECDHE-ECDSA-CAMELLIA128-SHA256+TLSv1.2",
+"ECDHE-ECDSA-CAMELLIA256-SHA384+TLSv1.2",
"ECDHE-RSA-CAMELLIA128-SHA256+TLSv1.2",
+"ECDHE-RSA-CAMELLIA256-SHA384+TLSv1.2",
"EXP-RC2-CBC-MD5+SSLv2",
"EXP-RC4-MD5+SSLv2",
"IDEA-CBC-MD5+SSLv2",
@@ -571,10 +575,14 @@ public class TestCipher {
"DHE-RSA-CAMELLIA256-SHA+SSLv3",
"DHE-RSA-CAMELLIA256-SHA256+TLSv1.2",
"DHE-RSA-SEED-SHA+SSLv3",
+"ECDH-ECDSA-CAMELLIA128-SHA256+TLSv1.2",
"ECDH-ECDSA-CAMELLIA256-SHA384+TLSv1.2",
+"ECDH-RSA-CAMELLIA128-SHA256+TLSv1.2",
"ECDH-RSA-CAMELLIA256-SHA384+TLSv1.2",
"ECDHE-ECDSA-CAMELLIA128-SHA256+TLSv1.2",
+"ECDHE-ECDSA-CAMELLIA256-SHA384+TLSv1.2",
"ECDHE-RSA-CAMELLIA128-SHA256+TLSv1.2",
+"ECDHE-RSA-CAMELLIA256-SHA384+TLSv1.2",
"EXP-DH-DSS-DES-CBC-SHA+SSLv3",
"EXP-DH-RSA-DES-CBC-SHA+SSLv3",
svn commit: r1660241 - in /tomcat/trunk: java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Author: markt
Date: Mon Feb 16 22:47:15 2015
New Revision: 1660241
URL: http://svn.apache.org/r1660241
Log:
2 more cipher suites new to OpenSSL 1.1.0
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java?rev=1660241&r1=1660240&r2=1660241&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java Mon
Feb 16 22:47:15 2015
@@ -2491,6 +2491,20 @@ public enum Cipher {
256,
256
),
+// Cipher C072
+TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256(
+"ECDHE-ECDSA-CAMELLIA128-SHA256",
+KeyExchange.ECDHe,
+Authentication.ECDSA,
+Encryption.CAMELLIA128,
+MessageDigest.SHA256,
+Protocol.TLSv1_2,
+false,
+EncryptionLevel.HIGH,
+true,
+128,
+128
+),
// Cipher C075
TLS_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384(
"ECDH-ECDSA-CAMELLIA256-SHA384",
@@ -2505,6 +2519,20 @@ public enum Cipher {
256,
256
),
+// Cipher C076
+TLS_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256(
+"ECDHE-RSA-CAMELLIA128-SHA256",
+KeyExchange.ECDHe,
+Authentication.RSA,
+Encryption.CAMELLIA128,
+MessageDigest.SHA256,
+Protocol.TLSv1_2,
+false,
+EncryptionLevel.HIGH,
+true,
+128,
+128
+),
// Cipher C079
TLS_ECDH_RSA_WITH_CAMELLIA_256_CBC_SHA384(
"ECDH-RSA-CAMELLIA256-SHA384",
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java?rev=1660241&r1=1660240&r2=1660241&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Mon Feb 16 22:47:15 2015
@@ -385,6 +385,8 @@ public class TestCipher {
"DES-CBC3-MD5+SSLv2",
"ECDH-ECDSA-CAMELLIA256-SHA384+TLSv1.2",
"ECDH-RSA-CAMELLIA256-SHA384+TLSv1.2",
+"ECDHE-ECDSA-CAMELLIA128-SHA256+TLSv1.2",
+"ECDHE-RSA-CAMELLIA128-SHA256+TLSv1.2",
"EXP-RC2-CBC-MD5+SSLv2",
"EXP-RC4-MD5+SSLv2",
"IDEA-CBC-MD5+SSLv2",
@@ -571,6 +573,8 @@ public class TestCipher {
"DHE-RSA-SEED-SHA+SSLv3",
"ECDH-ECDSA-CAMELLIA256-SHA384+TLSv1.2",
"ECDH-RSA-CAMELLIA256-SHA384+TLSv1.2",
+"ECDHE-ECDSA-CAMELLIA128-SHA256+TLSv1.2",
+"ECDHE-RSA-CAMELLIA128-SHA256+TLSv1.2",
"EXP-DH-DSS-DES-CBC-SHA+SSLv3",
"EXP-DH-RSA-DES-CBC-SHA+SSLv3",
"EXP-RC2-CBC-MD5+SSLv2",
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1660239 - in /tomcat/trunk: java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Author: markt
Date: Mon Feb 16 22:39:50 2015
New Revision: 1660239
URL: http://svn.apache.org/r1660239
Log:
2 more cipher suites new to OpenSSL 1.1.0
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java?rev=1660239&r1=1660238&r2=1660239&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java Mon
Feb 16 22:39:50 2015
@@ -2491,6 +2491,34 @@ public enum Cipher {
256,
256
),
+// Cipher C075
+TLS_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384(
+"ECDH-ECDSA-CAMELLIA256-SHA384",
+KeyExchange.ECDHr,
+Authentication.ECDSA,
+Encryption.CAMELLIA256,
+MessageDigest.SHA384,
+Protocol.TLSv1_2,
+false,
+EncryptionLevel.HIGH,
+true,
+256,
+256
+),
+// Cipher C079
+TLS_ECDH_RSA_WITH_CAMELLIA_256_CBC_SHA384(
+"ECDH-RSA-CAMELLIA256-SHA384",
+KeyExchange.ECDHr,
+Authentication.RSA,
+Encryption.CAMELLIA256,
+MessageDigest.SHA384,
+Protocol.TLSv1_2,
+false,
+EncryptionLevel.HIGH,
+true,
+256,
+256
+),
// RC4_128_WITH_MD5
SSL_CK_RC4_128_WITH_MD5(
"RC4-MD5",
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java?rev=1660239&r1=1660238&r2=1660239&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Mon Feb 16 22:39:50 2015
@@ -383,6 +383,8 @@ public class TestCipher {
Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
"DES-CBC-MD5+SSLv2",
"DES-CBC3-MD5+SSLv2",
+"ECDH-ECDSA-CAMELLIA256-SHA384+TLSv1.2",
+"ECDH-RSA-CAMELLIA256-SHA384+TLSv1.2",
"EXP-RC2-CBC-MD5+SSLv2",
"EXP-RC4-MD5+SSLv2",
"IDEA-CBC-MD5+SSLv2",
@@ -567,6 +569,8 @@ public class TestCipher {
"DHE-RSA-CAMELLIA256-SHA+SSLv3",
"DHE-RSA-CAMELLIA256-SHA256+TLSv1.2",
"DHE-RSA-SEED-SHA+SSLv3",
+"ECDH-ECDSA-CAMELLIA256-SHA384+TLSv1.2",
+"ECDH-RSA-CAMELLIA256-SHA384+TLSv1.2",
"EXP-DH-DSS-DES-CBC-SHA+SSLv3",
"EXP-DH-RSA-DES-CBC-SHA+SSLv3",
"EXP-RC2-CBC-MD5+SSLv2",
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1660233 - /tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Author: markt
Date: Mon Feb 16 22:29:00 2015
New Revision: 1660233
URL: http://svn.apache.org/r1660233
Log:
Fix copy/paste error
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java?rev=1660233&r1=1660232&r2=1660233&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Mon Feb 16 22:29:00 2015
@@ -538,8 +538,8 @@ public class TestCipher {
"DH-DSS-AES256-SHA+SSLv3",
"DH-DSS-AES256-SHA256+TLSv1.2",
"DH-DSS-CAMELLIA128-SHA+SSLv3",
+"DH-DSS-CAMELLIA128-SHA256+TLSv1.2",
"DH-DSS-CAMELLIA256-SHA+SSLv3",
-"DH-DSS-CAMELLIA256-SHA128+TLSv1.2",
"DH-DSS-CAMELLIA256-SHA256+TLSv1.2",
"DH-DSS-DES-CBC-SHA+SSLv3",
"DH-DSS-DES-CBC3-SHA+SSLv3",
@@ -551,20 +551,20 @@ public class TestCipher {
"DH-RSA-AES256-SHA+SSLv3",
"DH-RSA-AES256-SHA256+TLSv1.2",
"DH-RSA-CAMELLIA128-SHA+SSLv3",
+"DH-RSA-CAMELLIA128-SHA256+TLSv1.2",
"DH-RSA-CAMELLIA256-SHA+SSLv3",
-"DH-RSA-CAMELLIA256-SHA128+TLSv1.2",
"DH-RSA-CAMELLIA256-SHA256+TLSv1.2",
"DH-RSA-DES-CBC-SHA+SSLv3",
"DH-RSA-DES-CBC3-SHA+SSLv3",
"DH-RSA-SEED-SHA+SSLv3",
"DHE-DSS-CAMELLIA128-SHA+SSLv3",
+"DHE-DSS-CAMELLIA128-SHA256+TLSv1.2",
"DHE-DSS-CAMELLIA256-SHA+SSLv3",
-"DHE-DSS-CAMELLIA256-SHA128+TLSv1.2",
"DHE-DSS-CAMELLIA256-SHA256+TLSv1.2",
"DHE-DSS-SEED-SHA+SSLv3",
"DHE-RSA-CAMELLIA128-SHA+SSLv3",
+"DHE-RSA-CAMELLIA128-SHA256+TLSv1.2",
"DHE-RSA-CAMELLIA256-SHA+SSLv3",
-"DHE-RSA-CAMELLIA256-SHA128+TLSv1.2",
"DHE-RSA-CAMELLIA256-SHA256+TLSv1.2",
"DHE-RSA-SEED-SHA+SSLv3",
"EXP-DH-DSS-DES-CBC-SHA+SSLv3",
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1660232 - in /tomcat/trunk: java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Author: markt
Date: Mon Feb 16 22:26:37 2015
New Revision: 1660232
URL: http://svn.apache.org/r1660232
Log:
Another four new Ciphers for OpenSSL 1.1.0
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java?rev=1660232&r1=1660231&r2=1660232&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java Mon
Feb 16 22:26:37 2015
@@ -1731,6 +1731,62 @@ public enum Cipher {
256,
256
),
+// Cipher BB
+TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA256(
+"DH-DSS-CAMELLIA128-SHA256",
+KeyExchange.DHd,
+Authentication.DH,
+Encryption.CAMELLIA128,
+MessageDigest.SHA256,
+Protocol.TLSv1_2,
+false,
+EncryptionLevel.HIGH,
+false,
+128,
+128
+),
+// Cipher BC
+TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA256(
+"DH-RSA-CAMELLIA128-SHA256",
+KeyExchange.DHr,
+Authentication.DH,
+Encryption.CAMELLIA128,
+MessageDigest.SHA256,
+Protocol.TLSv1_2,
+false,
+EncryptionLevel.HIGH,
+false,
+128,
+128
+),
+// Cipher BD
+TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256(
+"DHE-DSS-CAMELLIA128-SHA256",
+KeyExchange.EDH,
+Authentication.DSS,
+Encryption.CAMELLIA128,
+MessageDigest.SHA256,
+Protocol.TLSv1_2,
+false,
+EncryptionLevel.HIGH,
+false,
+128,
+128
+),
+// Cipher BE
+TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256(
+"DHE-RSA-CAMELLIA128-SHA256",
+KeyExchange.EDH,
+Authentication.RSA,
+Encryption.CAMELLIA128,
+MessageDigest.SHA256,
+Protocol.TLSv1_2,
+false,
+EncryptionLevel.HIGH,
+false,
+128,
+128
+),
/* ECC ciphersuites from draft-ietf-tls-ecc-01.txt (
Mar 15, 2001) */
// Cipher C001
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java?rev=1660232&r1=1660231&r2=1660232&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Mon Feb 16 22:26:37 2015
@@ -539,6 +539,7 @@ public class TestCipher {
"DH-DSS-AES256-SHA256+TLSv1.2",
"DH-DSS-CAMELLIA128-SHA+SSLv3",
"DH-DSS-CAMELLIA256-SHA+SSLv3",
+"DH-DSS-CAMELLIA256-SHA128+TLSv1.2",
"DH-DSS-CAMELLIA256-SHA256+TLSv1.2",
"DH-DSS-DES-CBC-SHA+SSLv3",
"DH-DSS-DES-CBC3-SHA+SSLv3",
@@ -551,16 +552,19 @@ public class TestCipher {
"DH-RSA-AES256-SHA256+TLSv1.2",
"DH-RSA-CAMELLIA128-SHA+SSLv3",
"DH-RSA-CAMELLIA256-SHA+SSLv3",
+"DH-RSA-CAMELLIA256-SHA128+TLSv1.2",
"DH-RSA-CAMELLIA256-SHA256+TLSv1.2",
"DH-RSA-DES-CBC-SHA+SSLv3",
"DH-RSA-DES-CBC3-SHA+SSLv3",
"DH-RSA-SEED-SHA+SSLv3",
"DHE-DSS-CAMELLIA128-SHA+SSLv3",
"DHE-DSS-CAMELLIA256-SHA+SSLv3",
+"DHE-DSS-CAMELLIA256-SHA128+TLSv1.2",
"DHE-DSS-CAMELLIA256-SHA256+TLSv1.2",
"DHE-DSS-SEED-SHA+SSLv3",
"DHE-RSA-CAMELLIA128-SHA+SSLv3",
"DHE-RSA-CAMELLIA256-SHA+SSLv3",
+"DHE-RSA-CAMELLIA256-SHA128+TLSv1.2",
"DHE-RSA-CAMELLIA256-SHA256+TLSv1.2",
"DHE-RSA-SEED-SHA+SSLv3",
"EXP-DH-DSS-DES-CBC-SHA+SSLv3",
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1660231 - /tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Author: markt
Date: Mon Feb 16 22:21:47 2015
New Revision: 1660231
URL: http://svn.apache.org/r1660231
Log:
Correction. Oracle does support these ciphers
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java?rev=1660231&r1=1660230&r2=1660231&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Mon Feb 16 22:21:47 2015
@@ -383,10 +383,6 @@ public class TestCipher {
Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
"DES-CBC-MD5+SSLv2",
"DES-CBC3-MD5+SSLv2",
-"DH-DSS-CAMELLIA256-SHA256+TLSv1.2",
-"DH-RSA-CAMELLIA256-SHA256+TLSv1.2",
-"DHE-DSS-CAMELLIA256-SHA256+TLSv1.2",
-"DHE-RSA-CAMELLIA256-SHA256+TLSv1.2",
"EXP-RC2-CBC-MD5+SSLv2",
"EXP-RC4-MD5+SSLv2",
"IDEA-CBC-MD5+SSLv2",
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1660229 - /tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Author: markt
Date: Mon Feb 16 22:17:33 2015
New Revision: 1660229
URL: http://svn.apache.org/r1660229
Log:
Neither Oracle nor IBm JREs support these new ciphers
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java?rev=1660229&r1=1660228&r2=1660229&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Mon Feb 16 22:17:33 2015
@@ -383,6 +383,10 @@ public class TestCipher {
Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
"DES-CBC-MD5+SSLv2",
"DES-CBC3-MD5+SSLv2",
+"DH-DSS-CAMELLIA256-SHA256+TLSv1.2",
+"DH-RSA-CAMELLIA256-SHA256+TLSv1.2",
+"DHE-DSS-CAMELLIA256-SHA256+TLSv1.2",
+"DHE-RSA-CAMELLIA256-SHA256+TLSv1.2",
"EXP-RC2-CBC-MD5+SSLv2",
"EXP-RC4-MD5+SSLv2",
"IDEA-CBC-MD5+SSLv2",
@@ -539,6 +543,7 @@ public class TestCipher {
"DH-DSS-AES256-SHA256+TLSv1.2",
"DH-DSS-CAMELLIA128-SHA+SSLv3",
"DH-DSS-CAMELLIA256-SHA+SSLv3",
+"DH-DSS-CAMELLIA256-SHA256+TLSv1.2",
"DH-DSS-DES-CBC-SHA+SSLv3",
"DH-DSS-DES-CBC3-SHA+SSLv3",
"DH-DSS-SEED-SHA+SSLv3",
@@ -550,14 +555,17 @@ public class TestCipher {
"DH-RSA-AES256-SHA256+TLSv1.2",
"DH-RSA-CAMELLIA128-SHA+SSLv3",
"DH-RSA-CAMELLIA256-SHA+SSLv3",
+"DH-RSA-CAMELLIA256-SHA256+TLSv1.2",
"DH-RSA-DES-CBC-SHA+SSLv3",
"DH-RSA-DES-CBC3-SHA+SSLv3",
"DH-RSA-SEED-SHA+SSLv3",
"DHE-DSS-CAMELLIA128-SHA+SSLv3",
"DHE-DSS-CAMELLIA256-SHA+SSLv3",
+"DHE-DSS-CAMELLIA256-SHA256+TLSv1.2",
"DHE-DSS-SEED-SHA+SSLv3",
"DHE-RSA-CAMELLIA128-SHA+SSLv3",
"DHE-RSA-CAMELLIA256-SHA+SSLv3",
+"DHE-RSA-CAMELLIA256-SHA256+TLSv1.2",
"DHE-RSA-SEED-SHA+SSLv3",
"EXP-DH-DSS-DES-CBC-SHA+SSLv3",
"EXP-DH-RSA-DES-CBC-SHA+SSLv3",
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1660227 - /tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
Author: markt
Date: Mon Feb 16 22:14:18 2015
New Revision: 1660227
URL: http://svn.apache.org/r1660227
Log:
4 new ciphers supported in OpenSSL 1.1.0
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java?rev=1660227&r1=1660226&r2=1660227&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java Mon
Feb 16 22:14:18 2015
@@ -1675,6 +1675,62 @@ public enum Cipher {
256,
256
),
+// Cipher C1
+TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA256(
+"DH-DSS-CAMELLIA256-SHA256",
+KeyExchange.DHd,
+Authentication.DH,
+Encryption.CAMELLIA256,
+MessageDigest.SHA256,
+Protocol.TLSv1_2,
+false,
+EncryptionLevel.HIGH,
+false,
+256,
+256
+),
+// Cipher C2
+TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA256(
+"DH-RSA-CAMELLIA256-SHA256",
+KeyExchange.DHr,
+Authentication.DH,
+Encryption.CAMELLIA256,
+MessageDigest.SHA256,
+Protocol.TLSv1_2,
+false,
+EncryptionLevel.HIGH,
+false,
+256,
+256
+),
+// Cipher C3
+TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256(
+"DHE-DSS-CAMELLIA256-SHA256",
+KeyExchange.EDH,
+Authentication.DSS,
+Encryption.CAMELLIA256,
+MessageDigest.SHA256,
+Protocol.TLSv1_2,
+false,
+EncryptionLevel.HIGH,
+false,
+256,
+256
+),
+// Cipher C4
+TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256(
+"DHE-RSA-CAMELLIA256-SHA256",
+KeyExchange.EDH,
+Authentication.RSA,
+Encryption.CAMELLIA256,
+MessageDigest.SHA256,
+Protocol.TLSv1_2,
+false,
+EncryptionLevel.HIGH,
+false,
+256,
+256
+),
/* ECC ciphersuites from draft-ietf-tls-ecc-01.txt (
Mar 15, 2001) */
// Cipher C001
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1659806 - /tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
Mark,
On 2/14/15 11:40 AM, ma...@apache.org wrote:
> Author: markt
> Date: Sat Feb 14 16:40:20 2015
> New Revision: 1659806
>
> URL: http://svn.apache.org/r1659806
> Log:
> Fix a concurrency issue in the APR Poller that meant it was possible under
> low load for a socket queued to be added to the Poller not to be added for 10
> seconds.
*Low* load? If only that were a big problem for everyone :)
-chris
> Modified:
> tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
>
> Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1659806&r1=1659805&r2=1659806&view=diff
> ==
> --- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
> +++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Sat Feb 14
> 16:40:20 2015
> @@ -1636,7 +1636,15 @@ public class AprEndpoint extends Abstrac
> maintain();
> }
> synchronized (this) {
> -this.wait(1);
> +// Make sure that no sockets have been placed in
> the
> +// addList or closeList since the check above.
> +// Without this check there could be a 10s pause
> +// with no processing since the notify() call in
> +// add()/close() would have no effect since it
> +// happened before this sync block was entered
> +if (addList.size() < 1 && closeList.size() < 1) {
> +this.wait(1);
> +}
> }
> } catch (InterruptedException e) {
> // Ignore
> @@ -1654,25 +1662,25 @@ public class AprEndpoint extends Abstrac
> try {
> // Duplicate the add and remove lists so that the syncs
> are
> // minimised
> -if (closeList.size() > 0) {
> -synchronized (this) {
> +synchronized (this) {
> +if (closeList.size() > 0) {
> // Duplicate to another list, so that the
> syncing is
> // minimal
> closeList.duplicate(localCloseList);
> closeList.clear();
> +} else {
> +localCloseList.clear();
> }
> -} else {
> -localCloseList.clear();
> }
> -if (addList.size() > 0) {
> -synchronized (this) {
> +synchronized (this) {
> +if (addList.size() > 0) {
> // Duplicate to another list, so that the
> syncing is
> // minimal
> addList.duplicate(localAddList);
> addList.clear();
> +} else {
> +localAddList.clear();
> }
> -} else {
> -localAddList.clear();
> }
>
> // Remove sockets
>
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
signature.asc
Description: OpenPGP digital signature
[GUMP@vmgump]: 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.apache.org/gump/public/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 commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs The following work was performed: http://vmgump.apache.org/gump/public/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: 24 mins 37 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150216-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20150216/lib -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150216.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150216-native-src.tar.gz -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest .openssl.path=/srv/gump/public/workspace/openssl/dest-20150216/bin/openssl -Dexecute.test.apr=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-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/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:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/output/bu ild/lib/
[Bug 57251] WAR deployment unbelievably slow when unpackWARs=false
https://bz.apache.org/bugzilla/show_bug.cgi?id=57251 --- Comment #25 from Francisco A. Lozano --- Any decision taken about this issue? -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1660169 - in /tomcat/tc8.0.x/trunk: ./ test/org/apache/tomcat/unittest/TesterCounter.java test/org/apache/tomcat/unittest/TesterLeakingServlet1.java test/org/apache/tomcat/unittest/Tester
Author: markt Date: Mon Feb 16 17:21:30 2015 New Revision: 1660169 URL: http://svn.apache.org/r1660169 Log: Add some debug information to memory leak tests that are currently failing on Gump. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/test/org/apache/tomcat/unittest/TesterCounter.java tomcat/tc8.0.x/trunk/test/org/apache/tomcat/unittest/TesterLeakingServlet1.java tomcat/tc8.0.x/trunk/test/org/apache/tomcat/unittest/TesterLeakingServlet2.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Feb 16 17:21:30 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659919,1659967,1659983-1659984,1660060,1660074,1660077,1660133 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,165
svn commit: r1660168 - in /tomcat/trunk/test/org/apache/tomcat/unittest: TesterCounter.java TesterLeakingServlet1.java TesterLeakingServlet2.java
Author: markt
Date: Mon Feb 16 17:20:40 2015
New Revision: 1660168
URL: http://svn.apache.org/r1660168
Log:
Add some debug information to memory leak tests that are currently failing on
Gump.
Modified:
tomcat/trunk/test/org/apache/tomcat/unittest/TesterCounter.java
tomcat/trunk/test/org/apache/tomcat/unittest/TesterLeakingServlet1.java
tomcat/trunk/test/org/apache/tomcat/unittest/TesterLeakingServlet2.java
Modified: tomcat/trunk/test/org/apache/tomcat/unittest/TesterCounter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/unittest/TesterCounter.java?rev=1660168&r1=1660167&r2=1660168&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/unittest/TesterCounter.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/unittest/TesterCounter.java Mon Feb 16
17:20:40 2015
@@ -16,7 +16,18 @@
*/
package org.apache.tomcat.unittest;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+
public class TesterCounter {
+
+private static final Log log = LogFactory.getLog(TesterCounter.class);
+
+static {
+log.info("TestCounter loaded by " +
TesterCounter.class.getClassLoader() +
+" in thread " + Thread.currentThread().getName());
+}
+
private int count = 0;
public void increment() {
Modified:
tomcat/trunk/test/org/apache/tomcat/unittest/TesterLeakingServlet1.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/unittest/TesterLeakingServlet1.java?rev=1660168&r1=1660167&r2=1660168&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/unittest/TesterLeakingServlet1.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/unittest/TesterLeakingServlet1.java Mon
Feb 16 17:20:40 2015
@@ -23,8 +23,13 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+
public class TesterLeakingServlet1 extends HttpServlet {
+private static final Log log =
LogFactory.getLog(TesterLeakingServlet1.class);
+
private static final long serialVersionUID = 1L;
private ThreadLocal myThreadLocal = new ThreadLocal<>();
@@ -36,6 +41,7 @@ public class TesterLeakingServlet1 exten
TesterCounter counter = myThreadLocal.get();
if (counter == null) {
+log.info("Adding thread local to thread " +
Thread.currentThread().getName());
counter = new TesterCounter();
myThreadLocal.set(counter);
}
Modified:
tomcat/trunk/test/org/apache/tomcat/unittest/TesterLeakingServlet2.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/unittest/TesterLeakingServlet2.java?rev=1660168&r1=1660167&r2=1660168&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/unittest/TesterLeakingServlet2.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/unittest/TesterLeakingServlet2.java Mon
Feb 16 17:20:40 2015
@@ -25,10 +25,15 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+
public class TesterLeakingServlet2 extends HttpServlet {
private static final long serialVersionUID = 1L;
+private static final Log log =
LogFactory.getLog(TesterLeakingServlet2.class);
+
@Override
protected void doGet(HttpServletRequest request,
@@ -38,6 +43,7 @@ public class TesterLeakingServlet2 exten
List counterList =
TesterThreadScopedHolder.getFromHolder();
TesterCounter counter;
if (counterList == null) {
+log.info("Adding thread local to thread " +
Thread.currentThread().getName());
counter = new TesterCounter();
TesterThreadScopedHolder.saveInHolder(Arrays.asList(counter));
} else {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: 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.apache.org/gump/public/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 commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-NIO2 -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs The following work was performed: http://vmgump.apache.org/gump/public/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: 25 mins 13 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-NIO2 -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150216-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150216.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150216-native-src.tar.gz -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl/dest-20150216/bin/opens sl -Dexecute.test.apr=false -Dexecute.test.nio2=true -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-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/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:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/output/bu ild/lib/tomcat-spdy.jar:/srv/gump/public/workspace/tomcat-trunk/out
Re: [GUMP@vmgump]: Project tomcat-tc8.0.x-test-nio2 (in module tomcat-8.0.x) failed
Am 16.02.2015 um 16:09 schrieb Mark Thomas: On 16/02/2015 14:49, Bill Barker wrote: test: [concat] Testsuites with skipped tests: [concat] TEST-org.apache.catalina.connector.TestRequest.NIO2.txt [concat] TEST-org.apache.tomcat.util.net.jsse.openssl.TestOpenSSLCipherConfigurationParser.NIO2.txt [concat] Testsuites with failed tests: [concat] TEST-org.apache.catalina.loader.TestWebappClassLoaderThreadLocalMemoryLeak.NIO2.txt This is just plain strange. It is doing it consistently at least but only for Gump not for buildbot and not when I run the tests locally on Linux. I wonder if it is related to how Gump sets up the class path. I'll take a look. One of the failing openssl tests earlier today also contained a log line about IBM JVM. Haven't checked though, what JVM Gump is using. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1660158 - /tomcat/trunk/BUILDING.txt
Author: markt Date: Mon Feb 16 16:29:31 2015 New Revision: 1660158 URL: http://svn.apache.org/r1660158 Log: Fix typo Modified: tomcat/trunk/BUILDING.txt Modified: tomcat/trunk/BUILDING.txt URL: http://svn.apache.org/viewvc/tomcat/trunk/BUILDING.txt?rev=1660158&r1=1660157&r2=1660158&view=diff == --- tomcat/trunk/BUILDING.txt (original) +++ tomcat/trunk/BUILDING.txt Mon Feb 16 16:29:31 2015 @@ -414,7 +414,7 @@ For example: 7. Some tests include checks that the access log valve entries are as expected. These checks include timings. On slower / loaded systems these checks will -often fail. The checks may be relaxed by using the following proeprty: +often fail. The checks may be relaxed by using the following property: test.relaxTiming=true - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1660157 - /tomcat/tc8.0.x/trunk/BUILDING.txt
Author: markt Date: Mon Feb 16 16:26:25 2015 New Revision: 1660157 URL: http://svn.apache.org/r1660157 Log: Fix typo Modified: tomcat/tc8.0.x/trunk/BUILDING.txt Modified: tomcat/tc8.0.x/trunk/BUILDING.txt URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/BUILDING.txt?rev=1660157&r1=1660156&r2=1660157&view=diff == --- tomcat/tc8.0.x/trunk/BUILDING.txt (original) +++ tomcat/tc8.0.x/trunk/BUILDING.txt Mon Feb 16 16:26:25 2015 @@ -411,7 +411,7 @@ For example: 7. Some tests include checks that the access log valve entries are as expected. These checks include timings. On slower / loaded systems these checks will -often fail. The checks may be relaxed by using the following proeprty: +often fail. The checks may be relaxed by using the following property: test.relaxTiming=true - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-trunk-test-nio (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-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-trunk-test-nio : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-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 commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-NIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio.html Work Name: build_tomcat-trunk_tomcat-trunk-test-nio (Type: Build) Work ended in a state of : Failed Elapsed: 26 mins 28 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-NIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150216-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150216.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150216-native-src.tar.gz -Dtest.temp=output/test-tmp-NIO -Dtest.accesslog=true -Dexecute.test.nio=true -Dtest.openssl.path=/srv/gump/public/workspace/openssl/dest-20150216/bin/openssl -Dexecute.test.apr=false -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-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/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:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/output/bu ild/lib/tomcat-spdy.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/
Re: [GUMP@vmgump]: Project tomcat-tc8.0.x-test-nio2 (in module tomcat-8.0.x) failed
On 16/02/2015 14:49, Bill Barker wrote: > test: >[concat] Testsuites with skipped tests: >[concat] TEST-org.apache.catalina.connector.TestRequest.NIO2.txt >[concat] > TEST-org.apache.tomcat.util.net.jsse.openssl.TestOpenSSLCipherConfigurationParser.NIO2.txt >[concat] Testsuites with failed tests: >[concat] > TEST-org.apache.catalina.loader.TestWebappClassLoaderThreadLocalMemoryLeak.NIO2.txt This is just plain strange. It is doing it consistently at least but only for Gump not for buildbot and not when I run the tests locally on Linux. I wonder if it is related to how Gump sets up the class path. I'll take a look. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1660134 - in /tomcat/tc8.0.x/trunk: ./ java/javax/el/ImportHandler.java test/javax/servlet/jsp/TesterPageContext.java test/javax/servlet/jsp/el/ webapps/docs/changelog.xml
Author: markt Date: Mon Feb 16 15:06:12 2015 New Revision: 1660134 URL: http://svn.apache.org/r1660134 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57583 Cache NotFound results in ImportHandler to save repeated attempts to load classes that do not exist. Added: tomcat/tc8.0.x/trunk/test/javax/servlet/jsp/TesterPageContext.java - copied unchanged from r1660133, tomcat/trunk/test/javax/servlet/jsp/TesterPageContext.java tomcat/tc8.0.x/trunk/test/javax/servlet/jsp/el/ - copied from r1660133, tomcat/trunk/test/javax/servlet/jsp/el/ Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/javax/el/ImportHandler.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Feb 16 15:06:12 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659919,1659967,1659983-1659984,1660060,1660074,1660077 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1
[Bug 57583] Performance issue evaluating EL in custom tags (tagx) due to inefficient calls to java.lang.Class.forName()
https://bz.apache.org/bugzilla/show_bug.cgi?id=57583 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #2 from Mark Thomas --- Fixed in trunk and 8.0.x for 8.0.21 onwards. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1660133 - in /tomcat/trunk: java/javax/el/ImportHandler.java test/javax/servlet/jsp/TesterPageContext.java test/javax/servlet/jsp/el/ test/javax/servlet/jsp/el/TestScopedAttributeELResolv
Author: markt
Date: Mon Feb 16 15:02:32 2015
New Revision: 1660133
URL: http://svn.apache.org/r1660133
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57583
Cache NotFound results in ImportHandler to save repeated attempts to load
classes that do not exost.
Added:
tomcat/trunk/test/javax/servlet/jsp/TesterPageContext.java (with props)
tomcat/trunk/test/javax/servlet/jsp/el/
tomcat/trunk/test/javax/servlet/jsp/el/TestScopedAttributeELResolverPerformance.java
(with props)
Modified:
tomcat/trunk/java/javax/el/ImportHandler.java
Modified: tomcat/trunk/java/javax/el/ImportHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ImportHandler.java?rev=1660133&r1=1660132&r2=1660133&view=diff
==
--- tomcat/trunk/java/javax/el/ImportHandler.java (original)
+++ tomcat/trunk/java/javax/el/ImportHandler.java Mon Feb 16 15:02:32 2015
@@ -140,7 +140,11 @@ public class ImportHandler {
Class result = clazzes.get(name);
if (result != null) {
-return result;
+if (NotFound.class.equals(result)) {
+return null;
+} else {
+return result;
+}
}
// Search the class imports
@@ -167,7 +171,11 @@ public class ImportHandler {
result = clazz;
}
}
-if (result != null) {
+if (result == null) {
+// Cache NotFound results to save repeated calls to findClass()
+// which is relatively slow
+clazzes.put(name, NotFound.class);
+} else {
clazzes.put(name, result);
}
@@ -199,4 +207,12 @@ public class ImportHandler {
return clazz;
}
+
+
+/*
+ * Marker class used because null values are not permitted in a
+ * ConcurrentHashMap.
+ */
+private static class NotFound {
+}
}
Added: tomcat/trunk/test/javax/servlet/jsp/TesterPageContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/javax/servlet/jsp/TesterPageContext.java?rev=1660133&view=auto
==
--- tomcat/trunk/test/javax/servlet/jsp/TesterPageContext.java (added)
+++ tomcat/trunk/test/javax/servlet/jsp/TesterPageContext.java Mon Feb 16
15:02:32 2015
@@ -0,0 +1,195 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package javax.servlet.jsp;
+
+import java.io.IOException;
+import java.util.Enumeration;
+
+import javax.el.ELContext;
+import javax.servlet.Servlet;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpSession;
+
+public class TesterPageContext extends PageContext {
+
+@Override
+public void initialize(Servlet servlet, ServletRequest request,
+ServletResponse response, String errorPageURL,
+boolean needsSession, int bufferSize, boolean autoFlush)
+throws IOException, IllegalStateException,
IllegalArgumentException {
+// NO-OP
+}
+
+@Override
+public void release() {
+// NO-OP
+}
+
+@Override
+public HttpSession getSession() {
+// NO-OP
+return null;
+}
+
+@Override
+public Object getPage() {
+// NO-OP
+return null;
+}
+
+@Override
+public ServletRequest getRequest() {
+// NO-OP
+return null;
+}
+
+@Override
+public ServletResponse getResponse() {
+// NO-OP
+return null;
+}
+
+@Override
+public Exception getException() {
+// NO-OP
+return null;
+}
+
+@Override
+public ServletConfig getServletConfig() {
+// NO-OP
+return null;
+}
+
+@Override
+public ServletContext getServletContext() {
+// NO-OP
+return null;
+}
+
+@Override
+public void forward(String relativeUrlPath) throws ServletException,
+IOException {
+// NO-OP
+
+}
+
+@Override
+public void include(String
[Bug 57583] Performance issue evaluating EL in custom tags (tagx) due to inefficient calls to java.lang.Class.forName()
https://bz.apache.org/bugzilla/show_bug.cgi?id=57583 --- Comment #1 from Mark Thomas --- In theory, you should be safe swapping API implementation classes but it is likely you will see different behaviour as different implmentations will have fixed different bugs. Personally, I wouldn't swap implementations. I'd rather stick with a known problem than risk an untested, unsupported combination. >From a Tomcat PoV we are normally only going to support folks that are using the Tomcat API implementations. In this case the reason you see better performance is that Glassfish hasn't added the required support for imports in the version you are using. Looking at the Glassfish source it appears that this is partially fixed (statics don't appear to be supported yet) in trunk which should be in the next release. In terms of solving the performance problem I think we need to cache "Not Found" results as well. I'll take a look. -- 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
[GUMP@vmgump]: Project tomcat-tc8.0.x-test-nio2 (in module tomcat-8.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc8.0.x-test-nio2 has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc8.0.x-test-nio2 : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/logs-NIO2 -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2 (Type: Build) Work ended in a state of : Failed Elapsed: 27 mins 1 sec Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-NIO2 -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150216-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150216.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150216-native-src.tar.gz -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20150216/bin /openssl -Dexecute.test.apr=false -Dexecute.test.bio=false -Dexecute.test.nio2=true -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-8.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/bu ild/lib/tomcat-spdy.jar:/srv/g
Re: [VOTE] Release Apache Tomcat 8.0.20
2015-02-15 21:46 GMT+03:00 Mark Thomas : > The proposed Apache Tomcat 8.0.20 release is now available for voting. > > > The proposed 8.0.20 release is: > [ ] Broken - do not release > [ ] Stable - go ahead and release as 8.0.20 > I am abstaining for now. Using JDK 7u76, win, 32-bit Unit tests pass. Smoke testing: I see an issue with numberwriter example. Test: 1) go to /examples/servlets/nonblocking/numberwriter with a web browser 2) look into access log Expected: status 200 Actual: status 500 for APR, NIO, NIO2. (BIO is OK) NIO sometimes show status 200. NIO+HTTPS shows status 200. A GET request is sufficient to trigger this, so I first noted this with wget -r examples and searched the log for " 500 ". The downloaded file is OK. There are no error messages in JULI log files. Looking into my old logs for testing 8.0.18, this was observed in that version as well, so it is not a regression. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57489] java.util.concurrent.ExecutionException: java.io.IOException: Key must be cancelled
https://bz.apache.org/bugzilla/show_bug.cgi?id=57489 --- Comment #12 from Mark Thomas --- A handful of additional fixes that might be related to this have gone into the 8.0.20 release candidate. An update on whether or not the issue is still present would be appreciated. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1660081 - in /tomcat/tc8.0.x/trunk: ./ test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParser.java
Author: markt Date: Mon Feb 16 11:49:14 2015 New Revision: 1660081 URL: http://svn.apache.org/r1660081 Log: Enable additional tests as OpenSSL 1.0.2 recognises kDHE and DHE as valid options for selecting ciphers. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParser.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Feb 16 11:49:14 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659919,1659967,1659983-1659984,1660060,1660074 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,
svn commit: r1660077 - /tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParser.java
Author: markt
Date: Mon Feb 16 11:48:31 2015
New Revision: 1660077
URL: http://svn.apache.org/r1660077
Log:
Enable additional tests as OpenSSL 1.0.2 recognises kDHE and DHE as valid
options for selecting ciphers.
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParser.java
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParser.java?rev=1660077&r1=1660076&r2=1660077&view=diff
==
---
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParser.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParser.java
Mon Feb 16 11:48:31 2015
@@ -123,7 +123,6 @@ public class TestOpenSSLCipherConfigurat
@Test
-@Ignore("Contrary to the docs, OpenSSL does not recognise kDHE")
public void testkDHE() throws Exception {
testSpecification("kDHE");
}
@@ -136,7 +135,6 @@ public class TestOpenSSLCipherConfigurat
@Test
-@Ignore("Contrary to the docs, OpenSSL does not recognise DHE")
public void testDHE() throws Exception {
testSpecification("DHE");
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1660075 - in /tomcat/tc8.0.x/trunk: ./ test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
Author: markt Date: Mon Feb 16 11:45:48 2015 New Revision: 1660075 URL: http://svn.apache.org/r1660075 Log: Fixes for OpenSSL 1.0.2 which implements 24 new DH ciphers. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Feb 16 11:45:48 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659919,1659967,1659983-1659984,1660060 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,165880
svn commit: r1660074 - in /tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl: TestCipher.java TesterOpenSSL.java
Author: markt
Date: Mon Feb 16 11:44:04 2015
New Revision: 1660074
URL: http://svn.apache.org/r1660074
Log:
Fixes for OpenSSL 1.0.2 which implements 24 new DH ciphers.
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java?rev=1660074&r1=1660073&r2=1660074&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Mon Feb 16 11:44:04 2015
@@ -92,14 +92,6 @@ public class TestCipher {
if (openSSLAlias.contains("GOST")) {
continue;
}
-// OpenSSL does not implement any DH-DSS or DH-RSA algorithms so
-// exclude them from the expected list
-if (openSSLAlias.startsWith("DH-DSS") ||
openSSLAlias.startsWith("EXP-DH-DSS")) {
-continue;
-}
-if (openSSLAlias.startsWith("DH-RSA") ||
openSSLAlias.startsWith("EXP-DH-RSA")) {
-continue;
-}
// OpenSSL does not enable the experimental EXP1024 and
// DHE-DSS-RC4-SHA cipher suites unless the source is explicitly
// patched so exclude them from the expected list
@@ -403,6 +395,10 @@ public class TestCipher {
*
http://www-01.ibm.com/support/knowledgecenter/SSYKE2_7.0.0/com.ibm.java.security.component.71.doc/security-component/jsse2Docs/ciphersuites.html?lang=en
* on 29th July 2014.
*
+ * As of 16 February 2015 the list for IBM Java 7 was identical to that for
+ * IBM Java 8
+ *
http://www-01.ibm.com/support/knowledgecenter/SSYKE2_8.0.0/com.ibm.java.security.component.80.doc/security-component/jsse2Docs/ciphersuites.html?lang=en
+ *
* Note that IBM cipher suites names can begin with TLS or SSL.
*/
private static final Set CIPHER_SUITE_STANDARD_NAMES_IBM;
@@ -535,12 +531,36 @@ public class TestCipher {
"CAMELLIA256-SHA+SSLv3",
"DES-CBC-MD5+SSLv2",
"DES-CBC3-MD5+SSLv2",
+"DH-DSS-AES128-GCM-SHA256+TLSv1.2",
+"DH-DSS-AES256-GCM-SHA384+TLSv1.2",
+"DH-DSS-AES128-SHA+SSLv3",
+"DH-DSS-AES128-SHA256+TLSv1.2",
+"DH-DSS-AES256-SHA+SSLv3",
+"DH-DSS-AES256-SHA256+TLSv1.2",
+"DH-DSS-CAMELLIA128-SHA+SSLv3",
+"DH-DSS-CAMELLIA256-SHA+SSLv3",
+"DH-DSS-DES-CBC-SHA+SSLv3",
+"DH-DSS-DES-CBC3-SHA+SSLv3",
+"DH-DSS-SEED-SHA+SSLv3",
+"DH-RSA-AES128-GCM-SHA256+TLSv1.2",
+"DH-RSA-AES256-GCM-SHA384+TLSv1.2",
+"DH-RSA-AES128-SHA+SSLv3",
+"DH-RSA-AES128-SHA256+TLSv1.2",
+"DH-RSA-AES256-SHA+SSLv3",
+"DH-RSA-AES256-SHA256+TLSv1.2",
+"DH-RSA-CAMELLIA128-SHA+SSLv3",
+"DH-RSA-CAMELLIA256-SHA+SSLv3",
+"DH-RSA-DES-CBC-SHA+SSLv3",
+"DH-RSA-DES-CBC3-SHA+SSLv3",
+"DH-RSA-SEED-SHA+SSLv3",
"DHE-DSS-CAMELLIA128-SHA+SSLv3",
"DHE-DSS-CAMELLIA256-SHA+SSLv3",
"DHE-DSS-SEED-SHA+SSLv3",
"DHE-RSA-CAMELLIA128-SHA+SSLv3",
"DHE-RSA-CAMELLIA256-SHA+SSLv3",
"DHE-RSA-SEED-SHA+SSLv3",
+"EXP-DH-DSS-DES-CBC-SHA+SSLv3",
+"EXP-DH-RSA-DES-CBC-SHA+SSLv3",
"EXP-RC2-CBC-MD5+SSLv2",
"EXP-RC4-MD5+SSLv2",
"IDEA-CBC-MD5+SSLv2",
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java?rev=1660074&r1=1660073&r2=1660074&view=diff
==
---
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
Mon Feb 16 11:44:04 2015
@@ -34,30 +34,6 @@ public class TesterOpenSSL {
public static final Set OPENSSL_UNIMPLEMENTED_CIPHERS =
Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
-Cipher.TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA,
-Cipher.TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA,
-Cipher.TLS_DH_DSS_
[GUMP@vmgump]: 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.apache.org/gump/public/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 commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs The following work was performed: http://vmgump.apache.org/gump/public/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: 24 mins 13 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150216-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20150216/lib -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150216.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150216-native-src.tar.gz -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest .openssl.path=/srv/gump/public/workspace/openssl/dest-20150216/bin/openssl -Dexecute.test.apr=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-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/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:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/output/bu ild/lib/
Re: [GUMP@vmgump]: Project tomcat-tc8.0.x-test-nio2 (in module tomcat-8.0.x) failed
On 16/02/2015 11:18, Rainer Jung wrote: > Am 16.02.2015 um 11:30 schrieb Mark Thomas: >> On 16/02/2015 10:19, Rainer Jung wrote: >>> Am 16.02.2015 um 08:49 schrieb Bill Barker: >>> [concat] Testsuites with failed tests: [concat] TEST-org.apache.catalina.loader.TestWebappClassLoaderThreadLocalMemoryLeak.NIO2.txt [concat] TEST-org.apache.tomcat.util.net.jsse.openssl.TestCipher.NIO2.txt [concat] TEST-org.apache.tomcat.util.net.jsse.openssl.TestOpenSSLCipherConfigurationParser.NIO2.txt >>> >>> For the openssl falures, it seems that for OpenSSL 1.0.2 compatibility >>> at least the following ciphers have to be added to Ciphers.java: >>> >>> SSL_DH_DSS_EXPORT_WITH_DES40_CBC_SHA >>> SSL_DH_DSS_WITH_3DES_EDE_CBC_SHA >>> SSL_DH_DSS_WITH_DES_CBC_SHA >>> SSL_DH_RSA_EXPORT_WITH_DES40_CBC_SHA >>> SSL_DH_RSA_WITH_3DES_EDE_CBC_SHA >>> SSL_DH_RSA_WITH_DES_CBC_SHA >>> TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA >>> TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA >>> TLS_DH_DSS_WITH_AES_128_CBC_SHA >>> TLS_DH_DSS_WITH_AES_128_CBC_SHA256 >>> TLS_DH_DSS_WITH_AES_128_GCM_SHA256 >>> TLS_DH_DSS_WITH_AES_256_CBC_SHA >>> TLS_DH_DSS_WITH_AES_256_CBC_SHA256 >>> TLS_DH_DSS_WITH_AES_256_GCM_SHA384 >>> TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA >>> TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA >>> TLS_DH_DSS_WITH_DES_CBC_SHA >>> TLS_DH_DSS_WITH_SEED_CBC_SHA >>> TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA >>> TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA >>> TLS_DH_RSA_WITH_AES_128_CBC_SHA >>> TLS_DH_RSA_WITH_AES_128_CBC_SHA256 >>> TLS_DH_RSA_WITH_AES_128_GCM_SHA256 >>> TLS_DH_RSA_WITH_AES_256_CBC_SHA >>> TLS_DH_RSA_WITH_AES_256_CBC_SHA256 >>> >>> I can do it over the week. >> >> Hmm. I only checked that last one but it is already listed in Ciphers. >> Looking at the names, I'd expect most if not all of them to be there >> already. >> >> I wonder if this is a case of fixing the name mappings and/or the "what >> ciphers are implemented where" lists? > > You are right: the ciphers that 1.0.2 knows and are not in Ciphers.java > are not the ones that the unit test complains about. I have to stop > investigation soon, but will come back later. Some seem to need SSLv3 > instead of TLS, others I don't understand yet. > > Note that the tests haven't run on Gump before today. > > I'll come back to this later. I've just been through it and it is as simple as: - adding the newly implemented ciphers to the list IBM does not support - removing them from the list OpenSSL doesn't support. I have a commit ready to go to fix this just as soon as I fix the conflict that has just appeared. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 8.0.20
Am 15.02.2015 um 19:46 schrieb Mark Thomas: The proposed Apache Tomcat 8.0.20 release is now available for voting. The main changes since 8.0.18 are: - Fix a performance regression in the new resources implementation when signed JARs are used in a web application. - Fix several bugs that could cause multiple registrations for write events for a single socket when using Servlet 3.0 async. Typically, the side effects of these multiple registrations would be exceptions appearing in the logs. - Enhance the bean factory used for JNDI resources. The new attribute forceString allows to support non-standard string argument property setters. There is also the usual collection of bug fixes, new features and performance improvements. For full details, see the changelog: http://svn.us.apache.org/repos/asf/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.20/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1036/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc8.0.x/tags/TOMCAT_8_0_20/ The proposed 8.0.20 release is: [ ] Broken - do not release [x] Stable - go ahead and release as 8.0.20 * Checksums are valid * Source in tar.gz and tag are the same (except the modules tomcat-lite and bayeux are in tag only) * Tests pass on ubuntu 14.10 with java 1.7 java version "1.7.0_75" OpenJDK Runtime Environment (IcedTea 2.5.4) (7u75-2.5.4-1~trusty1) OpenJDK 64-Bit Server VM (build 24.75-b04, mixed mode) Regards Felix - 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
Re: [GUMP@vmgump]: Project tomcat-tc8.0.x-test-nio2 (in module tomcat-8.0.x) failed
Am 16.02.2015 um 11:30 schrieb Mark Thomas: On 16/02/2015 10:19, Rainer Jung wrote: Am 16.02.2015 um 08:49 schrieb Bill Barker: [concat] Testsuites with failed tests: [concat] TEST-org.apache.catalina.loader.TestWebappClassLoaderThreadLocalMemoryLeak.NIO2.txt [concat] TEST-org.apache.tomcat.util.net.jsse.openssl.TestCipher.NIO2.txt [concat] TEST-org.apache.tomcat.util.net.jsse.openssl.TestOpenSSLCipherConfigurationParser.NIO2.txt For the openssl falures, it seems that for OpenSSL 1.0.2 compatibility at least the following ciphers have to be added to Ciphers.java: SSL_DH_DSS_EXPORT_WITH_DES40_CBC_SHA SSL_DH_DSS_WITH_3DES_EDE_CBC_SHA SSL_DH_DSS_WITH_DES_CBC_SHA SSL_DH_RSA_EXPORT_WITH_DES40_CBC_SHA SSL_DH_RSA_WITH_3DES_EDE_CBC_SHA SSL_DH_RSA_WITH_DES_CBC_SHA TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA TLS_DH_DSS_WITH_AES_128_CBC_SHA TLS_DH_DSS_WITH_AES_128_CBC_SHA256 TLS_DH_DSS_WITH_AES_128_GCM_SHA256 TLS_DH_DSS_WITH_AES_256_CBC_SHA TLS_DH_DSS_WITH_AES_256_CBC_SHA256 TLS_DH_DSS_WITH_AES_256_GCM_SHA384 TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA TLS_DH_DSS_WITH_DES_CBC_SHA TLS_DH_DSS_WITH_SEED_CBC_SHA TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA TLS_DH_RSA_WITH_AES_128_CBC_SHA TLS_DH_RSA_WITH_AES_128_CBC_SHA256 TLS_DH_RSA_WITH_AES_128_GCM_SHA256 TLS_DH_RSA_WITH_AES_256_CBC_SHA TLS_DH_RSA_WITH_AES_256_CBC_SHA256 I can do it over the week. Hmm. I only checked that last one but it is already listed in Ciphers. Looking at the names, I'd expect most if not all of them to be there already. I wonder if this is a case of fixing the name mappings and/or the "what ciphers are implemented where" lists? You are right: the ciphers that 1.0.2 knows and are not in Ciphers.java are not the ones that the unit test complains about. I have to stop investigation soon, but will come back later. Some seem to need SSLv3 instead of TLS, others I don't understand yet. Note that the tests haven't run on Gump before today. I'll come back to this later. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 8.0.20
2015-02-15 19:46 GMT+01:00 Mark Thomas : > The proposed 8.0.20 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 8.0.20 > Testsuite passes for me as well. Rémy
Re: [GUMP@vmgump]: Project tomcat-tc8.0.x-test-nio2 (in module tomcat-8.0.x) failed
On 16/02/2015 10:30, Mark Thomas wrote: > On 16/02/2015 10:19, Rainer Jung wrote: >> Am 16.02.2015 um 08:49 schrieb Bill Barker: >> >>> [concat] Testsuites with failed tests: >>> [concat] >>> TEST-org.apache.catalina.loader.TestWebappClassLoaderThreadLocalMemoryLeak.NIO2.txt >>> >>> [concat] >>> TEST-org.apache.tomcat.util.net.jsse.openssl.TestCipher.NIO2.txt >>> [concat] >>> TEST-org.apache.tomcat.util.net.jsse.openssl.TestOpenSSLCipherConfigurationParser.NIO2.txt >>> >> >> For the openssl falures, it seems that for OpenSSL 1.0.2 compatibility >> at least the following ciphers have to be added to Ciphers.java: >> >> SSL_DH_DSS_EXPORT_WITH_DES40_CBC_SHA >> SSL_DH_DSS_WITH_3DES_EDE_CBC_SHA >> SSL_DH_DSS_WITH_DES_CBC_SHA >> SSL_DH_RSA_EXPORT_WITH_DES40_CBC_SHA >> SSL_DH_RSA_WITH_3DES_EDE_CBC_SHA >> SSL_DH_RSA_WITH_DES_CBC_SHA >> TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA >> TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA >> TLS_DH_DSS_WITH_AES_128_CBC_SHA >> TLS_DH_DSS_WITH_AES_128_CBC_SHA256 >> TLS_DH_DSS_WITH_AES_128_GCM_SHA256 >> TLS_DH_DSS_WITH_AES_256_CBC_SHA >> TLS_DH_DSS_WITH_AES_256_CBC_SHA256 >> TLS_DH_DSS_WITH_AES_256_GCM_SHA384 >> TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA >> TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA >> TLS_DH_DSS_WITH_DES_CBC_SHA >> TLS_DH_DSS_WITH_SEED_CBC_SHA >> TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA >> TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA >> TLS_DH_RSA_WITH_AES_128_CBC_SHA >> TLS_DH_RSA_WITH_AES_128_CBC_SHA256 >> TLS_DH_RSA_WITH_AES_128_GCM_SHA256 >> TLS_DH_RSA_WITH_AES_256_CBC_SHA >> TLS_DH_RSA_WITH_AES_256_CBC_SHA256 >> >> I can do it over the week. > > Hmm. I only checked that last one but it is already listed in Ciphers. > Looking at the names, I'd expect most if not all of them to be there > already. > > I wonder if this is a case of fixing the name mappings and/or the "what > ciphers are implemented where" lists? Looks like it. DH cipher support is new in 1.0.2 so that means we have some updates to do. I have some time this morning so I'll start looking at this now. Don't know how far I'll get. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [GUMP@vmgump]: Project tomcat-tc8.0.x-test-nio2 (in module tomcat-8.0.x) failed
On 16/02/2015 10:19, Rainer Jung wrote: > Am 16.02.2015 um 08:49 schrieb Bill Barker: > >> [concat] Testsuites with failed tests: >> [concat] >> TEST-org.apache.catalina.loader.TestWebappClassLoaderThreadLocalMemoryLeak.NIO2.txt >> >> [concat] >> TEST-org.apache.tomcat.util.net.jsse.openssl.TestCipher.NIO2.txt >> [concat] >> TEST-org.apache.tomcat.util.net.jsse.openssl.TestOpenSSLCipherConfigurationParser.NIO2.txt >> > > For the openssl falures, it seems that for OpenSSL 1.0.2 compatibility > at least the following ciphers have to be added to Ciphers.java: > > SSL_DH_DSS_EXPORT_WITH_DES40_CBC_SHA > SSL_DH_DSS_WITH_3DES_EDE_CBC_SHA > SSL_DH_DSS_WITH_DES_CBC_SHA > SSL_DH_RSA_EXPORT_WITH_DES40_CBC_SHA > SSL_DH_RSA_WITH_3DES_EDE_CBC_SHA > SSL_DH_RSA_WITH_DES_CBC_SHA > TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA > TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA > TLS_DH_DSS_WITH_AES_128_CBC_SHA > TLS_DH_DSS_WITH_AES_128_CBC_SHA256 > TLS_DH_DSS_WITH_AES_128_GCM_SHA256 > TLS_DH_DSS_WITH_AES_256_CBC_SHA > TLS_DH_DSS_WITH_AES_256_CBC_SHA256 > TLS_DH_DSS_WITH_AES_256_GCM_SHA384 > TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA > TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA > TLS_DH_DSS_WITH_DES_CBC_SHA > TLS_DH_DSS_WITH_SEED_CBC_SHA > TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA > TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA > TLS_DH_RSA_WITH_AES_128_CBC_SHA > TLS_DH_RSA_WITH_AES_128_CBC_SHA256 > TLS_DH_RSA_WITH_AES_128_GCM_SHA256 > TLS_DH_RSA_WITH_AES_256_CBC_SHA > TLS_DH_RSA_WITH_AES_256_CBC_SHA256 > > I can do it over the week. Hmm. I only checked that last one but it is already listed in Ciphers. Looking at the names, I'd expect most if not all of them to be there already. I wonder if this is a case of fixing the name mappings and/or the "what ciphers are implemented where" lists? Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [GUMP@vmgump]: Project tomcat-tc8.0.x-test-nio2 (in module tomcat-8.0.x) failed
Am 16.02.2015 um 08:49 schrieb Bill Barker: [concat] Testsuites with failed tests: [concat] TEST-org.apache.catalina.loader.TestWebappClassLoaderThreadLocalMemoryLeak.NIO2.txt [concat] TEST-org.apache.tomcat.util.net.jsse.openssl.TestCipher.NIO2.txt [concat] TEST-org.apache.tomcat.util.net.jsse.openssl.TestOpenSSLCipherConfigurationParser.NIO2.txt For the openssl falures, it seems that for OpenSSL 1.0.2 compatibility at least the following ciphers have to be added to Ciphers.java: SSL_DH_DSS_EXPORT_WITH_DES40_CBC_SHA SSL_DH_DSS_WITH_3DES_EDE_CBC_SHA SSL_DH_DSS_WITH_DES_CBC_SHA SSL_DH_RSA_EXPORT_WITH_DES40_CBC_SHA SSL_DH_RSA_WITH_3DES_EDE_CBC_SHA SSL_DH_RSA_WITH_DES_CBC_SHA TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA TLS_DH_DSS_WITH_AES_128_CBC_SHA TLS_DH_DSS_WITH_AES_128_CBC_SHA256 TLS_DH_DSS_WITH_AES_128_GCM_SHA256 TLS_DH_DSS_WITH_AES_256_CBC_SHA TLS_DH_DSS_WITH_AES_256_CBC_SHA256 TLS_DH_DSS_WITH_AES_256_GCM_SHA384 TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA TLS_DH_DSS_WITH_DES_CBC_SHA TLS_DH_DSS_WITH_SEED_CBC_SHA TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA TLS_DH_RSA_WITH_AES_128_CBC_SHA TLS_DH_RSA_WITH_AES_128_CBC_SHA256 TLS_DH_RSA_WITH_AES_128_GCM_SHA256 TLS_DH_RSA_WITH_AES_256_CBC_SHA TLS_DH_RSA_WITH_AES_256_CBC_SHA256 I can do it over the week. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1660061 - in /tomcat/tc8.0.x/trunk: ./ test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParser.java
Author: rjung Date: Mon Feb 16 09:39:52 2015 New Revision: 1660061 URL: http://svn.apache.org/r1660061 Log: Improve r1659983 (test output on failure). Backport of r1660060 from trunk. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParser.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Feb 16 09:39:52 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659919,1659967,1659983-1659984 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,16591
svn commit: r1660060 - /tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParser.java
Author: rjung
Date: Mon Feb 16 09:38:41 2015
New Revision: 1660060
URL: http://svn.apache.org/r1660060
Log:
Improve r1659983 (test output on failure).
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParser.java
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParser.java?rev=1660060&r1=1660059&r2=1660060&view=diff
==
---
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParser.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParser.java
Mon Feb 16 09:38:41 2015
@@ -498,11 +498,8 @@ public class TestOpenSSLCipherConfigurat
TesterOpenSSL.removeUnimplementedCiphersJsse(jsseCipherListFromParser);
-String listFromOpenSSL = listToString(jsseCipherListFromOpenSSL);
-String listFromParser = listToString(jsseCipherListFromParser);
-Assert.assertEquals("Cipher list OpenSSL: '" + listFromOpenSSL +
-"', from parser: '" + listFromParser + "'",
-listFromOpenSSL, listFromParser);
+Assert.assertEquals("Tested '" + specification + "': ",
+listToString(jsseCipherListFromOpenSSL),
listToString(jsseCipherListFromParser));
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-tc8.0.x-test-nio2 (in module tomcat-8.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc8.0.x-test-nio2 has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc8.0.x-test-nio2 : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/logs-NIO2 -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2 (Type: Build) Work ended in a state of : Failed Elapsed: 28 mins 24 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-NIO2 -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150216-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150216.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150216-native-src.tar.gz -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20150216/bin /openssl -Dexecute.test.apr=false -Dexecute.test.bio=false -Dexecute.test.nio2=true -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-8.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/bu ild/lib/tomcat-spdy.
