Re: Upcoming release plans

[Rémy Maucherat]

2016-01-04 23:46 GMT+01:00 Mark Thomas :

> The changelog for 9.0.x is getting quite long so I'd like to do a
> release.
>

At this time the APR connector remains the default one when native is used.
I would think it should stay that way for this build, although direct
OpenSSL works for me [at some small performance cost compared to full APR].

Rémy

svn commit: r1723048 - /tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java

[markt]

Author: markt
Date: Tue Jan  5 12:05:17 2016
New Revision: 1723048

URL: http://svn.apache.org/viewvc?rev=1723048&view=rev
Log:
Refactor common code

Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java

Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java?rev=1723048&r1=1723047&r2=1723048&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Tue Jan  
5 12:05:17 2016
@@ -359,20 +359,8 @@ public class Http2UpgradeHandler extends
 if (connectionState.compareAndSet(ConnectionState.CONNECTED, 
ConnectionState.PAUSING)) {
 pausedNanoTime = System.nanoTime();
 
-// Write a GOAWAY frame.
-byte[] fixedPayload = new byte[8];
-ByteUtil.set31Bits(fixedPayload, 0, (1 << 31) - 1);
-ByteUtil.setFourBytes(fixedPayload, 4, 
Http2Error.NO_ERROR.getCode());
-byte[] payloadLength = new byte[3];
-ByteUtil.setThreeBytes(payloadLength, 0, 8);
-
 try {
-synchronized (socketWrapper) {
-socketWrapper.write(true, payloadLength, 0, 
payloadLength.length);
-socketWrapper.write(true, GOAWAY, 0, GOAWAY.length);
-socketWrapper.write(true, fixedPayload, 0, 8);
-socketWrapper.flush(true);
-}
+writeGoAwayFrame((1 << 31) - 1, Http2Error.NO_ERROR.getCode(), 
null);
 } catch (IOException ioe) {
 // This is fatal for the connection. Ignore it here. There 
will be
 // further attempts at I/O in upgradeDispatch() and it can 
better
@@ -392,20 +380,7 @@ public class Http2UpgradeHandler extends
 if (connectionState.get() == ConnectionState.PAUSING) {
 if (pausedNanoTime + pingManager.getRoundTripTimeNano() < 
System.nanoTime()) {
 connectionState.compareAndSet(ConnectionState.PAUSING, 
ConnectionState.PAUSED);
-
-// Write a GOAWAY frame.
-byte[] fixedPayload = new byte[8];
-ByteUtil.set31Bits(fixedPayload, 0, maxProcessedStreamId);
-ByteUtil.setFourBytes(fixedPayload, 4, 
Http2Error.NO_ERROR.getCode());
-byte[] payloadLength = new byte[3];
-ByteUtil.setThreeBytes(payloadLength, 0, 8);
-
-synchronized (socketWrapper) {
-socketWrapper.write(true, payloadLength, 0, 
payloadLength.length);
-socketWrapper.write(true, GOAWAY, 0, GOAWAY.length);
-socketWrapper.write(true, fixedPayload, 0, 8);
-socketWrapper.flush(true);
-}
+writeGoAwayFrame(maxProcessedStreamId, 
Http2Error.NO_ERROR.getCode(), null);
 }
 }
 }
@@ -438,22 +413,9 @@ public class Http2UpgradeHandler extends
 
 
 void closeConnection(Http2Exception ce) {
-// Write a GOAWAY frame.
-byte[] fixedPayload = new byte[8];
-ByteUtil.set31Bits(fixedPayload, 0, maxProcessedStreamId);
-ByteUtil.setFourBytes(fixedPayload, 4, ce.getError().getCode());
-byte[] debugMessage = ce.getMessage().getBytes(StandardCharsets.UTF_8);
-byte[] payloadLength = new byte[3];
-ByteUtil.setThreeBytes(payloadLength, 0, debugMessage.length + 8);
-
 try {
-synchronized (socketWrapper) {
-socketWrapper.write(true, payloadLength, 0, 
payloadLength.length);
-socketWrapper.write(true, GOAWAY, 0, GOAWAY.length);
-socketWrapper.write(true, fixedPayload, 0, 8);
-socketWrapper.write(true, debugMessage, 0, 
debugMessage.length);
-socketWrapper.flush(true);
-}
+writeGoAwayFrame(maxProcessedStreamId, ce.getError().getCode(),
+ce.getMessage().getBytes(StandardCharsets.UTF_8));
 } catch (IOException ioe) {
 // Ignore. GOAWAY is sent on a best efforts basis and the original
 // error has already been logged.
@@ -462,6 +424,29 @@ public class Http2UpgradeHandler extends
 }
 
 
+private void writeGoAwayFrame(int maxStreamId, long errorCode, byte[] 
debugMsg)
+throws IOException {
+byte[] fixedPayload = new byte[8];
+ByteUtil.set31Bits(fixedPayload, 0, maxStreamId);
+ByteUtil.setFourBytes(fixedPayload, 4, errorCode);
+int len = 8;
+if (debugMsg != null) {
+len += debugMsg.length;
+}
+byte[] payloadLength = new byte[3];
+ByteUtil.setThreeBytes(payloadLength, 0, len);
+
+synchronized (socketWrapper) {
+socketWrap

svn commit: r1723053 - /tomcat/native/trunk/java/org/apache/tomcat/

[markt]

Author: markt
Date: Tue Jan  5 12:25:02 2016
New Revision: 1723053

URL: http://svn.apache.org/viewvc?rev=1723053&view=rev
Log:
Update JNI external

Modified:
tomcat/native/trunk/java/org/apache/tomcat/   (props changed)

Propchange: tomcat/native/trunk/java/org/apache/tomcat/
--
--- svn:externals (original)
+++ svn:externals Tue Jan  5 12:25:02 2016
@@ -1 +1 @@
-^/tomcat/trunk/java/org/apache/tomcat/jni@1717806 jni
+^/tomcat/trunk/java/org/apache/tomcat/jni@1719472 jni



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

svn commit: r1723060 - in /tomcat/native/tags/TOMCAT_NATIVE_1_2_4: ./ build.properties.default native/include/tcn_version.h

[markt]

Author: markt
Date: Tue Jan  5 12:39:45 2016
New Revision: 1723060

URL: http://svn.apache.org/viewvc?rev=1723060&view=rev
Log:
Tag 1.2.4

Added:
tomcat/native/tags/TOMCAT_NATIVE_1_2_4/
  - copied from r1723059, tomcat/native/trunk/
Modified:
tomcat/native/tags/TOMCAT_NATIVE_1_2_4/build.properties.default
tomcat/native/tags/TOMCAT_NATIVE_1_2_4/native/include/tcn_version.h

Modified: tomcat/native/tags/TOMCAT_NATIVE_1_2_4/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/native/tags/TOMCAT_NATIVE_1_2_4/build.properties.default?rev=1723060&r1=1723059&r2=1723060&view=diff
==
--- tomcat/native/tags/TOMCAT_NATIVE_1_2_4/build.properties.default (original)
+++ tomcat/native/tags/TOMCAT_NATIVE_1_2_4/build.properties.default Tue Jan  5 
12:39:45 2016
@@ -20,7 +20,7 @@ version.major=1
 version.minor=2
 version.build=4
 version.patch=0
-version.suffix=-dev
+version.suffix=
 
 # - Default Base Path for Dependent Packages -
 # Please note this path must be absolute, not relative,

Modified: tomcat/native/tags/TOMCAT_NATIVE_1_2_4/native/include/tcn_version.h
URL: 
http://svn.apache.org/viewvc/tomcat/native/tags/TOMCAT_NATIVE_1_2_4/native/include/tcn_version.h?rev=1723060&r1=1723059&r2=1723060&view=diff
==
--- tomcat/native/tags/TOMCAT_NATIVE_1_2_4/native/include/tcn_version.h 
(original)
+++ tomcat/native/tags/TOMCAT_NATIVE_1_2_4/native/include/tcn_version.h Tue Jan 
 5 12:39:45 2016
@@ -69,7 +69,7 @@ extern "C" {
  *  This symbol is defined for internal, "development" copies of TCN. This
  *  symbol will be #undef'd for releases.
  */
-#define TCN_IS_DEV_VERSION  1
+#define TCN_IS_DEV_VERSION  0
 
 
 /** The formatted string of APU's version */



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

svn commit: r1723061 - in /tomcat/native/trunk: build.properties.default native/include/tcn_version.h native/os/win32/libtcnative.rc xdocs/miscellaneous/changelog.xml

[markt]

Author: markt
Date: Tue Jan  5 12:42:58 2016
New Revision: 1723061

URL: http://svn.apache.org/viewvc?rev=1723061&view=rev
Log:
Update ready for next tag

Modified:
tomcat/native/trunk/build.properties.default
tomcat/native/trunk/native/include/tcn_version.h
tomcat/native/trunk/native/os/win32/libtcnative.rc
tomcat/native/trunk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/native/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/build.properties.default?rev=1723061&r1=1723060&r2=1723061&view=diff
==
--- tomcat/native/trunk/build.properties.default (original)
+++ tomcat/native/trunk/build.properties.default Tue Jan  5 12:42:58 2016
@@ -18,7 +18,7 @@
 # - Version Control Flags -
 version.major=1
 version.minor=2
-version.build=4
+version.build=5
 version.patch=0
 version.suffix=-dev
 

Modified: tomcat/native/trunk/native/include/tcn_version.h
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/include/tcn_version.h?rev=1723061&r1=1723060&r2=1723061&view=diff
==
--- tomcat/native/trunk/native/include/tcn_version.h (original)
+++ tomcat/native/trunk/native/include/tcn_version.h Tue Jan  5 12:42:58 2016
@@ -63,7 +63,7 @@ extern "C" {
 #define TCN_MINOR_VERSION   2
 
 /** patch level */
-#define TCN_PATCH_VERSION   4
+#define TCN_PATCH_VERSION   5
 
 /**
  *  This symbol is defined for internal, "development" copies of TCN. This

Modified: tomcat/native/trunk/native/os/win32/libtcnative.rc
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/os/win32/libtcnative.rc?rev=1723061&r1=1723060&r2=1723061&view=diff
==
--- tomcat/native/trunk/native/os/win32/libtcnative.rc (original)
+++ tomcat/native/trunk/native/os/win32/libtcnative.rc Tue Jan  5 12:42:58 2016
@@ -20,7 +20,7 @@ LANGUAGE 0x9,0x1
  "See the License for the specific language governing " \
  "permissions and limitations under the License."
 
-#define TCN_VERSION "1.2.4"
+#define TCN_VERSION "1.2.5"
 1000 ICON "apache.ico"
 
 1001 DIALOGEX 0, 0, 252, 51
@@ -36,8 +36,8 @@ BEGIN
 END
 
 1 VERSIONINFO
- FILEVERSION 1,2,4,0
- PRODUCTVERSION 1,2,4,0
+ FILEVERSION 1,2,5,0
+ PRODUCTVERSION 1,2,5,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

Modified: tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/miscellaneous/changelog.xml?rev=1723061&r1=1723060&r2=1723061&view=diff
==
--- tomcat/native/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Tue Jan  5 12:42:58 
2016
@@ -34,6 +34,10 @@
   This is the Changelog for Tomcat Native 1.2.
   
 
+
+  
+  
+
 
   
 



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

svn commit: r1723068 - in /tomcat/trunk: java/org/apache/catalina/servlets/DefaultServlet.java res/findbugs/filter-false-positives.xml webapps/docs/changelog.xml

[violetagg]

Author: violetagg
Date: Tue Jan  5 13:24:30 2016
New Revision: 1723068

URL: http://svn.apache.org/viewvc?rev=1723068&view=rev
Log:
Ensure that the proper file encoding if specified will be used when a readme 
file is served by DefaultServlet.
Update findbugs false positives.

Modified:
tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
tomcat/trunk/res/findbugs/filter-false-positives.xml
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1723068&r1=1723067&r2=1723068&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Tue Jan  
5 13:24:30 2016
@@ -936,7 +936,7 @@ public class DefaultServlet extends Http
 // Output via a writer so can't use sendfile or write
 // content directly.
 if (resource.isDirectory()) {
-renderResult = render(getPathPrefix(request), 
resource);
+renderResult = render(getPathPrefix(request), 
resource, encoding);
 } else {
 renderResult = resource.getInputStream();
 }
@@ -944,7 +944,7 @@ public class DefaultServlet extends Http
 } else {
 // Output is via an InputStream
 if (resource.isDirectory()) {
-renderResult = render(getPathPrefix(request), 
resource);
+renderResult = render(getPathPrefix(request), 
resource, encoding);
 } else {
 // Output is content of resource
 if (!checkSendfile(request, response, resource,
@@ -1248,13 +1248,18 @@ public class DefaultServlet extends Http
  */
 protected InputStream render(String contextPath, WebResource resource)
 throws IOException, ServletException {
+return render(contextPath, resource, null);
+}
+
+protected InputStream render(String contextPath, WebResource resource, 
String encoding)
+throws IOException, ServletException {
 
 Source xsltSource = findXsltSource(resource);
 
 if (xsltSource == null) {
-return renderHtml(contextPath, resource);
+return renderHtml(contextPath, resource, encoding);
 }
-return renderXml(contextPath, resource, xsltSource);
+return renderXml(contextPath, resource, xsltSource, encoding);
 
 }
 
@@ -1265,9 +1270,13 @@ public class DefaultServlet extends Http
  * @param contextPath Context path to which our internal paths are
  *  relative
  */
-protected InputStream renderXml(String contextPath,
-WebResource resource,
-Source xsltSource)
+protected InputStream renderXml(String contextPath, WebResource resource, 
Source xsltSource)
+throws IOException, ServletException {
+return renderXml(contextPath, resource, xsltSource, null);
+}
+
+protected InputStream renderXml(String contextPath, WebResource resource, 
Source xsltSource,
+String encoding)
 throws IOException, ServletException {
 
 StringBuilder sb = new StringBuilder();
@@ -1333,7 +1342,7 @@ public class DefaultServlet extends Http
 }
 sb.append("");
 
-String readme = getReadme(resource);
+String readme = getReadme(resource, encoding);
 
 if (readme!=null) {
 sb.append("

svn commit: r1723070 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/servlets/DefaultServlet.java res/findbugs/filter-false-positives.xml webapps/docs/changelog.xml

[violetagg]

Author: violetagg
Date: Tue Jan  5 13:35:33 2016
New Revision: 1723070

URL: http://svn.apache.org/viewvc?rev=1723070&view=rev
Log:
Merged revision 1723068 from tomcat/trunk:
Ensure that the proper file encoding if specified will be used when a readme 
file is served by DefaultServlet.
Update findbugs false positives.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
tomcat/tc8.0.x/trunk/res/findbugs/filter-false-positives.xml
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan  5 13:35:33 2016
@@ -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,1649973,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,1655351,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,1657
 
609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1
 
666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,168555
 
6,1685591,1685739,1685744,1685772,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1687551,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,168

svn commit: r1723071 - /tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/io/TestXByteBuffer.java

[kkolinko]

Author: kkolinko
Date: Tue Jan  5 13:53:27 2016
New Revision: 1723071

URL: http://svn.apache.org/viewvc?rev=1723071&view=rev
Log:
Convert the test to JUnit 4 and backport a working testcase from Tomcat 7.

I am not backporting testEmptyArray() fix (r1143022). Added a comment 
explaining this decision.

Modified:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/io/TestXByteBuffer.java

Modified: 
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/io/TestXByteBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/io/TestXByteBuffer.java?rev=1723071&r1=1723070&r2=1723071&view=diff
==
--- 
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/io/TestXByteBuffer.java 
(original)
+++ 
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/io/TestXByteBuffer.java 
Tue Jan  5 13:53:27 2016
@@ -16,24 +16,42 @@
  */
 package org.apache.catalina.tribes.io;
 
-import junit.framework.TestCase;
+import org.junit.Test;
 
-public class TestXByteBuffer extends TestCase {
-protected void setUp() throws Exception {
-super.setUp();
-}
-
-public void testEmptyArray() throws Exception {
-
-}
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
-protected void tearDown() throws Exception {
-super.tearDown();
-}
-
-public static void main(String[] args) throws Exception {
-//XByteBuffer.deserialize(new byte[0]);
-XByteBuffer.deserialize(new byte[] {-84, -19, 0, 5, 115, 114, 0, 17, 
106});
+public class TestXByteBuffer {
+
+// In Tomcat 6 the testEmptyArray() test fails with a java.io.EOFException.
+//
+// Backporting r1143022 (support for 0-length array in deserialize())
+// to Tomcat 6 is probably a bad idea, as
+//
+// 1. All valid use cases already check for (length == 0) case before
+// calling deserialize(), so adding a second check there is redundant
+//
+// 2. It will change behaviour of GroupChannel.messageReceived(),
+// as deserialize() call there will no longer fail with an exception.
+//
+// The change will be that instead of logging an error and returning
+// doing nothing, the messageReceived() method will go on and will notify
+// a channelListener. I do not know whether the listener is able to handle
+// a null argument.
+//
+// @Test
+// public void testEmptyArray() throws Exception {
+//   Object obj = XByteBuffer.deserialize(new byte[0]);
+//   assertNull(obj);
+// }
+
+@Test
+public void testSerializationString() throws Exception {
+String test = "This is as test.";
+byte[] msg = XByteBuffer.serialize(test);
+Object obj = XByteBuffer.deserialize(msg);
+assertTrue(obj instanceof String);
+assertEquals(test, obj);
 }
 
 }



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

svn commit: r11818 - in /dev/tomcat/tomcat-connectors/native/1.2.4: ./ binaries/ source/

[markt]

Author: markt
Date: Tue Jan  5 13:58:27 2016
New Revision: 11818

Log:
Upload 1.2.4 for voting

Added:
dev/tomcat/tomcat-connectors/native/1.2.4/
dev/tomcat/tomcat-connectors/native/1.2.4/binaries/

dev/tomcat/tomcat-connectors/native/1.2.4/binaries/tomcat-native-1.2.4-ocsp-win32-bin.zip
   (with props)

dev/tomcat/tomcat-connectors/native/1.2.4/binaries/tomcat-native-1.2.4-ocsp-win32-bin.zip.asc

dev/tomcat/tomcat-connectors/native/1.2.4/binaries/tomcat-native-1.2.4-ocsp-win32-bin.zip.md5

dev/tomcat/tomcat-connectors/native/1.2.4/binaries/tomcat-native-1.2.4-ocsp-win32-bin.zip.sha1

dev/tomcat/tomcat-connectors/native/1.2.4/binaries/tomcat-native-1.2.4-win32-bin.zip
   (with props)

dev/tomcat/tomcat-connectors/native/1.2.4/binaries/tomcat-native-1.2.4-win32-bin.zip.asc

dev/tomcat/tomcat-connectors/native/1.2.4/binaries/tomcat-native-1.2.4-win32-bin.zip.md5

dev/tomcat/tomcat-connectors/native/1.2.4/binaries/tomcat-native-1.2.4-win32-bin.zip.sha1
dev/tomcat/tomcat-connectors/native/1.2.4/source/

dev/tomcat/tomcat-connectors/native/1.2.4/source/tomcat-native-1.2.4-src.tar.gz 
  (with props)

dev/tomcat/tomcat-connectors/native/1.2.4/source/tomcat-native-1.2.4-src.tar.gz.asc

dev/tomcat/tomcat-connectors/native/1.2.4/source/tomcat-native-1.2.4-src.tar.gz.md5

dev/tomcat/tomcat-connectors/native/1.2.4/source/tomcat-native-1.2.4-src.tar.gz.sha1

dev/tomcat/tomcat-connectors/native/1.2.4/source/tomcat-native-1.2.4-win32-src.zip
   (with props)

dev/tomcat/tomcat-connectors/native/1.2.4/source/tomcat-native-1.2.4-win32-src.zip.asc

dev/tomcat/tomcat-connectors/native/1.2.4/source/tomcat-native-1.2.4-win32-src.zip.md5

dev/tomcat/tomcat-connectors/native/1.2.4/source/tomcat-native-1.2.4-win32-src.zip.sha1

Added: 
dev/tomcat/tomcat-connectors/native/1.2.4/binaries/tomcat-native-1.2.4-ocsp-win32-bin.zip
==
Binary file - no diff available.

Propchange: 
dev/tomcat/tomcat-connectors/native/1.2.4/binaries/tomcat-native-1.2.4-ocsp-win32-bin.zip
--
svn:mime-type = application/octet-stream

Added: 
dev/tomcat/tomcat-connectors/native/1.2.4/binaries/tomcat-native-1.2.4-ocsp-win32-bin.zip.asc
==
--- 
dev/tomcat/tomcat-connectors/native/1.2.4/binaries/tomcat-native-1.2.4-ocsp-win32-bin.zip.asc
 (added)
+++ 
dev/tomcat/tomcat-connectors/native/1.2.4/binaries/tomcat-native-1.2.4-ocsp-win32-bin.zip.asc
 Tue Jan  5 13:58:27 2016
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2
+
+iQIcBAABCAAGBQJWi78rAAoJEBDAHFovYFnnpn4QAJ6q+yDWbWPwEawrBsYjPnST
+PRlUFCMCUZ/dNRJNSOsWXnZ3AX+VH4KNo1hd0XVMVWKoyp1kmIw0rgiNIu21e1Rz
++NXLZCWtS84s3P6gp2FRAkZUaAjnzn1gB/St/KBMlCHz0FkyVKonEh0lyMgzXV9F
+lk4f3SrCMU1w5opSoq89lrtv2GJ2fCj5IBXWENKZiqaKkL0RPX2aokZNCTagAr38
+MxT9Z7qjSCMCAQ0lRtbJF1cS67XSlDbD55CAPmeQZadUqRVv5dxFuhMRS7Hcb4lA
+XFIyBj9ZNTlIiuNqKXfmQBs85a926sGgyrDmB/RCp1gqN6StBiMnrh6RC7jtBjam
+0+bYJNt6dS4qyub+eIUuowThVjOv+WpDAK5acPsflub+ldxVYaI3sj9DGElc500l
+6dWzOs8CNKwAtfRB/LhBAcdqYJoAck0M1z6pdAFWiE3g1rz6oi2kRM9qlQ8v/jGW
+ujgM6Vr51faSKpiTH4AAAaIT5H7ELOeJKR4cwIbEOXbkMcoEjeKXMlgHDamG+jUD
+SoeltpDp0ry78JxpdxEWCDrdgFA3lQb8UpT+hreyp871GVzGrE/uLcTuTgaInvBl
+2fSMIXSIb7Tm94gPLoGk6G9XOfIgL+SKxLosjw4+Bhx5wTbYgvngG3XhJ2hAV0fN
+LEyutRdyALjyIKFk44Cv
+=iXiq
+-END PGP SIGNATURE-

Added: 
dev/tomcat/tomcat-connectors/native/1.2.4/binaries/tomcat-native-1.2.4-ocsp-win32-bin.zip.md5
==
--- 
dev/tomcat/tomcat-connectors/native/1.2.4/binaries/tomcat-native-1.2.4-ocsp-win32-bin.zip.md5
 (added)
+++ 
dev/tomcat/tomcat-connectors/native/1.2.4/binaries/tomcat-native-1.2.4-ocsp-win32-bin.zip.md5
 Tue Jan  5 13:58:27 2016
@@ -0,0 +1 @@
+1cb2118739d41bf5a889122c2c3428e8 *tomcat-native-1.2.4-ocsp-win32-bin.zip
\ No newline at end of file

Added: 
dev/tomcat/tomcat-connectors/native/1.2.4/binaries/tomcat-native-1.2.4-ocsp-win32-bin.zip.sha1
==
--- 
dev/tomcat/tomcat-connectors/native/1.2.4/binaries/tomcat-native-1.2.4-ocsp-win32-bin.zip.sha1
 (added)
+++ 
dev/tomcat/tomcat-connectors/native/1.2.4/binaries/tomcat-native-1.2.4-ocsp-win32-bin.zip.sha1
 Tue Jan  5 13:58:27 2016
@@ -0,0 +1 @@
+8fcdb93a294d1a8ec61624b9763f498050d5129f 
*tomcat-native-1.2.4-ocsp-win32-bin.zip
\ No newline at end of file

Added: 
dev/tomcat/tomcat-connectors/native/1.2.4/binaries/tomcat-native-1.2.4-win32-bin.zip
==
Binary file - no diff available.

Propchange: 
dev/tomcat/tomcat-connectors/native/1.2.4/binaries/tomcat-native-1.2.4-win32-bin.zip
--
svn:mime-type = applic

svn commit: r1723081 - /tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/membership/TestMemberImplSerialization.java

[kkolinko]

Author: kkolinko
Date: Tue Jan  5 14:16:54 2016
New Revision: 1723081

URL: http://svn.apache.org/viewvc?rev=1723081&view=rev
Log:
Convert the test to JUnit 4.

Modified:

tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/membership/TestMemberImplSerialization.java

Modified: 
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/membership/TestMemberImplSerialization.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/membership/TestMemberImplSerialization.java?rev=1723081&r1=1723080&r2=1723081&view=diff
==
--- 
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/membership/TestMemberImplSerialization.java
 (original)
+++ 
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/membership/TestMemberImplSerialization.java
 Tue Jan  5 14:16:54 2016
@@ -15,9 +15,14 @@
  */
 package org.apache.catalina.tribes.membership;
 
-import junit.framework.TestCase;
 import java.util.Arrays;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Before;
+import org.junit.Test;
+
 /**
  * Title: 
  *
@@ -28,11 +33,12 @@ import java.util.Arrays;
  * @author not attributable
  * @version 1.0
  */
-public class TestMemberImplSerialization extends TestCase {
-MemberImpl m1, m2, p1,p2;
-byte[] payload = null;
-protected void setUp() throws Exception {
-super.setUp();
+public class TestMemberImplSerialization {
+private MemberImpl m1, m2, p1,p2;
+private byte[] payload = null;
+
+@Before
+public void setUp() throws Exception {
 payload = new byte[333];
 Arrays.fill(payload,(byte)1);
 m1 = new MemberImpl("localhost",,1,payload);
@@ -46,7 +52,8 @@ public class TestMemberImplSerialization
 m1.setCommand(new byte[] {1,2,4,5,6,7,8,9});
 m2.setCommand(new byte[] {1,2,4,5,6,7,8,9});
 }
-
+
+@Test
 public void testCompare() throws Exception {
 assertTrue(m1.equals(m2));
 assertTrue(m2.equals(m1));
@@ -56,7 +63,8 @@ public class TestMemberImplSerialization
 assertFalse(m2.equals(p2));
 assertFalse(p1.equals(p2));
 }
-
+
+@Test
 public void testSerializationOne() throws Exception {
 MemberImpl m = m1;
 byte[] md1 = m.getData(false,true);
@@ -91,8 +99,4 @@ public class TestMemberImplSerialization
 return result;
 }
 
-protected void tearDown() throws Exception {
-super.tearDown();
-}
-
 }



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

svn commit: r1723079 - in /tomcat/trunk/java/org/apache/tomcat/util/net/openssl: CipherSuiteConverter.java LocalStrings.properties

[markt]

Author: markt
Date: Tue Jan  5 14:16:20 2016
New Revision: 1723079

URL: http://svn.apache.org/viewvc?rev=1723079&view=rev
Log:
Fix Javadoc
Address logging TODOs

Modified:

tomcat/trunk/java/org/apache/tomcat/util/net/openssl/CipherSuiteConverter.java
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/CipherSuiteConverter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/CipherSuiteConverter.java?rev=1723079&r1=1723078&r2=1723079&view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/CipherSuiteConverter.java 
(original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/CipherSuiteConverter.java 
Tue Jan  5 14:16:20 2016
@@ -125,7 +125,11 @@ public final class CipherSuiteConverter
 }
 
 /**
- * Converts the specified Java cipher suites to the colon-separated 
OpenSSL cipher suite specification.
+ * Converts the specified Java cipher suites to the OpenSSL specification.
+ *
+ * @param javaCipherSuites The JSSE cipher suite names to convert
+ *
+ * @return A list of colon-separated OpenSSL cipher suite names
  */
 public static String toOpenSsl(Iterable javaCipherSuites) {
 final StringBuilder buf = new StringBuilder();
@@ -154,6 +158,8 @@ public final class CipherSuiteConverter
 /**
  * Converts the specified Java cipher suite to its corresponding OpenSSL 
cipher suite name.
  *
+ * @param javaCipherSuite The JSSE cipher suite name to convert
+ *
  * @return {@code null} if the conversion has failed
  */
 public static String toOpenSsl(String javaCipherSuite) {
@@ -182,11 +188,9 @@ public final class CipherSuiteConverter
 p2j.put("TLS", "TLS_" + javaCipherSuiteSuffix);
 o2j.put(openSslCipherSuite, p2j);
 
-/* TODO the log looks broken...
 if (logger.isDebugEnabled()) {
 logger.debug(sm.getString("converter.mapping", javaCipherSuite, 
openSslCipherSuite));
 }
-*/
 
 return openSslCipherSuite;
 }
@@ -315,12 +319,10 @@ public final class CipherSuiteConverter
 j2o.putIfAbsent(javaCipherSuiteTls, openSslCipherSuite);
 j2o.putIfAbsent(javaCipherSuiteSsl, openSslCipherSuite);
 
-/* TODO the log looks broken...
 if (logger.isDebugEnabled()) {
-logger.debug(sm.getString("converter.mapping", javaCipherSuiteTls, 
openSslCipherSuite));
-logger.debug(sm.getString("converter.mapping", javaCipherSuiteSsl, 
openSslCipherSuite));
+logger.debug(sm.getString("converter.mapping", openSslCipherSuite, 
javaCipherSuiteTls));
+logger.debug(sm.getString("converter.mapping", openSslCipherSuite, 
javaCipherSuiteSsl));
 }
-*/
 
 return p2j;
 }

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties?rev=1723079&r1=1723078&r2=1723079&view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties 
(original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties 
Tue Jan  5 14:16:20 2016
@@ -42,7 +42,7 @@ engine.nullName=Null value name
 engine.nullValue=Null value
 engine.handshakeFailure=Failed handshake: {0}
 
-converter.mapping=Cipher suite mapping: {} => {} {0} {1}
+converter.mapping=Cipher suite mapping: [{0}] => [{1}]
 
 keyManager.nullCertificateChain=Null certificate chain
 keyManager.nullPrivateKey=Null private key



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

Re: svn commit: r1723079 - in /tomcat/trunk/java/org/apache/tomcat/util/net/openssl: CipherSuiteConverter.java LocalStrings.properties

[Mark Thomas]

On 05/01/2016 14:16, ma...@apache.org wrote:
> Author: markt
> Date: Tue Jan  5 14:16:20 2016
> New Revision: 1723079
> 
> URL: http://svn.apache.org/viewvc?rev=1723079&view=rev
> Log:
> Fix Javadoc
> Address logging TODOs
> 
> Modified:
> 
> tomcat/trunk/java/org/apache/tomcat/util/net/openssl/CipherSuiteConverter.java

There is some overlap between this class and
OpenSSLCipherConfigurationParser. Next on my TODO list is looking into
if/how they could be merged.

Mark


> 
> tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties
> 
> Modified: 
> tomcat/trunk/java/org/apache/tomcat/util/net/openssl/CipherSuiteConverter.java
> URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/CipherSuiteConverter.java?rev=1723079&r1=1723078&r2=1723079&view=diff
> ==
> --- 
> tomcat/trunk/java/org/apache/tomcat/util/net/openssl/CipherSuiteConverter.java
>  (original)
> +++ 
> tomcat/trunk/java/org/apache/tomcat/util/net/openssl/CipherSuiteConverter.java
>  Tue Jan  5 14:16:20 2016
> @@ -125,7 +125,11 @@ public final class CipherSuiteConverter
>  }
>  
>  /**
> - * Converts the specified Java cipher suites to the colon-separated 
> OpenSSL cipher suite specification.
> + * Converts the specified Java cipher suites to the OpenSSL 
> specification.
> + *
> + * @param javaCipherSuites The JSSE cipher suite names to convert
> + *
> + * @return A list of colon-separated OpenSSL cipher suite names
>   */
>  public static String toOpenSsl(Iterable javaCipherSuites) {
>  final StringBuilder buf = new StringBuilder();
> @@ -154,6 +158,8 @@ public final class CipherSuiteConverter
>  /**
>   * Converts the specified Java cipher suite to its corresponding OpenSSL 
> cipher suite name.
>   *
> + * @param javaCipherSuite The JSSE cipher suite name to convert
> + *
>   * @return {@code null} if the conversion has failed
>   */
>  public static String toOpenSsl(String javaCipherSuite) {
> @@ -182,11 +188,9 @@ public final class CipherSuiteConverter
>  p2j.put("TLS", "TLS_" + javaCipherSuiteSuffix);
>  o2j.put(openSslCipherSuite, p2j);
>  
> -/* TODO the log looks broken...
>  if (logger.isDebugEnabled()) {
>  logger.debug(sm.getString("converter.mapping", javaCipherSuite, 
> openSslCipherSuite));
>  }
> -*/
>  
>  return openSslCipherSuite;
>  }
> @@ -315,12 +319,10 @@ public final class CipherSuiteConverter
>  j2o.putIfAbsent(javaCipherSuiteTls, openSslCipherSuite);
>  j2o.putIfAbsent(javaCipherSuiteSsl, openSslCipherSuite);
>  
> -/* TODO the log looks broken...
>  if (logger.isDebugEnabled()) {
> -logger.debug(sm.getString("converter.mapping", 
> javaCipherSuiteTls, openSslCipherSuite));
> -logger.debug(sm.getString("converter.mapping", 
> javaCipherSuiteSsl, openSslCipherSuite));
> +logger.debug(sm.getString("converter.mapping", 
> openSslCipherSuite, javaCipherSuiteTls));
> +logger.debug(sm.getString("converter.mapping", 
> openSslCipherSuite, javaCipherSuiteSsl));
>  }
> -*/
>  
>  return p2j;
>  }
> 
> Modified: 
> tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties
> URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties?rev=1723079&r1=1723078&r2=1723079&view=diff
> ==
> --- 
> tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties 
> (original)
> +++ 
> tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties 
> Tue Jan  5 14:16:20 2016
> @@ -42,7 +42,7 @@ engine.nullName=Null value name
>  engine.nullValue=Null value
>  engine.handshakeFailure=Failed handshake: {0}
>  
> -converter.mapping=Cipher suite mapping: {} => {} {0} {1}
> +converter.mapping=Cipher suite mapping: [{0}] => [{1}]
>  
>  keyManager.nullCertificateChain=Null certificate chain
>  keyManager.nullPrivateKey=Null private key
> 
> 
> 
> -
> 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

jdbc pool: validationQuery vs Connection.isValid

[Julian Reschke]

Hi there,

maybe that's a stupid question, but why do we need a configurable 
validationQuery when there's


  Connection.isValid(...)




Best regards, Julian

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

svn commit: r1723086 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/servlets/DefaultServlet.java res/findbugs/filter-false-positives.xml webapps/docs/changelog.xml

[violetagg]

Author: violetagg
Date: Tue Jan  5 14:35:58 2016
New Revision: 1723086

URL: http://svn.apache.org/viewvc?rev=1723086&view=rev
Log:
Merged revision 1723068 from tomcat/trunk:
Ensure that the proper file encoding if specified will be used when a readme 
file is served by DefaultServlet.
Update findbugs false positives.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
tomcat/tc7.0.x/trunk/res/findbugs/filter-false-positives.xml
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan  5 14:35:58 2016
@@ -1,2 +1,2 @@
 
/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702
 
744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
 
,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,13

svn commit: r1723088 - in /tomcat/trunk/java/org/apache/tomcat/util/net/openssl: CipherSuiteConverter.java LocalStrings.properties OpenSSLContext.java OpenSSLEngine.java ciphers/CipherSuiteConverter.j

[markt]

Author: markt
Date: Tue Jan  5 14:58:33 2016
New Revision: 1723088

URL: http://svn.apache.org/viewvc?rev=1723088&view=rev
Log:
Move CipherSuiteConverter to ciphers package

Added:

tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java
  - copied, changed from r1723079, 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/CipherSuiteConverter.java

tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings.properties
   (with props)
Removed:

tomcat/trunk/java/org/apache/tomcat/util/net/openssl/CipherSuiteConverter.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties?rev=1723088&r1=1723087&r2=1723088&view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties 
(original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties 
Tue Jan  5 14:58:33 2016
@@ -42,8 +42,6 @@ engine.nullName=Null value name
 engine.nullValue=Null value
 engine.handshakeFailure=Failed handshake: {0}
 
-converter.mapping=Cipher suite mapping: [{0}] => [{1}]
-
 keyManager.nullCertificateChain=Null certificate chain
 keyManager.nullPrivateKey=Null private key
 

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java?rev=1723088&r1=1723087&r2=1723088&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java 
Tue Jan  5 14:58:33 2016
@@ -49,6 +49,7 @@ import org.apache.tomcat.util.net.Consta
 import org.apache.tomcat.util.net.SSLHostConfig;
 import org.apache.tomcat.util.net.SSLHostConfigCertificate;
 import org.apache.tomcat.util.net.jsse.JSSEKeyManager;
+import org.apache.tomcat.util.net.openssl.ciphers.CipherSuiteConverter;
 import 
org.apache.tomcat.util.net.openssl.ciphers.OpenSSLCipherConfigurationParser;
 import org.apache.tomcat.util.res.StringManager;
 

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java?rev=1723088&r1=1723087&r2=1723088&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java Tue 
Jan  5 14:58:33 2016
@@ -51,6 +51,7 @@ import org.apache.tomcat.jni.SSLContext;
 import org.apache.tomcat.util.buf.ByteBufferUtils;
 import org.apache.tomcat.util.net.Constants;
 import org.apache.tomcat.util.net.SSLUtil;
+import org.apache.tomcat.util.net.openssl.ciphers.CipherSuiteConverter;
 import org.apache.tomcat.util.res.StringManager;
 
 /**

Copied: 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java
 (from r1723079, 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/CipherSuiteConverter.java)
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java?p2=tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java&p1=tomcat/trunk/java/org/apache/tomcat/util/net/openssl/CipherSuiteConverter.java&r1=1723079&r2=1723088&rev=1723088&view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/CipherSuiteConverter.java 
(original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java
 Tue Jan  5 14:58:33 2016
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tomcat.util.net.openssl;
+package org.apache.tomcat.util.net.openssl.ciphers;
 
 import java.util.HashMap;
 import java.util.Map;

Added: 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings.properties?rev=1723088&view=auto
==
--- 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings.properties
 (added)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/net/

svn commit: r1723089 - /tomcat/trunk/webapps/docs/config/http.xml

[markt]

Author: markt
Date: Tue Jan  5 14:58:58 2016
New Revision: 1723089

URL: http://svn.apache.org/viewvc?rev=1723089&view=rev
Log:
whitespace police

Modified:
tomcat/trunk/webapps/docs/config/http.xml

Modified: tomcat/trunk/webapps/docs/config/http.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=1723089&r1=1723088&r2=1723089&view=diff
==
--- tomcat/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/trunk/webapps/docs/config/http.xml Tue Jan  5 14:58:58 2016
@@ -1084,7 +1084,7 @@
   Only the ciphers that are supported by the SSL implementation will be
   used.
   If not specified, a default (using the OpenSSL notation) of
-  HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!kRSA will be 
+  HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!kRSA will be
   used.
   Note that, by default, the order in which ciphers are defined is
   treated as an order of preference. See honorCipherOrder.



-
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-nio (in module tomcat-8.0.x) failed

[Bill Barker]

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-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-tc8.0.x-test-nio :  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-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-8.0.x/output/logs-NIO
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO/logs]



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio.html
Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio (Type: Build)
Work ended in a state of : Failed
Elapsed: 56 mins 36 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.3-SNAPSHOT.jar
 -Dtest.reports=output/logs-NIO 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160105-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160105.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160105-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-1.0.2/dest-20160105/bin/op
 enssl -Dexecute.test.bio=false -Dexecute.test.apr=false 
-Dtest.excludePerformance=true -Dexecute.test.nio2=false 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-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/out

svn commit: r1723101 - /tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java

[markt]

Author: markt
Date: Tue Jan  5 15:38:58 2016
New Revision: 1723101

URL: http://svn.apache.org/viewvc?rev=1723101&view=rev
Log:
Add a test case to check consistency between CipherSuiteConverter and the known 
informaion in the Cipher enumeration.

Modified:

tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java?rev=1723101&r1=1723100&r2=1723101&view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java
 (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java
 Tue Jan  5 15:38:58 2016
@@ -45,7 +45,7 @@ public final class CipherSuiteConverter
  * C - bulk cipher
  * D - HMAC algorithm
  *
- * This regular expression assumees that:
+ * This regular expression assumes that:
  *
  * 1) A is always TLS or SSL, and
  * 2) D is always a single word.



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

svn commit: r1723103 - /tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipherSuiteConverter.java

[markt]

Author: markt
Date: Tue Jan  5 15:40:40 2016
New Revision: 1723103

URL: http://svn.apache.org/viewvc?rev=1723103&view=rev
Log:
Add a test case to check consistency between CipherSuiteConverter and the known 
informaion in the Cipher enumeration.

Added:

tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipherSuiteConverter.java
   (with props)

Added: 
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipherSuiteConverter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipherSuiteConverter.java?rev=1723103&view=auto
==
--- 
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipherSuiteConverter.java
 (added)
+++ 
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipherSuiteConverter.java
 Tue Jan  5 15:40:40 2016
@@ -0,0 +1,76 @@
+/*
+ * 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 org.apache.tomcat.util.net.openssl.ciphers;
+
+import java.util.Set;
+
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+@Ignore // Currently 262 out of 486 tests fail
+@RunWith(Parameterized.class)
+public class TestCipherSuiteConverter {
+
+@Parameters(name = "{0}")
+public static Cipher[] getCiphers() {
+return Cipher.values();
+}
+
+private Cipher cipher;
+
+public TestCipherSuiteConverter(Cipher cipher) {
+this.cipher = cipher;
+}
+
+
+@Test
+public void testToJsse() {
+Set jsseNames = cipher.getJsseNames();
+
+// Test the primary OpenSSL alias
+doToJsseTest(cipher.getOpenSSLAlias(), jsseNames);
+
+// Test the OpenSSL alternative names
+Set openSSLAltNames = cipher.getOpenSSLAltNames();
+for (String openSSLAltName : openSSLAltNames) {
+doToJsseTest(openSSLAltName, jsseNames);
+}
+}
+
+
+private void doToJsseTest(String openSSLName, Set jsseNames) {
+String convertedJsseName = CipherSuiteConverter.toJava(openSSLName, 
"TLS");
+Assert.assertTrue(
+"[" + openSSLName + "] -> [" + convertedJsseName + "] not in 
[" + jsseNames + "]",
+jsseNames.contains(convertedJsseName));
+}
+
+
+@Test
+public void testToOpenSSL() {
+Set jsseNames = cipher.getJsseNames();
+
+for (String jsseName : jsseNames) {
+String convertedOpenSSLName = 
CipherSuiteConverter.toOpenSsl(jsseName);
+Assert.assertEquals(jsseName, cipher.getOpenSSLAlias(), 
convertedOpenSSLName);
+}
+}
+}

Propchange: 
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipherSuiteConverter.java
--
svn:eol-style = native



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

svn propchange: r1723101 - svn:log

[markt]

Author: markt
Revision: 1723101
Modified property: svn:log

Modified: svn:log at Tue Jan  5 15:40:21 2016
--
--- svn:log (original)
+++ svn:log Tue Jan  5 15:40:21 2016
@@ -1 +1 @@
-Add a test case to check consistency between CipherSuiteConverter and the 
known informaion in the Cipher enumeration.
+Fix Javadoc typo


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

Re: svn commit: r1723103 - /tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipherSuiteConverter.java

[Mark Thomas]

On 05/01/2016 15:40, ma...@apache.org wrote:
> Author: markt
> Date: Tue Jan  5 15:40:40 2016
> New Revision: 1723103
> 
> URL: http://svn.apache.org/viewvc?rev=1723103&view=rev
> Log:
> Add a test case to check consistency between CipherSuiteConverter and the 
> known information in the Cipher enumeration.



> +@Ignore // Currently 262 out of 486 tests fail

Something is seriously wrong here. At this point I'm not sure if it is a
faulty test, poor data in the Cipher enumeration or if the
JSSE<->OpenSSL naming conversion rules are more complex than currently
implemented.

It is probably a combination of all three. I'm hoping that the bulk of
the problems are due to a faulty test but I haven't got to the bottom of
what is going on yet.

Mark

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

[Bug 57103] Download page should provide details on how to verify the downloads

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=57103

--- Comment #6 from Sebb  ---
(In reply to Konstantin Kolinko from comment #3)
> (In reply to Sebb from comment #2)
> > (In reply to Konstantin Kolinko from comment #1)
> > > per
> > > http://blog.terryburton.co.uk/2006/11/falling-into-trap-with-gpg.html
> > 
> > That page no longer exists.
> > 
> 
> It is available from http://archive.org/web/

FTR it's available from:

http://web.archive.org/web/20130417020216/http://blog.terryburton.co.uk/2006/11/falling-into-trap-with-gpg.html

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

[VOTE] Release Apache Tomcat Native 1.2.4

[Mark Thomas]

Version 1.2.4 includes the following change:

- Renegotiation improvements

The proposed release artefacts can be found at [1],
and the build was done using tag [2].

The Apache Tomcat Native 1.2.4 is
 [ ] Stable, go ahead and release
 [ ] Broken because of ...

Thanks,

Mark


[1]
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/native/1.2.4/
[2] https://svn.apache.org/repos/asf/tomcat/native/tags/TOMCAT_NATIVE_1_2_4

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

Re: [VOTE] Release Apache Tomcat Native 1.2.4

[Rémy Maucherat]

2016-01-05 16:46 GMT+01:00 Mark Thomas :

> Version 1.2.4 includes the following change:
>
> - Renegotiation improvements
>
> The proposed release artefacts can be found at [1],
> and the build was done using tag [2].
>
> The Apache Tomcat Native 1.2.4 is
>  [X] Stable, go ahead and release
>  [ ] Broken because of ...
>
> Rémy

svn commit: r1723113 - /tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java

[markt]

Author: markt
Date: Tue Jan  5 16:24:24 2016
New Revision: 1723113

URL: http://svn.apache.org/viewvc?rev=1723113&view=rev
Log:
Add DH to handshake algorithm pattern. Fixes 16 failures.

Modified:

tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java?rev=1723113&r1=1723112&r2=1723113&view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java
 (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java
 Tue Jan  5 16:24:24 2016
@@ -71,7 +71,7 @@ public final class CipherSuiteConverter
 "^(?:(" + // BEGIN handshake algorithm
 "(?:(?:EXP-)?" +
 "(?:" +
-
"(?:DHE|EDH|ECDH|ECDHE|SRP)-(?:DSS|RSA|ECDSA)|" +
+
"(?:DH|DHE|EDH|ECDH|ECDHE|SRP)-(?:DSS|RSA|ECDSA)|" +
 "(?:ADH|AECDH|KRB5|PSK|SRP)" +
 ')' +
 ")|" +



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

svn commit: r1723114 - /tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java

[markt]

Author: markt
Date: Tue Jan  5 16:26:49 2016
New Revision: 1723114

URL: http://svn.apache.org/viewvc?rev=1723114&view=rev
Log:
Java uses DES_CBC_40 and DES40_CBC. The former is only used with Kerberos 
cipher suites that are not used for TLS so use the other format. Fixes 4 
failures.

Modified:

tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java?rev=1723114&r1=1723113&r2=1723114&view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java
 (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java
 Tue Jan  5 16:26:49 2016
@@ -399,7 +399,7 @@ public final class CipherSuiteConverter
 
 if ("DES-CBC".equals(bulkCipher)) {
 if (export) {
-return "DES_CBC_40";
+return "DES40_CBC";
 } else {
 return "DES_CBC";
 }



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

svn commit: r1723115 - /tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java

[markt]

Author: markt
Date: Tue Jan  5 16:30:38 2016
New Revision: 1723115

URL: http://svn.apache.org/viewvc?rev=1723115&view=rev
Log:
Some OpenSSL aliases use EDH instead of DHE. Fixes 6 failures.

Modified:

tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java?rev=1723115&r1=1723114&r2=1723115&view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java
 (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java
 Tue Jan  5 16:30:38 2016
@@ -364,6 +364,7 @@ public final class CipherSuiteConverter
 handshakeAlgo = "ECDH_anon";
 }
 
+handshakeAlgo = handshakeAlgo.replace("EDH", "DHE");
 handshakeAlgo = handshakeAlgo.replace('-', '_');
 if (export) {
 return handshakeAlgo + "_EXPORT";



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

svn commit: r1723116 - /tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java

[markt]

Author: markt
Date: Tue Jan  5 16:35:01 2016
New Revision: 1723116

URL: http://svn.apache.org/viewvc?rev=1723116&view=rev
Log:
Add PSK as option for second element in handshake algorithm pattern. Fixes 30 
failures.

Modified:

tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java?rev=1723116&r1=1723115&r2=1723116&view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java
 (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java
 Tue Jan  5 16:35:01 2016
@@ -71,7 +71,7 @@ public final class CipherSuiteConverter
 "^(?:(" + // BEGIN handshake algorithm
 "(?:(?:EXP-)?" +
 "(?:" +
-
"(?:DH|DHE|EDH|ECDH|ECDHE|SRP)-(?:DSS|RSA|ECDSA)|" +
+
"(?:DH|DHE|EDH|ECDH|ECDHE|SRP)-(?:DSS|RSA|ECDSA|PSK)|" +
 "(?:ADH|AECDH|KRB5|PSK|SRP)" +
 ')' +
 ")|" +



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

svn commit: r1723117 - /tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestRemoteProcessException.java

[kkolinko]

Author: kkolinko
Date: Tue Jan  5 16:41:04 2016
New Revision: 1723117

URL: http://svn.apache.org/viewvc?rev=1723117&view=rev
Log:
Convert test to JUnit 4.
Use TesterUtil.addRandomDomain() to allow several tests to run in parallel, 
backport from Tomcat 7.

This test fails in Tomcat 7, Tomcat 9 as well and is excluded when running 
tests via build.xml.

This test creates random messages, half of those are failing at receiver side 
by an explicit "throw new IllegalStateException()".
This causes send() call in the test to fail with a ChannelException, which is 
uncaught and fails the whole test run.

Modified:

tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestRemoteProcessException.java

Modified: 
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestRemoteProcessException.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestRemoteProcessException.java?rev=1723117&r1=1723116&r2=1723117&view=diff
==
--- 
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestRemoteProcessException.java
 (original)
+++ 
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestRemoteProcessException.java
 Tue Jan  5 16:41:04 2016
@@ -16,14 +16,22 @@
  */
 package org.apache.catalina.tribes.test.channel;
 
-import junit.framework.TestCase;
+import java.io.PrintStream;
 import java.io.Serializable;
-import java.util.Random;
 import java.util.Arrays;
+import java.util.Random;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
 import org.apache.catalina.tribes.ChannelListener;
+import org.apache.catalina.tribes.ManagedChannel;
 import org.apache.catalina.tribes.Member;
+import org.apache.catalina.tribes.TesterUtil;
 import org.apache.catalina.tribes.group.GroupChannel;
-import java.io.PrintStream;
 
 /**
  * Title:  
@@ -35,27 +43,30 @@ import java.io.PrintStream;
  * @author not attributable
  * @version 1.0
  */
-public class TestRemoteProcessException extends TestCase {
-int msgCount = 1;
-GroupChannel channel1;
-GroupChannel channel2;
-Listener listener1;
-protected void setUp() throws Exception {
-super.setUp();
+public class TestRemoteProcessException {
+private int msgCount = 1;
+private GroupChannel channel1;
+private GroupChannel channel2;
+private Listener listener1;
+
+@Before
+public void setUp() throws Exception {
 channel1 = new GroupChannel();
 channel2 = new GroupChannel();
 listener1 = new Listener();
 channel2.addChannelListener(listener1);
+TesterUtil.addRandomDomain(new ManagedChannel[] {channel1, channel2});
 channel1.start(GroupChannel.DEFAULT);
 channel2.start(GroupChannel.DEFAULT);
 }
 
-protected void tearDown() throws Exception {
-super.tearDown();
+@After
+public void tearDown() throws Exception {
 channel1.stop(GroupChannel.DEFAULT);
 channel2.stop(GroupChannel.DEFAULT);
 }
 
+@Test
 public void testDataSendSYNCACK() throws Exception {
 System.err.println("Starting SYNC_ACK");
 int errC=0, nerrC=0;
@@ -107,6 +118,7 @@ public class TestRemoteProcessException
 }
 
 public static class Data implements Serializable {
+private static final long serialVersionUID = 1L;
 public int length;
 public byte[] data;
 public byte key;



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

svn commit: r1723118 - /tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java

[markt]

Author: markt
Date: Tue Jan  5 16:45:53 2016
New Revision: 1723118

URL: http://svn.apache.org/viewvc?rev=1723118&view=rev
Log:
Add RSA as option for the first element in the handshake algorithm pattern. 
Fixes 16 failures.

Modified:

tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java?rev=1723118&r1=1723117&r2=1723118&view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java
 (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java
 Tue Jan  5 16:45:53 2016
@@ -71,7 +71,7 @@ public final class CipherSuiteConverter
 "^(?:(" + // BEGIN handshake algorithm
 "(?:(?:EXP-)?" +
 "(?:" +
-
"(?:DH|DHE|EDH|ECDH|ECDHE|SRP)-(?:DSS|RSA|ECDSA|PSK)|" +
+
"(?:DH|DHE|EDH|ECDH|ECDHE|RSA|SRP)-(?:DSS|RSA|ECDSA|PSK)|" +
 "(?:ADH|AECDH|KRB5|PSK|SRP)" +
 ')' +
 ")|" +



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

svn commit: r1723120 - /tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java

[markt]

Author: markt
Date: Tue Jan  5 16:48:31 2016
New Revision: 1723120

URL: http://svn.apache.org/viewvc?rev=1723120&view=rev
Log:
Add Camellia 128/256 name mapping. Fixes 80 failures.

Modified:

tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java?rev=1723120&r1=1723119&r2=1723120&view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java
 (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java
 Tue Jan  5 16:48:31 2016
@@ -414,6 +414,14 @@ public final class CipherSuiteConverter
 }
 }
 
+if ("CAMELLIA128".equals(bulkCipher)) {
+return "CAMELLIA_128_CBC";
+}
+
+if ("CAMELLIA256".equals(bulkCipher)) {
+return "CAMELLIA_256_CBC";
+}
+
 return bulkCipher.replace('-', '_');
 }
 



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

svn commit: r1723124 - /tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java

[markt]

Author: markt
Date: Tue Jan  5 16:53:05 2016
New Revision: 1723124

URL: http://svn.apache.org/viewvc?rev=1723124&view=rev
Log:
Add SEED name mapping. Fixes 12 failures.

Modified:

tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java?rev=1723124&r1=1723123&r2=1723124&view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java
 (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java
 Tue Jan  5 16:53:05 2016
@@ -422,6 +422,10 @@ public final class CipherSuiteConverter
 return "CAMELLIA_256_CBC";
 }
 
+if ("SEED".equals(bulkCipher)) {
+return "SEED_CBC";
+}
+
 return bulkCipher.replace('-', '_');
 }
 



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

svn commit: r1723126 - /tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java

[markt]

Author: markt
Date: Tue Jan  5 17:03:22 2016
New Revision: 1723126

URL: http://svn.apache.org/viewvc?rev=1723126&view=rev
Log:
Add conversion to OpenSSL for AES 128/256. Fixes 10 failures.

Modified:

tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java?rev=1723126&r1=1723125&r2=1723126&view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java
 (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java
 Tue Jan  5 17:03:22 2016
@@ -263,6 +263,14 @@ public final class CipherSuiteConverter
 return "RC2-CBC";
 }
 
+if ("AES_128".equals(bulkCipher)) {
+return "AES128";
+}
+
+if ("AES_256".equals(bulkCipher)) {
+return "AES256";
+}
+
 return bulkCipher.replace('_', '-');
 }
 



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

svn commit: r1723127 - /tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestRemoteProcessException.java

[kkolinko]

Author: kkolinko
Date: Tue Jan  5 17:08:33 2016
New Revision: 1723127

URL: http://svn.apache.org/viewvc?rev=1723127&view=rev
Log:
Fix a failing tribes test by aligning test expectations with the actual 
observed behaviour.
Notes:
1. This test is excluded when running tests via build.xml.
2. Durations of the test: 63 seconds. It can be reduced by reducing msgCount 
variable.
3. This test creates random messages, half of those are failing at receiver 
side by an explicit "throw new IllegalStateException()".

Modified:

tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestRemoteProcessException.java

Modified: 
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestRemoteProcessException.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestRemoteProcessException.java?rev=1723127&r1=1723126&r2=1723127&view=diff
==
--- 
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestRemoteProcessException.java
 (original)
+++ 
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestRemoteProcessException.java
 Tue Jan  5 17:08:33 2016
@@ -22,12 +22,14 @@ import java.util.Arrays;
 import java.util.Random;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
 import org.apache.catalina.tribes.Channel;
+import org.apache.catalina.tribes.ChannelException;
 import org.apache.catalina.tribes.ChannelListener;
 import org.apache.catalina.tribes.ManagedChannel;
 import org.apache.catalina.tribes.Member;
@@ -63,13 +65,32 @@ public class TestRemoteProcessException
 int errC=0, nerrC=0;
 for (int i=0; i

svn commit: r1723130 - in /tomcat/tc8.0.x/trunk: ./ test/org/apache/catalina/tribes/test/channel/TestRemoteProcessException.java

[kkolinko]

Author: kkolinko
Date: Tue Jan  5 17:15:37 2016
New Revision: 1723130

URL: http://svn.apache.org/viewvc?rev=1723130&view=rev
Log:
Fix a failing tribes test by aligning test expectations with the actual 
observed behaviour.
Notes:
1. This test is excluded when running tests via build.xml.
2. Duration of the test: 54 seconds. It can be reduced by reducing msgCount 
variable.
3. This test creates random messages, half of those are failing at receiver 
side by an explicit "throw new IllegalStateException()".

Merged r1723127 from tomcat/trunk.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)

tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestRemoteProcessException.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan  5 17:15:37 2016
@@ -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,1649973,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,1655351,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,1657
 
609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1
 
666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,168555
 
6,1685591,1685739,1685744,1685772,1685816,1685826,1685891,1687242,1687261,1687268,1687340,16875

svn commit: r1723139 - /tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Cipher.java

[markt]

Author: markt
Date: Tue Jan  5 17:44:26 2016
New Revision: 1723139

URL: http://svn.apache.org/viewvc?rev=1723139&view=rev
Log:
Fix typo in JSSE name

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Cipher.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Cipher.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Cipher.java?rev=1723139&r1=1723138&r2=1723139&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Cipher.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Cipher.java 
Tue Jan  5 17:44:26 2016
@@ -1290,7 +1290,7 @@ public enum Cipher {
 false,
 56,
 128,
-new String[] {"SSL_RSA_EXPORT1024_WITH_RC2_CBC_56_MD"},
+new String[] {"SSL_RSA_EXPORT1024_WITH_RC2_CBC_56_MD5"},
 null
 ),
 // Cipher 62



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

svn commit: r1723140 - /tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java

[markt]

Author: markt
Date: Tue Jan  5 17:46:04 2016
New Revision: 1723140

URL: http://svn.apache.org/viewvc?rev=1723140&view=rev
Log:
Add handling for EXPORT1024/EXP56 cipher names. Fixes 12 failures.

Modified:

tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java?rev=1723140&r1=1723139&r2=1723140&view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java
 (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java
 Tue Jan  5 17:46:04 2016
@@ -69,13 +69,13 @@ public final class CipherSuiteConverter
 // Be very careful not to break the indentation while editing.
 Pattern.compile(
 "^(?:(" + // BEGIN handshake algorithm
-"(?:(?:EXP-)?" +
+"(?:(?:EXP-|EXP1024-)?" +
 "(?:" +
 
"(?:DH|DHE|EDH|ECDH|ECDHE|RSA|SRP)-(?:DSS|RSA|ECDSA|PSK)|" +
 "(?:ADH|AECDH|KRB5|PSK|SRP)" +
 ')' +
 ")|" +
-"EXP" +
+"EXP|EXP1024" +
 ")-)?" +  // END handshake algorithm
 "(.*)-(.*)$");
 
@@ -212,9 +212,15 @@ public final class CipherSuiteConverter
 }
 
 private static String toOpenSslHandshakeAlgo(String handshakeAlgo) {
-final boolean export = handshakeAlgo.endsWith("_EXPORT");
-if (export) {
+final EncryptionLevel export;
+if (handshakeAlgo.endsWith("_EXPORT")) {
+export = EncryptionLevel.EXP40;
 handshakeAlgo = handshakeAlgo.substring(0, handshakeAlgo.length() 
- 7);
+} else if (handshakeAlgo.endsWith("_EXPORT1024")) {
+export = EncryptionLevel.EXP56;
+handshakeAlgo = handshakeAlgo.substring(0, handshakeAlgo.length() 
- 11);
+} else {
+export = null;
 }
 
 if ("RSA".equals(handshakeAlgo)) {
@@ -223,11 +229,19 @@ public final class CipherSuiteConverter
 handshakeAlgo = 'A' + handshakeAlgo.substring(0, 
handshakeAlgo.length() - 5);
 }
 
-if (export) {
+if (export != null) {
 if (handshakeAlgo.length() == 0) {
-handshakeAlgo = "EXP";
+if (export == EncryptionLevel.EXP40) {
+handshakeAlgo = "EXP";
+} else {
+handshakeAlgo = "EXP1024";
+}
 } else {
-handshakeAlgo = "EXP-" + handshakeAlgo;
+if (export == EncryptionLevel.EXP40) {
+handshakeAlgo = "EXP-" + handshakeAlgo;
+} else {
+handshakeAlgo = "EXP1024-" + handshakeAlgo;
+}
 }
 }
 
@@ -259,7 +273,7 @@ public final class CipherSuiteConverter
 return "DES-CBC";
 }
 
-if ("RC2_CBC_40".equals(bulkCipher)) {
+if ("RC2_CBC_40".equals(bulkCipher) || 
"RC2_CBC_56".equals(bulkCipher)) {
 return "RC2-CBC";
 }
 
@@ -271,6 +285,10 @@ public final class CipherSuiteConverter
 return "AES256";
 }
 
+if ("RSA_EXPORT1024".equals(bulkCipher)) {
+return "EXP1024";
+}
+
 return bulkCipher.replace('_', '-');
 }
 
@@ -342,18 +360,24 @@ public final class CipherSuiteConverter
 }
 
 String handshakeAlgo = m.group(1);
-final boolean export;
+final EncryptionLevel export;
 if (handshakeAlgo == null) {
 handshakeAlgo = "";
-export = false;
+export = null;
 } else if (handshakeAlgo.startsWith("EXP-")) {
 handshakeAlgo = handshakeAlgo.substring(4);
-export = true;
+export = EncryptionLevel.EXP40;
+} else if (handshakeAlgo.startsWith("EXP1024-")) {
+handshakeAlgo = handshakeAlgo.substring(8);
+export = EncryptionLevel.EXP56;
 } else if ("EXP".equals(handshakeAlgo)) {
 handshakeAlgo = "";
-export = true;
+export = EncryptionLevel.EXP40;
+} else if ("EXP1024".equals(handshakeAlgo)) {
+handshakeAlgo = "";
+export = EncryptionLevel.EXP56;
 } else {
-export = false;
+export = null;
 }
 
 handshakeAlgo = toJavaHandshakeAlgo(handshakeAlgo, export);
@@ -363,7 +387,7 @@ public final class CipherSuiteConverter
 return handshakeAlgo + "_WITH_" + bulkCipher + '_' + hmacAlgo;
 }
 
-priv

svn commit: r1723150 - /tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipherSuiteConverter.java

[markt]

Author: markt
Date: Tue Jan  5 18:56:49 2016
New Revision: 1723150

URL: http://svn.apache.org/viewvc?rev=1723150&view=rev
Log:
Making progress

Modified:

tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipherSuiteConverter.java

Modified: 
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipherSuiteConverter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipherSuiteConverter.java?rev=1723150&r1=1723149&r2=1723150&view=diff
==
--- 
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipherSuiteConverter.java
 (original)
+++ 
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipherSuiteConverter.java
 Tue Jan  5 18:56:49 2016
@@ -25,7 +25,7 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
-@Ignore // Currently 262 out of 486 tests fail
+@Ignore // Currently 76 out of 486 tests fail
 @RunWith(Parameterized.class)
 public class TestCipherSuiteConverter {
 



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

svn commit: r1723151 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/tribes/test/channel/TestRemoteProcessException.java

[kkolinko]

Author: kkolinko
Date: Tue Jan  5 19:20:17 2016
New Revision: 1723151

URL: http://svn.apache.org/viewvc?rev=1723151&view=rev
Log:
Fix a failing tribes test by aligning test expectations with the actual 
observed behaviour.
Notes:
1. This test is excluded when running tests via build.xml.
2. Duration of the test: 54 seconds. It can be reduced by reducing msgCount 
variable.
3. This test creates random messages, half of those are failing at receiver 
side by an explicit "throw new IllegalStateException()".

Merged r1723130 from tomcat/tc8.0.x/trunk.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestRemoteProcessException.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan  5 19:20:17 2016
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702
 
744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
 
,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,13001

svn commit: r1723152 - /tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java

[markt]

Author: markt
Date: Tue Jan  5 19:26:23 2016
New Revision: 1723152

URL: http://svn.apache.org/viewvc?rev=1723152&view=rev
Log:
CCM cipher names are a special case

Modified:

tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java?rev=1723152&r1=1723151&r2=1723152&view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java
 (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java
 Tue Jan  5 19:26:23 2016
@@ -380,9 +380,25 @@ public final class CipherSuiteConverter
 export = null;
 }
 
+String bulkCipher = m.group(2);
+String hmacAlgo = m.group(3);
+
+// CCM is a special case
+if ("CCM".equals(hmacAlgo)) {
+bulkCipher += "-CCM";
+hmacAlgo = "";
+} else if ("CCM8".equals(hmacAlgo)) {
+bulkCipher += "-CCM_8";
+hmacAlgo = "";
+}
+
 handshakeAlgo = toJavaHandshakeAlgo(handshakeAlgo, export);
-String bulkCipher = toJavaBulkCipher(m.group(2), export);
-String hmacAlgo = toJavaHmacAlgo(m.group(3));
+bulkCipher = toJavaBulkCipher(bulkCipher, export);
+hmacAlgo = toJavaHmacAlgo(hmacAlgo);
+
+if (hmacAlgo.length() == 0) {
+return handshakeAlgo + "_WITH_" + bulkCipher;
+}
 
 return handshakeAlgo + "_WITH_" + bulkCipher + '_' + hmacAlgo;
 }



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

[GUMP@vmgump]: Project tomcat-tc7.0.x-test-nio (in module tomcat-7.0.x) failed

[Bill Barker]

To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-tc7.0.x-test-nio has an issue affecting its community 
integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc7.0.x-test-nio :  Tomcat 7.x, a web server implementing Java 
Servlet 3.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-nio/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp-src.jar.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp.home.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/logs-NIO
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-NIO/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-nio/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio (Type: Build)
Work ended in a state of : Failed
Elapsed: 49 mins 51 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x 
-Dtest.temp=output/test-tmp-NIO 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160105.jar
 
-Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar
 -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps 
-Dtest.excludePerformance=true 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x 
-Dexecute.test.apr=false -Dexecute.test.bio=false 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/w
 
orkspace/apache-commons/daemon/dist/bin/commons-daemon-20160105-native-src.tar.gz
 -Dtest.reports=output/logs-NIO 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160105-native-src.tar.gz
 -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dexecute.test.nio=true -Dtest.accesslog=true 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20160105.jar
 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-7.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomca

Re: [VOTE] Release Apache Tomcat Native 1.2.4

[Mark Thomas]

On 05/01/2016 15:46, Mark Thomas wrote:
> Version 1.2.4 includes the following change:
> 
> - Renegotiation improvements
> 
> The proposed release artefacts can be found at [1],
> and the build was done using tag [2].
> 
> The Apache Tomcat Native 1.2.4 is
>  [ ] Stable, go ahead and release
>  [X] Broken because of ...

I linked the binaries to OpenSSL 1.0.2d rather than 1.0.2e

I'll rebuild the binaries, upload the new ones and then restart the vote.

Mark


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

svn commit: r1723155 - /tomcat/trunk/res/findbugs/filter-false-positives.xml

[violetagg]

Author: violetagg
Date: Tue Jan  5 20:38:01 2016
New Revision: 1723155

URL: http://svn.apache.org/viewvc?rev=1723155&view=rev
Log:
Update findbugs false positive - reliance on default encoding

Modified:
tomcat/trunk/res/findbugs/filter-false-positives.xml

Modified: tomcat/trunk/res/findbugs/filter-false-positives.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/findbugs/filter-false-positives.xml?rev=1723155&r1=1723154&r2=1723155&view=diff
==
--- tomcat/trunk/res/findbugs/filter-false-positives.xml (original)
+++ tomcat/trunk/res/findbugs/filter-false-positives.xml Tue Jan  5 20:38:01 
2016
@@ -141,6 +141,13 @@
 
   
   
+
+
+
+
+  
+  
 
 
 
@@ -216,6 +223,13 @@
 
   
   
+
+
+
+
+  
+  
   
 
 
@@ -254,6 +268,20 @@
 
   
   
+
+
+
+
+  
+  
+
+
+
+
+  
+  
 
 
 
@@ -331,6 +359,12 @@
 
   
   
+
+
+
+
+  
+  
 
 
@@ -518,6 +552,12 @@
 
   
   
+
+
+
+
+  
+  
 
 
 
@@ -531,6 +571,13 @@
 
   
   
+
+
+
+
+  
+  
 
 
@@ -654,6 +701,12 @@
 
   
   
+
+
+
+
+  
+  
 
 
 
@@ -675,6 +728,24 @@
 
   
   
+
+
+
+
+  
+  
+
+
+
+
+  
+  
+
+
+
+
+  
+  
 
 
 



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

svn commit: r1723165 - in /tomcat/trunk: java/org/apache/catalina/manager/ManagerServlet.java webapps/manager/WEB-INF/jsp/connectorCiphers.jsp

[markt]

Author: markt
Date: Tue Jan  5 21:02:37 2016
New Revision: 1723165

URL: http://svn.apache.org/viewvc?rev=1723165&view=rev
Log:
Fix the connector cipher listing in the Manager app. It isn't ideal. It lists 
configured rather than available ciphers but it is better than the NPE.

Modified:
tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
tomcat/trunk/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp

Modified: tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=1723165&r1=1723164&r2=1723165&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Tue Jan  
5 21:02:37 2016
@@ -24,7 +24,6 @@ import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.Enumeration;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
@@ -61,6 +60,8 @@ import org.apache.catalina.util.ServerIn
 import org.apache.tomcat.util.Diagnostics;
 import org.apache.tomcat.util.ExceptionUtils;
 import org.apache.tomcat.util.modeler.Registry;
+import org.apache.tomcat.util.net.SSLHostConfig;
+import org.apache.tomcat.util.net.openssl.ciphers.Cipher;
 import org.apache.tomcat.util.res.StringManager;
 
 
@@ -562,16 +563,19 @@ public class ManagerServlet extends Http
 writer.print(Diagnostics.getThreadDump(requestedLocales));
 }
 
-protected void sslConnectorCiphers(PrintWriter writer,
-StringManager smClient) {
-writer.println(smClient.getString(
-"managerServlet.sslConnectorCiphers"));
-Map> connectorCiphers = getConnectorCiphers();
-for (Map.Entry> entry : 
connectorCiphers.entrySet()) {
+protected void sslConnectorCiphers(PrintWriter writer, StringManager 
smClient) {
+
writer.println(smClient.getString("managerServlet.sslConnectorCiphers"));
+Map> connectorCiphers = getConnectorCiphers();
+for (Map.Entry> entry : 
connectorCiphers.entrySet()) {
 writer.println(entry.getKey());
-for (String cipher : entry.getValue()) {
+if (entry.getValue() == null) {
 writer.print("  ");
-writer.println(cipher);
+
writer.println(smClient.getString("managerServlet.notSslConnector"));
+} else {
+for (Cipher cipher : entry.getValue()) {
+writer.print("  ");
+writer.println(cipher);
+}
 }
 }
 }
@@ -1650,24 +1654,23 @@ public class ManagerServlet extends Http
 }
 
 
-protected Map> getConnectorCiphers() {
-Map> result = new HashMap<>();
+protected Map> getConnectorCiphers() {
+// TODO: Returned available ciphers rather than configured ciphers.
+Map> result = new HashMap<>();
 
 Engine e = (Engine) host.getParent();
 Service s = e.getService();
 Connector connectors[] = s.findConnectors();
 for (Connector connector : connectors) {
-Set cipherList = new HashSet<>();
 if (Boolean.TRUE.equals(connector.getProperty("SSLEnabled"))) {
-String[] ciphersUsed =
-(String[]) connector.getProperty("ciphersUsed");
-for (String cipherUsed : ciphersUsed) {
-cipherList.add(cipherUsed);
+SSLHostConfig[] sslHostConfigs = 
connector.getProtocolHandler().findSslHostConfigs();
+for (SSLHostConfig sslHostConfig : sslHostConfigs) {
+result.put(connector.toString() + "-" + 
sslHostConfig.getHostName(),
+sslHostConfig.getCipherList());
 }
 } else {
-cipherList.add(sm.getString("managerServlet.notSslConnector"));
+result.put(connector.toString(), null);
 }
-result.put(connector.toString(), cipherList);
 }
 return result;
 }

Modified: tomcat/trunk/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp?rev=1723165&r1=1723164&r2=1723165&view=diff
==
--- tomcat/trunk/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp (original)
+++ tomcat/trunk/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp Tue Jan  5 
21:02:37 2016
@@ -19,12 +19,13 @@
 <%@page import="java.util.Map" %>
 <%@page import="java.util.Map.Entry" %>
 <%@page import="java.util.Set" %>
+<%@page import="org.apache.tomcat.util.net.openssl.ciphers.Cipher" %>
 http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
 
 http://www.w3.org

[Bug 58624] Websocket send blocks indefinitely in FutureToSendHandler

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58624

--- Comment #15 from Sebastian Herold  
---
+1 for reopening the case or creating a new bug, if this (java.io.IOException:
Unable to write the complete message as the WebSocket connection has been
closed) is not related to the existing bug.

Spring also recreated the error in one of their tests and had to ignore it
until Tomcat is fixed: https://jira.spring.io/browse/INT-3909

-- 
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: r1723167 - in /tomcat/tc6.0.x/trunk: ./ test/org/apache/catalina/tribes/test/channel/TestRemoteProcessException.java

[kkolinko]

Author: kkolinko
Date: Tue Jan  5 21:19:25 2016
New Revision: 1723167

URL: http://svn.apache.org/viewvc?rev=1723167&view=rev
Log:
Fix a failing tribes test by aligning test expectations with the actual 
observed behaviour.
Notes:
1. This test is excluded when running tests via build.xml.
2. Duration of the test: 110 seconds. It can be reduced by reducing msgCount 
variable.
3. This test creates random messages, half of those are failing at receiver 
side by an explicit "throw new IllegalStateException()".

Merged r1723151 from tomcat/tc7.0.x/trunk.
Followup to r1723117.

Modified:
tomcat/tc6.0.x/trunk/   (props changed)

tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestRemoteProcessException.java

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan  5 21:19:25 2016
@@ -1,3 +1,3 @@
-/tomcat/tc7.0.x/trunk:1224802,1243045,1298635,1304471,1311997,1312007,1331772,1333164,1333176,1348992,1354866,1371298,1371302,1371620,1402110,1409014,1413553,1413557,1413563,1430083,1438415,1446641-1446660,1447013,1453106,1453119,1484919,1486877,1500065,1503852,1505844,1513151,1521040,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1568922,1570163,1577328,1577464-1577465,1578814,1586659,1586897,1586960,1588199,1588997,1589740,1589851,1589997,1590019,1590028,1590337,1590492,1590651,1590838,1590845,1590848,1590912,1593262,1593288,1593371,1593835,1594230,1595174,1595366,1600956,1601333,1601856,1601909,1609079,1609606,1617364,1617374,1617433,1617457-1617458,1624249,1626579,1627420,1627469,1632586,1637686,1637711,1640675,1642045,1643515,1643540,1643572,1643585-1643586,1643642,1643647,1644019,1648817,1656301,1658815,1659523,1659564,1664001,1664176,1665087,1666968,1666989,1668541
 
,1668635,1669802,1676557,1681183,1681841,1681865,1681867,1685829,1693109,1694293,1694433,1694875,1696381,1701945,1710353,1712656,1713873,1714000,1714005,1714540,1715213,1716221,1716417,1717210,1717212,1720236,1720398,1720443,1720464,1721814,1721883,1722801
-/tomcat/tc8.0.x/trunk:1637685,1637709,1640674,1641726,1641729-1641730,1643513,1643539,1643571,1643581-1643582,1644018,1648816,1656300,1658801-1658803,1658811,1659522,1663997,1664175,1665086,1666967,1666988,1668634,1669801,1676556,1681182,1681840,1681864,1685827,1689921,1693108,1694291,1694427,1694873,1696379,1701944,1710347,1712618,1712655,1713872,1713998,1714004,1714538,1715207,1716216-1716217,1716414,1717208-1717209,1720235,1720396,1720442,1720463,1721813,1721882,1722800
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,656018,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770
 
809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,890139,890265
 
,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,

svn commit: r1723169 - /tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

[kkolinko]

Author: kkolinko
Date: Tue Jan  5 21:26:37 2016
New Revision: 1723169

URL: http://svn.apache.org/viewvc?rev=1723169&view=rev
Log:
Update changelog.
All tests are now using JUnit 4. There is no mention of "junit.framework" 
package in the source code.

Modified:
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1723169&r1=1723168&r2=1723169&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Jan  5 21:26:37 2016
@@ -175,7 +175,7 @@
 Benjamin Gandon. (kkolinko)
   
   
-Convert some test classes to JUnit 4. (kkolinko)
+Convert test classes to JUnit 4. (kkolinko)
   
   
 58596: Clarify the description in RUNNING.txt of how



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

svn commit: r1723174 - in /tomcat/trunk: java/org/apache/catalina/manager/ManagerServlet.java java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java webapps/manager/WEB-INF/jsp/connectorCiphers

[markt]

Author: markt
Date: Tue Jan  5 21:38:58 2016
New Revision: 1723174

URL: http://svn.apache.org/viewvc?rev=1723174&view=rev
Log:
Mostly revert r1723165 and implement a better fix.

Modified:
tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
tomcat/trunk/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp

Modified: tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=1723174&r1=1723173&r2=1723174&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Tue Jan  
5 21:38:58 2016
@@ -24,6 +24,7 @@ import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.Enumeration;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
@@ -61,7 +62,7 @@ import org.apache.tomcat.util.Diagnostic
 import org.apache.tomcat.util.ExceptionUtils;
 import org.apache.tomcat.util.modeler.Registry;
 import org.apache.tomcat.util.net.SSLHostConfig;
-import org.apache.tomcat.util.net.openssl.ciphers.Cipher;
+import org.apache.tomcat.util.net.SSLHostConfigCertificate;
 import org.apache.tomcat.util.res.StringManager;
 
 
@@ -563,19 +564,16 @@ public class ManagerServlet extends Http
 writer.print(Diagnostics.getThreadDump(requestedLocales));
 }
 
-protected void sslConnectorCiphers(PrintWriter writer, StringManager 
smClient) {
-
writer.println(smClient.getString("managerServlet.sslConnectorCiphers"));
-Map> connectorCiphers = getConnectorCiphers();
-for (Map.Entry> entry : 
connectorCiphers.entrySet()) {
+protected void sslConnectorCiphers(PrintWriter writer,
+StringManager smClient) {
+writer.println(smClient.getString(
+"managerServlet.sslConnectorCiphers"));
+Map> connectorCiphers = getConnectorCiphers();
+for (Map.Entry> entry : 
connectorCiphers.entrySet()) {
 writer.println(entry.getKey());
-if (entry.getValue() == null) {
+for (String cipher : entry.getValue()) {
 writer.print("  ");
-
writer.println(smClient.getString("managerServlet.notSslConnector"));
-} else {
-for (Cipher cipher : entry.getValue()) {
-writer.print("  ");
-writer.println(cipher);
-}
+writer.println(cipher);
 }
 }
 }
@@ -1654,9 +1652,8 @@ public class ManagerServlet extends Http
 }
 
 
-protected Map> getConnectorCiphers() {
-// TODO: Returned available ciphers rather than configured ciphers.
-Map> result = new HashMap<>();
+protected Map> getConnectorCiphers() {
+Map> result = new HashMap<>();
 
 Engine e = (Engine) host.getParent();
 Service s = e.getService();
@@ -1665,11 +1662,21 @@ public class ManagerServlet extends Http
 if (Boolean.TRUE.equals(connector.getProperty("SSLEnabled"))) {
 SSLHostConfig[] sslHostConfigs = 
connector.getProtocolHandler().findSslHostConfigs();
 for (SSLHostConfig sslHostConfig : sslHostConfigs) {
-result.put(connector.toString() + "-" + 
sslHostConfig.getHostName(),
-sslHostConfig.getCipherList());
+for (SSLHostConfigCertificate cert : 
sslHostConfig.getCertificates()) {
+String name = connector.toString() + "-" + 
sslHostConfig.getHostName() +
+"-" + cert.getType();
+Set cipherList = new HashSet<>();
+String[] cipherNames = cert.getEnabledCiphers();
+for (String cipherName : cipherNames) {
+cipherList.add(cipherName);
+}
+result.put(name, cipherList);
+}
 }
 } else {
-result.put(connector.toString(), null);
+Set cipherList = new HashSet<>();
+cipherList.add(sm.getString("managerServlet.notSslConnector"));
+result.put(connector.toString(), cipherList);
 }
 }
 return result;

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java?rev=1723174&r1=1723173&r2=1723174&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java 

svn commit: r1723177 - /tomcat/tc6.0.x/trunk/test/org/apache/juli/TestDateFormatCache.java

[kkolinko]

Author: kkolinko
Date: Tue Jan  5 21:42:27 2016
New Revision: 1723177

URL: http://svn.apache.org/viewvc?rev=1723177&view=rev
Log:
Add TestDateFormatCache test.

It was committed to tomcat6-testing branch,
but was omitted when DateFormatCache was added to Tomcat 6 (r1476547).

Added:
tomcat/tc6.0.x/trunk/test/org/apache/juli/TestDateFormatCache.java
  - copied unchanged from r1722967, 
tomcat/tc6.0.x/branches/tomcat6-testing/test/org/apache/juli/TestDateFormatCache.java


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

svn commit: r1723181 - /tomcat/tc6.0.x/trunk/test/org/apache/tomcat/util/buf/

[kkolinko]

Author: kkolinko
Date: Tue Jan  5 21:55:02 2016
New Revision: 1723181

URL: http://svn.apache.org/viewvc?rev=1723181&view=rev
Log:
Add testcase for https://issues.apache.org/bugzilla/show_bug.cgi?id=54248

It was committed to tomcat6-testing branch in r1444290,
but was not copied to Tomcat 6 trunk when applying the fix in r1444292.

Added:
tomcat/tc6.0.x/trunk/test/org/apache/tomcat/util/buf/
  - copied from r1722967, 
tomcat/tc6.0.x/branches/tomcat6-testing/test/org/apache/tomcat/util/buf/


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

svn commit: r1723183 - /tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java

[markt]

Author: markt
Date: Tue Jan  5 22:02:54 2016
New Revision: 1723183

URL: http://svn.apache.org/viewvc?rev=1723183&view=rev
Log:
Quick hack to avoid NPE when running with an APR/native SSL connector and 
listing enabled ciphers.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java?rev=1723183&r1=1723182&r2=1723183&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java 
Tue Jan  5 22:02:54 2016
@@ -18,6 +18,7 @@ package org.apache.tomcat.util.net;
 
 import java.util.HashSet;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.apache.tomcat.util.net.AbstractJsseEndpoint.SSLContextWrapper;
 import org.apache.tomcat.util.net.openssl.ciphers.Authentication;
@@ -193,7 +194,13 @@ public class SSLHostConfigCertificate {
 
 
 public String[] getEnabledCiphers() {
-return getSslContextWrapper().getEnabledCiphers();
+SSLContextWrapper wrapper = getSslContextWrapper();
+if (wrapper != null) {
+return wrapper.getEnabledCiphers();
+}
+
+return sslHostConfig.getCipherList().stream().map(c -> c.toString()).
+collect(Collectors.toList()).toArray(new String[0]);
 }
 
 



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

svn commit: r1723193 - /tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java

[markt]

Author: markt
Date: Tue Jan  5 22:58:06 2016
New Revision: 1723193

URL: http://svn.apache.org/viewvc?rev=1723193&view=rev
Log:
Simplify. SSLHostConfig always returns an OpenSSL configuration string.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java?rev=1723193&r1=1723192&r2=1723193&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java 
Tue Jan  5 22:58:06 2016
@@ -25,7 +25,6 @@ import java.security.cert.X509Certificat
 import java.util.ArrayList;
 import java.util.Base64;
 import java.util.List;
-import java.util.StringTokenizer;
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 
 import javax.net.ssl.KeyManager;
@@ -49,7 +48,6 @@ import org.apache.tomcat.util.net.Consta
 import org.apache.tomcat.util.net.SSLHostConfig;
 import org.apache.tomcat.util.net.SSLHostConfigCertificate;
 import org.apache.tomcat.util.net.jsse.JSSEKeyManager;
-import org.apache.tomcat.util.net.openssl.ciphers.CipherSuiteConverter;
 import 
org.apache.tomcat.util.net.openssl.ciphers.OpenSSLCipherConfigurationParser;
 import org.apache.tomcat.util.res.StringManager;
 
@@ -299,21 +297,9 @@ public class OpenSSLContext implements o
 }
 
 // List the ciphers that the client is permitted to negotiate
-String ciphers = sslHostConfig.getCiphers();
-if (!("ALL".equals(ciphers)) && ciphers.indexOf(':') == -1) {
-StringTokenizer tok = new StringTokenizer(ciphers, ",");
-this.ciphers = new ArrayList<>();
-while (tok.hasMoreTokens()) {
-String token = tok.nextToken().trim();
-if (!"".equals(token)) {
-this.ciphers.add(token);
-}
-}
-ciphers = CipherSuiteConverter.toOpenSsl(ciphers);
-} else {
-this.ciphers = 
OpenSSLCipherConfigurationParser.parseExpression(ciphers);
-}
-SSLContext.setCipherSuite(ctx, ciphers);
+String opensslCipherConfig = sslHostConfig.getCiphers();
+this.ciphers = 
OpenSSLCipherConfigurationParser.parseExpression(opensslCipherConfig);
+SSLContext.setCipherSuite(ctx, opensslCipherConfig);
 // Load Server key and certificate
 if (certificate.getCertificateFile() != null) {
 // Set certificate



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

svn commit: r1723195 - /tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java

[markt]

Author: markt
Date: Tue Jan  5 22:59:27 2016
New Revision: 1723195

URL: http://svn.apache.org/viewvc?rev=1723195&view=rev
Log:
Clarify Javadoc

Modified:
tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java

Modified: tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java?rev=1723195&r1=1723194&r2=1723195&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java Tue Jan  5 22:59:27 
2016
@@ -143,7 +143,7 @@ public final class SSLContext {
  * renegotiation with the reconfigured Cipher Suite after the HTTP request
  * was read but before the HTTP response is sent.
  * @param ctx Server or Client context to use.
- * @param ciphers An SSL cipher specification.
+ * @param ciphers An OpenSSL cipher specification.
  */
 public static native boolean setCipherSuite(long ctx, String ciphers)
 throws Exception;



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

svn commit: r1723196 - in /tomcat/trunk/java/org/apache/tomcat/util/net/openssl: OpenSSLContext.java OpenSSLUtil.java

[markt]

Author: markt
Date: Tue Jan  5 23:00:17 2016
New Revision: 1723196

URL: http://svn.apache.org/viewvc?rev=1723196&view=rev
Log:
Be specific about the type of cipher list.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java?rev=1723196&r1=1723195&r2=1723196&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java 
Tue Jan  5 23:00:17 2016
@@ -67,10 +67,10 @@ public class OpenSSLContext implements o
 
 private final List negotiableProtocols;
 
-private List ciphers = new ArrayList<>();
+private List jsseCipherNames = new ArrayList<>();
 
-public List getCiphers() {
-return ciphers;
+public List getJsseCipherNames() {
+return jsseCipherNames;
 }
 
 private String enabledProtocol;
@@ -298,7 +298,7 @@ public class OpenSSLContext implements o
 
 // List the ciphers that the client is permitted to negotiate
 String opensslCipherConfig = sslHostConfig.getCiphers();
-this.ciphers = 
OpenSSLCipherConfigurationParser.parseExpression(opensslCipherConfig);
+this.jsseCipherNames = 
OpenSSLCipherConfigurationParser.parseExpression(opensslCipherConfig);
 SSLContext.setCipherSuite(ctx, opensslCipherConfig);
 // Load Server key and certificate
 if (certificate.getCertificateFile() != null) {

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java?rev=1723196&r1=1723195&r2=1723196&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java Tue 
Jan  5 23:00:17 2016
@@ -85,7 +85,7 @@ public class OpenSSLUtil implements SSLU
 @Override
 public String[] getEnableableCiphers(SSLContext context) {
 if (enabledCiphers == null) {
-List enabledCiphersList = ((OpenSSLContext) 
context).getCiphers();
+List enabledCiphersList = ((OpenSSLContext) 
context).getJsseCipherNames();
 enabledCiphers = enabledCiphersList.toArray(new 
String[enabledCiphersList.size()]);
 }
 return enabledCiphers;



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

Re: jdbc pool: validationQuery vs Connection.isValid

[Christopher Schultz]

Julian,

On 1/5/16 9:25 AM, Julian Reschke wrote:
> Hi there,
> 
> maybe that's a stupid question, but why do we need a configurable
> validationQuery when there's
> 
>   Connection.isValid(...)
> 
> 

Because not all JREs have the Connection.isValid method available, and
the validation query is a fall-back mechanism. Connection.isValid was
added in Java 1.6, and tomcat-pool is backward compatible down to Java 1.5.

-chris

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

svn commit: r1723197 - in /tomcat/trunk/java/org/apache/tomcat/util/net/openssl: OpenSSLContext.java OpenSSLSessionContext.java OpenSSLSessionStats.java

[markt]

Author: markt
Date: Tue Jan  5 23:09:04 2016
New Revision: 1723197

URL: http://svn.apache.org/viewvc?rev=1723197&view=rev
Log:
Fix Javadoc warnings

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java

tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLSessionContext.java

tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLSessionStats.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java?rev=1723197&r1=1723196&r2=1723197&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java 
Tue Jan  5 23:09:04 2016
@@ -184,11 +184,12 @@ public class OpenSSLContext implements o
 }
 
 /**
- * Setup the SSL_CTX
+ * Setup the SSL_CTX.
  *
  * @param kms Must contain a KeyManager of the type
- * {@code OpenSSLKeyManager}
- * @param tms
+ *{@code OpenSSLKeyManager}
+ * @param tms Must contain a TrustManager of the type
+ *{@code X509TrustManager}
  * @param sr Is not used for this implementation.
  */
 @Override

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLSessionContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLSessionContext.java?rev=1723197&r1=1723196&r2=1723197&view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLSessionContext.java 
(original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLSessionContext.java 
Tue Jan  5 23:09:04 2016
@@ -52,6 +52,8 @@ public abstract class OpenSSLSessionCont
 
 /**
  * Sets the SSL session ticket keys of this context.
+ *
+ * @param keys The session ticket keys
  */
 public void setTicketKeys(byte[] keys) {
 if (keys == null) {
@@ -62,16 +64,19 @@ public abstract class OpenSSLSessionCont
 
 /**
  * Enable or disable caching of SSL sessions.
+ *
+ * @param enabled {@code true} to enable caching, {@code false} to disable
  */
 public abstract void setSessionCacheEnabled(boolean enabled);
 
 /**
- * Return {@code true} if caching of SSL sessions is enabled, {@code 
false} otherwise.
+ * @return {@code true} if caching of SSL sessions is enabled, {@code 
false}
+ * otherwise.
  */
 public abstract boolean isSessionCacheEnabled();
 
 /**
- * Returns the stats of this context.
+ * @return The statistics for this context.
  */
 public OpenSSLSessionStats stats() {
 return stats;

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLSessionStats.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLSessionStats.java?rev=1723197&r1=1723196&r2=1723197&view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLSessionStats.java 
(original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLSessionStats.java 
Tue Jan  5 23:09:04 2016
@@ -32,89 +32,93 @@ public final class OpenSSLSessionStats {
 }
 
 /**
- * Returns the current number of sessions in the internal session cache.
+ * @return The current number of sessions in the internal session cache.
  */
 public long number() {
 return SSLContext.sessionNumber(context);
 }
 
 /**
- * Returns the number of started SSL/TLS handshakes in client mode.
+ * @return The number of started SSL/TLS handshakes in client mode.
  */
 public long connect() {
 return SSLContext.sessionConnect(context);
 }
 
 /**
- * Returns the number of successfully established SSL/TLS sessions in 
client mode.
+ * @return The number of successfully established SSL/TLS sessions in 
client mode.
  */
 public long connectGood() {
 return SSLContext.sessionConnectGood(context);
 }
 
 /**
- * Returns the number of start renegotiations in client mode.
+ * @return The number of start renegotiations in client mode.
  */
 public long connectRenegotiate() {
 return SSLContext.sessionConnectRenegotiate(context);
 }
 
 /**
- * Returns the number of started SSL/TLS handshakes in server mode.
+ * @return The number of started SSL/TLS handshakes in server mode.
  */
 public long accept() {
 return SSLContext.sessionAccept(context);
 }
 
 /**
- * Returns the number of successfully established SSL/TLS sessions in 
server mode.
+ * @return The number of successful

Re: jdbc pool jmx enhancements

[Christopher Schultz]

Anthony,

On 12/23/15 6:16 PM, Anthony Biacco wrote:
> I'm testing a move from dbcp2 pooling to tomcat's built in pooling.

Note that, technically, Tomcat builds both DBCP2 and tomcat-pool into
Tomcat releases.

> I'm using tomcat 8.0.30.
>
> Looking through the jmx mbeans i did not see the BorrowedCount or
> CreatedCount attributes as I did when using dbcp2.
> I use these in my monitoring software to graph DB thread activity.
> 
> What are the chances that we can get these attributes implemented for the
> built in pool?

Pretty good: create an enhancement in Bugzilla for access to the various
fields you'd like exposed via JMX.

-chris

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

svn commit: r1723199 - in /tomcat/trunk: java/org/apache/tomcat/util/net/openssl/ java/org/apache/tomcat/util/net/openssl/ciphers/ test/org/apache/tomcat/util/net/openssl/ciphers/

[markt]

Author: markt
Date: Tue Jan  5 23:44:37 2016
New Revision: 1723199

URL: http://svn.apache.org/viewvc?rev=1723199&view=rev
Log:
Refactoring.
Remove the CipherSuiteConverter as it duplicates a lot of info already in 
Cipher and OpenSSLCipherConfigurationParser.

Removed:

tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java

tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipherSuiteConverter.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Cipher.java

tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java?rev=1723199&r1=1723198&r2=1723199&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java Tue 
Jan  5 23:44:37 2016
@@ -51,7 +51,7 @@ import org.apache.tomcat.jni.SSLContext;
 import org.apache.tomcat.util.buf.ByteBufferUtils;
 import org.apache.tomcat.util.net.Constants;
 import org.apache.tomcat.util.net.SSLUtil;
-import org.apache.tomcat.util.net.openssl.ciphers.CipherSuiteConverter;
+import 
org.apache.tomcat.util.net.openssl.ciphers.OpenSSLCipherConfigurationParser;
 import org.apache.tomcat.util.res.StringManager;
 
 /**
@@ -85,7 +85,7 @@ public final class OpenSSLEngine extends
 if (c == null || c.length() == 0 || 
availableCipherSuites.contains(c)) {
 continue;
 }
-
availableCipherSuites.add(CipherSuiteConverter.toJava(c, "ALL"));
+
availableCipherSuites.add(OpenSSLCipherConfigurationParser.openSSLToJsse(c));
 }
 } finally {
 SSL.freeSSL(ssl);
@@ -700,7 +700,7 @@ public final class OpenSSLEngine extends
 return new String[0];
 } else {
 for (int i = 0; i < enabled.length; i++) {
-String mapped = toJavaCipherSuite(enabled[i]);
+String mapped = 
OpenSSLCipherConfigurationParser.openSSLToJsse(enabled[i]);
 if (mapped != null) {
 enabled[i] = mapped;
 }
@@ -719,7 +719,7 @@ public final class OpenSSLEngine extends
 if (cipherSuite == null) {
 break;
 }
-String converted = CipherSuiteConverter.toOpenSsl(cipherSuite);
+String converted = 
OpenSSLCipherConfigurationParser.jsseToOpenSSL(cipherSuite);
 if (converted != null) {
 cipherSuite = converted;
 }
@@ -979,40 +979,6 @@ public final class OpenSSLEngine extends
 return SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING;
 }
 
-/**
- * Converts the specified OpenSSL cipher suite to the Java cipher suite.
- */
-private String toJavaCipherSuite(String openSslCipherSuite) {
-if (openSslCipherSuite == null) {
-return null;
-}
-
-String prefix = toJavaCipherSuitePrefix(SSL.getVersion(ssl));
-return CipherSuiteConverter.toJava(openSslCipherSuite, prefix);
-}
-
-/**
- * Converts the protocol version string returned by
- * {@link SSL#getVersion(long)} to protocol family string.
- */
-private static String toJavaCipherSuitePrefix(String protocolVersion) {
-final char c;
-if (protocolVersion == null || protocolVersion.length() == 0) {
-c = 0;
-} else {
-c = protocolVersion.charAt(0);
-}
-
-switch (c) {
-case 'T':
-return "TLS";
-case 'S':
-return "SSL";
-default:
-return "UNKNOWN";
-}
-}
-
 @Override
 public void setUseClientMode(boolean clientMode) {
 if (clientMode != this.clientMode) {
@@ -1298,7 +1264,7 @@ public final class OpenSSLEngine extends
 return INVALID_CIPHER;
 }
 if (cipher == null) {
-String c = toJavaCipherSuite(SSL.getCipherForSSL(ssl));
+String c = 
OpenSSLCipherConfigurationParser.openSSLToJsse(SSL.getCipherForSSL(ssl));
 if (c != null) {
 cipher = c;
 }

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Cipher.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Cipher.java?rev=1723199&r1=1723198&r2=1723199&view=diff
==
--- tomcat/

[GUMP@vmgump]: Project tomcat-trunk-test-nio (in module tomcat-trunk) failed

[Bill Barker]

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
 -WARNING- No directory 
[/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: 43 mins 27 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.3-SNAPSHOT.jar
 -Dtest.reports=output/logs-NIO 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160106-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.relaxTiming=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160106.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160106-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-ma
 ster/dest-20160106/bin/openssl -Dexecute.test.apr=false 
-Dtest.excludePerformance=true -Dexecute.test.nio2=false 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-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/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/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/g

svn commit: r1723242 - in /tomcat/tc8.0.x/trunk: ./ res/findbugs/filter-false-positives.xml

[violetagg]

Author: violetagg
Date: Wed Jan  6 07:29:42 2016
New Revision: 1723242

URL: http://svn.apache.org/viewvc?rev=1723242&view=rev
Log:
Merged revision 1723155 from tomcat/trunk:
Update findbugs false positive - reliance on default encoding

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/res/findbugs/filter-false-positives.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  6 07:29:42 2016
@@ -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,1649973,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,1655351,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,1657
 
609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1
 
666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,168555
 
6,1685591,1685739,1685744,1685772,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1687551,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1693088,1693105,1693429,1693461,1694058,1694111,1694290,1694501,1694548,1694658,1694660,1694788,1694872,1694878,1695006,1

svn commit: r1723243 - /tomcat/tc6.0.x/branches/tomcat6-testing_20160106/

[kkolinko]

Author: kkolinko
Date: Wed Jan  6 07:31:32 2016
New Revision: 1723243

URL: http://svn.apache.org/viewvc?rev=1723243&view=rev
Log:
A branch to demonstrate proof-of-concept backport of client-server JUnit tests 
to Tomcat 6
(TomcatBaseTest, TestTomcat).

Starting as a copy from tc6.0.x/trunk

Added:
tomcat/tc6.0.x/branches/tomcat6-testing_20160106/   (props changed)
  - copied from r1723242, tomcat/tc6.0.x/trunk/

Propchange: tomcat/tc6.0.x/branches/tomcat6-testing_20160106/
--
--- svn:ignore (added)
+++ svn:ignore Wed Jan  6 07:31:32 2016
@@ -0,0 +1,5 @@
+.*
+output
+build.properties
+work
+logs

Propchange: tomcat/tc6.0.x/branches/tomcat6-testing_20160106/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jan  6 07:31:32 2016
@@ -0,0 +1,3 @@
+/tomcat/tc7.0.x/trunk:1224802,1243045,1298635,1304471,1311997,1312007,1331772,1333164,1333176,1348992,1354866,1371298,1371302,1371620,1402110,1409014,1413553,1413557,1413563,1430083,1438415,1446641-1446660,1447013,1453106,1453119,1484919,1486877,1500065,1503852,1505844,1513151,1521040,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1568922,1570163,1577328,1577464-1577465,1578814,1586659,1586897,1586960,1588199,1588997,1589740,1589851,1589997,1590019,1590028,1590337,1590492,1590651,1590838,1590845,1590848,1590912,1593262,1593288,1593371,1593835,1594230,1595174,1595366,1600956,1601333,1601856,1601909,1609079,1609606,1617364,1617374,1617433,1617457-1617458,1624249,1626579,1627420,1627469,1632586,1637686,1637711,1640675,1642045,1643515,1643540,1643572,1643585-1643586,1643642,1643647,1644019,1648817,1656301,1658815,1659523,1659564,1664001,1664176,1665087,1666968,1666989,1668541
 
,1668635,1669802,1676557,1681183,1681841,1681865,1681867,1685829,1693109,1694293,1694433,1694875,1696381,1701945,1710353,1712656,1713873,1714000,1714005,1714540,1715213,1716221,1716417,1717210,1717212,1720236,1720398,1720443,1720464,1721814,1721883,1722801,1723151
+/tomcat/tc8.0.x/trunk:1637685,1637709,1640674,1641726,1641729-1641730,1643513,1643539,1643571,1643581-1643582,1644018,1648816,1656300,1658801-1658803,1658811,1659522,1663997,1664175,1665086,1666967,1666988,1668634,1669801,1676556,1681182,1681840,1681864,1685827,1689921,1693108,1694291,1694427,1694873,1696379,1701944,1710347,1712618,1712655,1713872,1713998,1714004,1714538,1715207,1716216-1716217,1716414,1717208-1717209,1720235,1720396,1720442,1720463,1721813,1721882,1722800,1723130
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,656018,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770
 
809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,890139,890265
 
,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-8

svn commit: r1723244 - in /tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup: CaseInsensitiveKeyMap.java FastNonSecureRandom.java TestTomcat.java Tomcat.java TomcatBase

[kkolinko]

Author: kkolinko
Date: Wed Jan  6 07:39:18 2016
New Revision: 1723244

URL: http://svn.apache.org/viewvc?rev=1723244&view=rev
Log:
Copy classes from Tomcat 7 as a starting point.
The classes are as is, no modifications have been applied yet.

Added:

tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/CaseInsensitiveKeyMap.java
  - copied unchanged from r1723243, 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/CaseInsensitiveKeyMap.java

tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/FastNonSecureRandom.java
  - copied unchanged from r1723243, 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/FastNonSecureRandom.java

tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/TestTomcat.java
  - copied unchanged from r1723243, 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java

tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/Tomcat.java
  - copied unchanged from r1723243, 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Tomcat.java

tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/TomcatBaseTest.java
  - copied unchanged from r1723243, 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java


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

svn commit: r1723245 - in /tomcat/tc7.0.x/trunk: ./ res/findbugs/filter-false-positives.xml

[violetagg]

Author: violetagg
Date: Wed Jan  6 07:39:20 2016
New Revision: 1723245

URL: http://svn.apache.org/viewvc?rev=1723245&view=rev
Log:
Merged revision 1723155 from tomcat/trunk:
Update findbugs false positive - reliance on default encoding

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/res/findbugs/filter-false-positives.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  6 07:39:20 2016
@@ -1,2 +1,2 @@
 
/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702
 
744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
 
,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,

svn commit: r1723246 - in /tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup: CaseInsensitiveKeyMap.java TestTomcat.java Tomcat.java TomcatBaseTest.java

[kkolinko]

Author: kkolinko
Date: Wed Jan  6 07:43:24 2016
New Revision: 1723246

URL: http://svn.apache.org/viewvc?rev=1723246&view=rev
Log:
A working implementation with two tests in TestTomcat class.

See BRANCH-README.txt for the current status and comments.

Modified:

tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/CaseInsensitiveKeyMap.java

tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/TestTomcat.java

tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/Tomcat.java

tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/TomcatBaseTest.java

Modified: 
tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/CaseInsensitiveKeyMap.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/CaseInsensitiveKeyMap.java?rev=1723246&r1=1723245&r2=1723246&view=diff
==
--- 
tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/CaseInsensitiveKeyMap.java
 (original)
+++ 
tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/CaseInsensitiveKeyMap.java
 Wed Jan  6 07:43:24 2016
@@ -115,18 +115,15 @@ public class CaseInsensitiveKeyMap ex
 this.iterator = iterator;
 }
 
-@Override
 public boolean hasNext() {
 return iterator.hasNext();
 }
 
-@Override
 public Entry next() {
 Entry entry = iterator.next();
 return new EntryImpl(entry.getKey().getKey(), entry.getValue());
 }
 
-@Override
 public void remove() {
 iterator.remove();
 }
@@ -143,17 +140,14 @@ public class CaseInsensitiveKeyMap ex
 this.value = value;
 }
 
-@Override
 public String getKey() {
 return key;
 }
 
-@Override
 public V getValue() {
 return value;
 }
 
-@Override
 public V setValue(V value) {
 throw new UnsupportedOperationException();
 }

Modified: 
tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/TestTomcat.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/TestTomcat.java?rev=1723246&r1=1723245&r2=1723246&view=diff
==
--- 
tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/TestTomcat.java
 (original)
+++ 
tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/TestTomcat.java
 Wed Jan  6 07:43:24 2016
@@ -48,6 +48,10 @@ import static org.junit.Assert.fail;
 import org.junit.Test;
 
 import org.apache.catalina.Host;
+import org.apache.catalina.Lifecycle;
+import org.apache.catalina.LifecycleEvent;
+import org.apache.catalina.LifecycleListener;
+import org.apache.catalina.Wrapper;
 import org.apache.catalina.core.StandardContext;
 import org.apache.catalina.core.StandardHost;
 import org.apache.catalina.deploy.ContextEnvironment;
@@ -89,150 +93,151 @@ public class TestTomcat extends TomcatBa
 }
 }
 
-/**
- * Simple servlet to test JNDI
- */
-public static class HelloWorldJndi extends HttpServlet {
-
-private static final long serialVersionUID = 1L;
-
-private static final String JNDI_ENV_NAME = "test";
-
-@Override
-public void doGet(HttpServletRequest req, HttpServletResponse res)
-throws IOException {
-
-String name = null;
-
-try {
-Context initCtx = new InitialContext();
-Context envCtx = (Context) initCtx.lookup("java:comp/env");
-name = (String) envCtx.lookup(JNDI_ENV_NAME);
-} catch (NamingException e) {
-throw new IOException(e);
-}
-
-res.getWriter().write("Hello, " + name);
-}
-}
-
-/**
- * Servlet that tries to obtain a URL for WEB-INF/web.xml
- */
-public static class GetResource extends HttpServlet {
-
-private static final long serialVersionUID = 1L;
-
-@Override
-public void doGet(HttpServletRequest req, HttpServletResponse res)
-throws IOException {
-URL url = req.getServletContext().getResource("/WEB-INF/web.xml");
-
-res.getWriter().write("The URL obtained for /WEB-INF/web.xml was 
");
-if (url == null) {
-res.getWriter().write("null");
-} else {
-res.getWriter().write(url.toString() + "\n");
-res.getWriter().write("The first 20 characters of that 
resource are:\n");
-
-// Read some content from the resource
- 

svn commit: r1723247 - /tomcat/tc6.0.x/branches/tomcat6-testing_20160106/BRANCH-README.txt

[kkolinko]

Author: kkolinko
Date: Wed Jan  6 07:43:59 2016
New Revision: 1723247

URL: http://svn.apache.org/viewvc?rev=1723247&view=rev
Log:
Add BRANCH-README.txt file.

Added:
tomcat/tc6.0.x/branches/tomcat6-testing_20160106/BRANCH-README.txt   (with 
props)

Added: tomcat/tc6.0.x/branches/tomcat6-testing_20160106/BRANCH-README.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/branches/tomcat6-testing_20160106/BRANCH-README.txt?rev=1723247&view=auto
==
--- tomcat/tc6.0.x/branches/tomcat6-testing_20160106/BRANCH-README.txt (added)
+++ tomcat/tc6.0.x/branches/tomcat6-testing_20160106/BRANCH-README.txt Wed Jan  
6 07:43:59 2016
@@ -0,0 +1,104 @@
+This branch demonstrates backport of client-server JUnit tests to Tomcat 6
+(TomcatBaseTest, TestTomcat).
+
+Currently this serves as a proof a concept.
+I expect to cherry-pick some or all of the features back to tc6.0.x/trunk.
+
+Created: 2016-01-06 from r1723242.
+Last catch-up merge: None yet.
+
+
+Current status / Completed:
+
+ 1. TomcatBaseTest, TestTomcat, Tomcat and some helper classes have been
+ backported to Tomcat 6.
+
+ Some methods are omitted / commented out.
+
+ Tomcat class was moved from public java/ directory into test/ one. I
+ consider this class as non-public API at this moment.
+
+
+ 2. TestTomcat class has several tests that run successfully and prove the 
concept.
+
+ Caveat: The testSingleWebapp() test assumes that examples web application
+ has been built and copied into output\build\webapps\examples\
+
+ Make sure to run Ant build before running the test from within an IDE.
+
+
+Known issues / FIXME:
+
+ 1. I am using org.apache.catalina.startup.Embedded class as the tool that
+runs the server instance. This class is the server (extends
+StandardService).
+
+I am using org.apache.catalina.startup.Tomcat class as a helper class
+used to configure the server.
+
+This is a quick proof of concept. I expect to reorganise this so that
+Tomcat class gets the central role and maintains (wraps) a server
+instance.   
[Started]
+
+
+ 2. Tomcat 6 has no support for starting the server with port number 0
+(auto-selecting a free port number).
+
+Current workaround in TomcatBaseTest.setUp() is to use a counter and a
+hardcoded port number of 8080 + counter. See "portIncrement" field in
+TomcatBaseTest class.
+
+I expect to backport support for port number 0 from Tomcat 7.   
[Not Started]
+
+
+ 3. Tomcat 6 has class org.apache.catalina.ServerFactory that contains a
+singleton reference to a Server instance. This field has to be cleared
+after a test run.
+
+Current workaround in TomcatBaseTest.tearDown() is to use reflection to
+clean up the ServerFactory.server field.
+
+The TomcatBaseTest.setUp() method uses reflection to assert that the
+ServerFactory.server field has been cleared before the test run.
+
+I expect to add necessary access methods to ServerFactory class.
+Discussed in http://tomcat.markmail.org/thread/ko7ip7obvyaftwe4 
[Not Started]
+
+
+ 4. The Engine has no assigned name. Logs print [null] as the name.
+
+The defaultHost attribute on Engine has not been set. A warning is
+printed in the logs:
+
+org.apache.catalina.connector.MapperListener registerEngine
+WARNING: Unknown default host: null
+
+I expect to fix this along with API review (item 1. above)  
[Not Started]
+
+
+
+Further work / TODO:
+
+ 5. Add support for running the tests with Ant.
+
+  *  Add  to the main build.xml file.   
[Not Started]
+
+ tomcat6-testing branch has some incomplete attempt at implementing this.
+ See 
https://svn.apache.org/viewvc/tomcat/tc6.0.x/branches/tomcat6-testing/BRANCH-diff.diff?view=markup
+
+
+  *  Drop useless test/build.xml file.  
[Not Started]
+
+  *  Update BUILDING.txt.   
[Not Started]
+
+ 6. Backport support for running with a null docBase (without docBase). 
[Not Started]
+
+For reference: r1681953 in Tomcat 7.
+
+ 7. Backport other tests from Tomcat 7. 
[In progress]
+
+
+
+(Regarding BRANCH-README files - see Apache Subversion Community Guide
+ http://subversion.apache.org/docs/community-guide/general.html#branch-policy
+)

Propchange: tomcat/tc6.0.x/branches/tomcat6-testing_20160106/BRANCH-README.txt
--
svn:eol-style = native

Propchange: tomcat/tc6.0.x/branches/tomcat6-testing_20160106/BRANCH-README.txt
--
svn:mime-type = text/plain



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