[GUMP@vmgump-vm3]: Project tomcat-tc8.0.x-test-nio2 (in module tomcat-8.0.x) failed

2017-03-03 Thread 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-nio2 has an issue affecting its community 
integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc8.0.x-test-nio2 :  Tomcat 8.x, a web server implementing the 
Java Servlet 3.1,
...


Full details are available at:

http://vmgump-vm3.apache.org/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.0.x/output/logs-NIO2
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs]



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2.html
Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2 (Type: Build)
Work ended in a state of : Failed
Elapsed: 20 mins
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 
-Dbase.path=/srv/gump/public/workspace/tomcat-8.0.x/tomcat-build-libs 
-Dexecute.test.nio2=true -Dtest.temp=output/test-tmp-NIO2 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dtest.accesslog=true 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.6-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20170303.jar
 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20170303/bin/openssl
 -Dexecute.test.nio=false 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dexecute.test.apr=false -Dexecute.test.bio=false 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20170303-native-src.tar.gz
 -Dtest.repor
 ts=output/logs-NIO2 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20170303-native-src.tar.gz
 -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.relaxTiming=true -Dtest.excludePerformance=true 
-Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-8.0.x/true 
-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-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/tomca

svn commit: r1785245 - in /tomcat/trunk/java: javax/servlet/http/PushBuilder.java org/apache/catalina/core/ApplicationPushBuilder.java org/apache/catalina/core/LocalStrings.properties

2017-03-03 Thread markt 
Author: markt
Date: Fri Mar  3 08:55:24 2017
New Revision: 1785245

URL: http://svn.apache.org/viewvc?rev=1785245&view=rev
Log:
Servlet 4.0
Additional validation for HTTP method used for server push

Modified:
tomcat/trunk/java/javax/servlet/http/PushBuilder.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java
tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties

Modified: tomcat/trunk/java/javax/servlet/http/PushBuilder.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/PushBuilder.java?rev=1785245&r1=1785244&r2=1785245&view=diff
==
--- tomcat/trunk/java/javax/servlet/http/PushBuilder.java (original)
+++ tomcat/trunk/java/javax/servlet/http/PushBuilder.java Fri Mar  3 08:55:24 
2017
@@ -49,6 +49,13 @@ public interface PushBuilder {
  * @param method The method to use for the push request
  *
  * @return This builder instance
+ *
+ * @throws IllegalArgumentException if an HTTP method is specified that is
+ * known not to be https://tools.ietf.org/html/rfc7540#section-8.2";>cacheable
+ * and safe. POST, PUT, DELETE, CONNECT, OPTIONS and TRACE will
+ * trigger the exception.
+ *
  */
 PushBuilder method(String method);
 

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java?rev=1785245&r1=1785244&r2=1785245&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java Fri 
Mar  3 08:55:24 2017
@@ -21,6 +21,7 @@ import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Enumeration;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -42,11 +43,22 @@ import org.apache.tomcat.util.buf.B2CCon
 import org.apache.tomcat.util.buf.HexUtils;
 import org.apache.tomcat.util.collections.CaseInsensitiveKeyMap;
 import org.apache.tomcat.util.http.CookieProcessor;
+import org.apache.tomcat.util.http.parser.HttpParser;
 import org.apache.tomcat.util.res.StringManager;
 
 public class ApplicationPushBuilder implements PushBuilder {
 
 private static final StringManager sm = 
StringManager.getManager(ApplicationPushBuilder.class);
+private static final Set DISALLOWED_METHODS = new HashSet<>();
+
+static {
+DISALLOWED_METHODS.add("POST");
+DISALLOWED_METHODS.add("PUT");
+DISALLOWED_METHODS.add("DELETE");
+DISALLOWED_METHODS.add("CONNECT");
+DISALLOWED_METHODS.add("OPTIONS");
+DISALLOWED_METHODS.add("TRACE");
+}
 
 private final HttpServletRequest baseRequest;
 private final Request catalinaRequest;
@@ -192,6 +204,18 @@ public class ApplicationPushBuilder impl
 
 @Override
 public PushBuilder method(String method) {
+String upperMethod = method.trim().toUpperCase();
+if (DISALLOWED_METHODS.contains(upperMethod)) {
+throw new IllegalArgumentException(
+sm.getString("applicationPushBuilder.methodInvalid", 
upperMethod));
+}
+// Check a token was supplied
+for (char c : upperMethod.toCharArray()) {
+if (!HttpParser.isToken(c)) {
+throw new IllegalArgumentException(
+sm.getString("applicationPushBuilder.methodNotToken", 
upperMethod));
+}
+}
 this.method = method;
 return this;
 }

Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1785245&r1=1785244&r2=1785245&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties Fri Mar  
3 08:55:24 2017
@@ -55,6 +55,8 @@ applicationFilterConfig.release=Failed t
 applicationFilterRegistration.nullInitParam=Unable to set initialisation 
parameter for filter due to null name and/or value. Name [{0}], Value [{1}]
 applicationFilterRegistration.nullInitParams=Unable to set initialisation 
parameters for filter due to null name and/or value. Name [{0}], Value [{1}]
 
+applicationPushBuilder.methodInvalid=The HTTP method for a push request must 
be both cacheable and safe but [{0}] is not
+applicationPushBuilder.methodNotToken=HTTP methods must be tokens but [{0}] 
contains a non-token character
 applicationPushBuilder.noCoyoteRequest=Unable to find the underlying Coyote 
request object (which is required to crea

svn commit: r1785248 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/core/ApplicationPushBuilder.java java/org/apache/catalina/core/LocalStrings.properties java/org/apache/catalina/servlet4pre

2017-03-03 Thread markt 
Author: markt
Date: Fri Mar  3 08:56:59 2017
New Revision: 1785248

URL: http://svn.apache.org/viewvc?rev=1785248&view=rev
Log:
Servlet 4.0
Additional validation for HTTP method used for server push

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

tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/LocalStrings.properties

tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/http/PushBuilder.java

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar  3 08:56:59 2017
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
 
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
 
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,1762168,176217
 
2,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763

svn commit: r1785252 - /tomcat/trunk/java/javax/servlet/http/PushBuilder.java

2017-03-03 Thread markt 
Author: markt
Date: Fri Mar  3 09:21:18 2017
New Revision: 1785252

URL: http://svn.apache.org/viewvc?rev=1785252&view=rev
Log:
ws

Modified:
tomcat/trunk/java/javax/servlet/http/PushBuilder.java

Modified: tomcat/trunk/java/javax/servlet/http/PushBuilder.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/PushBuilder.java?rev=1785252&r1=1785251&r2=1785252&view=diff
==
--- tomcat/trunk/java/javax/servlet/http/PushBuilder.java (original)
+++ tomcat/trunk/java/javax/servlet/http/PushBuilder.java Fri Mar  3 09:21:18 
2017
@@ -55,7 +55,6 @@ public interface PushBuilder {
  * href="https://tools.ietf.org/html/rfc7540#section-8.2";>cacheable
  * and safe. POST, PUT, DELETE, CONNECT, OPTIONS and TRACE will
  * trigger the exception.
- *
  */
 PushBuilder method(String method);
 



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

[Bug 60808] ServletRequest.getParameterMap() not fully immutable

2017-03-03 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=60808

--- Comment #2 from Mark Thomas  ---
Generally, I think it would be safer (in terms of future additions to Map and
changes to the implementation of LinkedHashMap) and probably require less code
if ParameterMap used composition rather than extension.

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

JDK 9 EA Build 159 and JDK 8u152 is available on java.net

2017-03-03 Thread Rory O'Donnell 


Hi Mark,

*JDK 9 Early Access* b159   is 
available on java.net, summary of  changes are listed here 
.


Can you confirm fix in b159 for  JDK-8175261 : Per-protocol cache 
setting not working for JAR URLConnection


There have been a number of fixes to bugs reported by Open Source 
projects since the last availability email  :


 * b158 - JDK-8173028 : Incorrect processing of supplementary-plane
   characters in text fields
 * b158 - JDK-8172967 : [macosx] Exception while working with layout
   for text containing unmappable character
 * b158 - JDK-8173804 : javadoc throws UnsupportedOperationException:
   should not happen
 * b157 - JDK-8174073 : NPE caused by @link reference to class
 * b156 - JDK-8172726 : ForkJoin common pool retains a reference to the
   thread context class loader

The following changeset is included in jdk-9+158:
http://hg.openjdk.java.net/jdk9/dev/jdk/rev/8b0d55e02f54

If you have a user-defined Policy implementation that grants 
FilePermission on ${user.dir}/-, reading a file in the current directory 
using its base name will fail.  Still the same solution: Ensure that the 
path used in permission granting has the same style as the one how you 
access the file.


Setting -Djdk.security.filePermCompat=true will take you back to the 
jdk-9+140 behavior.
Setting -Djdk.io.permissionsUseCanonicalPath=true will take you back to 
the jdk8 behavior.

Feedback is welcome on jdk9-...@openjdk.java.net

*JDK 8u152 **Early Access b01  *is 
available on java.net


Other areas of interest

 * JDK 9 Developer Guide [1]
 * JDK 9 Migration Guide [2]
 * JDK Cryptographic Roadmap [3]

Finaly, Dalibor and I gave a presentation at FOSDEM the video is 
available here [*4*]


Rgds,Rory

[1] http://docs.oracle.com/javase/9/javase-docs.htm
[2] 
https://docs.oracle.com/javase/9/migrate/toc.htm#JSMIG-GUID-7744EF96-5899-4FB2-B34E-86D49B2E89B6

[3] https://www.java.com/en/jre-jdk-cryptoroadmap.html
[4] https://fosdem.org/2017/schedule/event/outreach/

--
Rgds,Rory O'Donnell
Quality Engineering Manager
Oracle EMEA , Dublin, Ireland

svn commit: r1785271 - in /tomcat/trunk: java/org/apache/tomcat/util/scan/AbstractInputStreamJar.java test/org/apache/tomcat/util/scan/TestAbstractInputStreamJar.java webapps/docs/changelog.xml

2017-03-03 Thread markt 
Author: markt
Date: Fri Mar  3 11:54:46 2017
New Revision: 1785271

URL: http://svn.apache.org/viewvc?rev=1785271&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60798
Correct a bug in the handling of JARs in unpacked WARs that meant multiple 
attempts to read the same entry from a JAR in succession would fail for the 
second and subsequent attempts.

Added:

tomcat/trunk/test/org/apache/tomcat/util/scan/TestAbstractInputStreamJar.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/scan/AbstractInputStreamJar.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/scan/AbstractInputStreamJar.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/scan/AbstractInputStreamJar.java?rev=1785271&r1=1785270&r2=1785271&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/scan/AbstractInputStreamJar.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/scan/AbstractInputStreamJar.java 
Fri Mar  3 11:54:46 2017
@@ -93,6 +93,10 @@ public abstract class AbstractInputStrea
 if (entry == null) {
 return null;
 } else {
+// Clear the entry so that multiple calls to this method for the
+// same entry will result in a new InputStream for each call
+// (BZ 60798)
+entry = null;
 return jarInputStream;
 }
 }

Added: 
tomcat/trunk/test/org/apache/tomcat/util/scan/TestAbstractInputStreamJar.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/scan/TestAbstractInputStreamJar.java?rev=1785271&view=auto
==
--- 
tomcat/trunk/test/org/apache/tomcat/util/scan/TestAbstractInputStreamJar.java 
(added)
+++ 
tomcat/trunk/test/org/apache/tomcat/util/scan/TestAbstractInputStreamJar.java 
Fri Mar  3 11:54:46 2017
@@ -0,0 +1,59 @@
+/*
+ * 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.scan;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.InputStream;
+import java.net.URL;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import org.apache.catalina.util.IOTools;
+import org.apache.catalina.webresources.TomcatURLStreamHandlerFactory;
+import org.apache.tomcat.Jar;
+
+public class TestAbstractInputStreamJar {
+
+@Before
+public void register() {
+TomcatURLStreamHandlerFactory.register();
+}
+
+
+@Test
+public void testNestedJarGetInputStream() throws Exception {
+File f = new File("test/webresources/war-url-connection.war");
+StringBuilder sb = new StringBuilder("war:");
+sb.append(f.toURI().toURL());
+sb.append("*/WEB-INF/lib/test.jar");
+
+Jar jar = JarFactory.newInstance(new URL(sb.toString()));
+
+InputStream is1 = jar.getInputStream("META-INF/resources/index.html");
+ByteArrayOutputStream baos1 = new ByteArrayOutputStream();
+IOTools.flow(is1, baos1);
+
+InputStream is2 = jar.getInputStream("META-INF/resources/index.html");
+ByteArrayOutputStream baos2 = new ByteArrayOutputStream();
+IOTools.flow(is2, baos2);
+
+Assert.assertArrayEquals(baos1.toByteArray(), baos2.toByteArray());
+}
+}

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1785271&r1=1785270&r2=1785271&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Mar  3 11:54:46 2017
@@ -136,6 +136,11 @@
 application. Note that the Servlet 4.0 API is still a work in progress
 and further changes are likely. (markt)
   
+  
+60798: Correct a bug in the handling of JARs in unpacked 
WARs
+that meant multiple attempts to read the same entry from a JAR in
+succession would fail for the second and subsequent attempts. (markt)
+  
 
   
   



--

svn commit: r1785272 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/scan/AbstractInputStreamJar.java test/org/apache/tomcat/util/scan/TestAbstractInputStreamJar.java webapps/docs/changelog

2017-03-03 Thread markt 
Author: markt
Date: Fri Mar  3 11:55:27 2017
New Revision: 1785272

URL: http://svn.apache.org/viewvc?rev=1785272&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60798
Correct a bug in the handling of JARs in unpacked WARs that meant multiple 
attempts to read the same entry from a JAR in succession would fail for the 
second and subsequent attempts.

Added:

tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/scan/TestAbstractInputStreamJar.java
  - copied unchanged from r1785271, 
tomcat/trunk/test/org/apache/tomcat/util/scan/TestAbstractInputStreamJar.java
Modified:
tomcat/tc8.5.x/trunk/   (props changed)

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/scan/AbstractInputStreamJar.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar  3 11:55:27 2017
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
 
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
 
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,1762168,176217
 
2,1762182,1762201-1

svn commit: r1785273 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/util/scan/AbstractInputStreamJar.java test/org/apache/tomcat/util/scan/TestAbstractInputStreamJar.java webapps/docs/changelog

2017-03-03 Thread markt 
Author: markt
Date: Fri Mar  3 11:56:14 2017
New Revision: 1785273

URL: http://svn.apache.org/viewvc?rev=1785273&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60798
Correct a bug in the handling of JARs in unpacked WARs that meant multiple 
attempts to read the same entry from a JAR in succession would fail for the 
second and subsequent attempts.

Added:

tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/scan/TestAbstractInputStreamJar.java
  - copied unchanged from r1785271, 
tomcat/trunk/test/org/apache/tomcat/util/scan/TestAbstractInputStreamJar.java
Modified:
tomcat/tc8.0.x/trunk/   (props changed)

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/scan/AbstractInputStreamJar.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar  3 11:56:14 2017
@@ -1,2 +1,2 @@
 
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1782037,1782240,1782386-1782387
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,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,1657
 
592,1657607,1657609,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-1
 
666387,1666494,1666496,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,1681699,1681701,1681729,1681770,

svn commit: r1785277 - in /tomcat/trunk/test/org/apache/tomcat/util/http: TestCookiesDefaultSysProps.java TestCookiesNoFwdStrictSysProps.java TestCookiesNoStrictNamingSysProps.java TestCookiesStrictSy

2017-03-03 Thread markt 
Author: markt
Date: Fri Mar  3 12:04:21 2017
New Revision: 1785277

URL: http://svn.apache.org/viewvc?rev=1785277&view=rev
Log:
Update reference to correct location of static fields.
Remove unnecessary @SuppressWarnings

Modified:

tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesDefaultSysProps.java

tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesNoFwdStrictSysProps.java

tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesNoStrictNamingSysProps.java
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesStrictSysProps.java

Modified: 
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesDefaultSysProps.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesDefaultSysProps.java?rev=1785277&r1=1785276&r2=1785277&view=diff
==
--- 
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesDefaultSysProps.java 
(original)
+++ 
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesDefaultSysProps.java 
Fri Mar  3 12:04:21 2017
@@ -29,11 +29,11 @@ import org.apache.tomcat.util.buf.ByteCh
 
 /**
  * Test case for {@link LegacyCookieProcessor}. Note because of the use
- * of final static constants in {@link CookieSupport}, each of
- * these tests must be executed in a new JVM instance. The tests have been 
place
- * in separate classes to facilitate this when running the unit tests via Ant.
+ * of final static constants in {@link javax.servlet.http.Cookie},
+ * each of these tests must be executed in a new JVM instance. The tests have
+ * been placed in separate classes to facilitate this when running the unit
+ * tests via Ant.
  */
-@SuppressWarnings("javadoc")
 public class TestCookiesDefaultSysProps extends CookiesBaseTest {
 
 @Override

Modified: 
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesNoFwdStrictSysProps.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesNoFwdStrictSysProps.java?rev=1785277&r1=1785276&r2=1785277&view=diff
==
--- 
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesNoFwdStrictSysProps.java
 (original)
+++ 
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesNoFwdStrictSysProps.java
 Fri Mar  3 12:04:21 2017
@@ -25,11 +25,11 @@ import org.apache.tomcat.util.buf.ByteCh
 
 /**
  * Test case for {@link LegacyCookieProcessor}. Note because of the use
- * of final static constants in {@link CookieSupport}, each of
- * these tests must be executed in a new JVM instance. The tests have been 
place
- * in separate classes to facilitate this when running the unit tests via Ant.
+ * of final static constants in {@link javax.servlet.http.Cookie},
+ * each of these tests must be executed in a new JVM instance. The tests have
+ * been placed in separate classes to facilitate this when running the unit
+ * tests via Ant.
  */
-@SuppressWarnings("javadoc")
 public class TestCookiesNoFwdStrictSysProps extends CookiesBaseTest {
 
 @Override

Modified: 
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesNoStrictNamingSysProps.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesNoStrictNamingSysProps.java?rev=1785277&r1=1785276&r2=1785277&view=diff
==
--- 
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesNoStrictNamingSysProps.java
 (original)
+++ 
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesNoStrictNamingSysProps.java
 Fri Mar  3 12:04:21 2017
@@ -25,11 +25,11 @@ import org.apache.tomcat.util.buf.ByteCh
 
 /**
  * Test case for {@link LegacyCookieProcessor}. Note because of the use
- * of final static constants in {@link CookieSupport}, each of
- * these tests must be executed in a new JVM instance. The tests have been 
place
- * in separate classes to facilitate this when running the unit tests via Ant.
+ * of final static constants in {@link javax.servlet.http.Cookie},
+ * each of these tests must be executed in a new JVM instance. The tests have
+ * been placed in separate classes to facilitate this when running the unit
+ * tests via Ant.
  */
-@SuppressWarnings("javadoc")
 public class TestCookiesNoStrictNamingSysProps extends CookiesBaseTest {
 
 @Override

Modified: 
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesStrictSysProps.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesStrictSysProps.java?rev=1785277&r1=1785276&r2=1785277&view=diff
==
--- 
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesStrictSysProps.java 
(original)
+++ 
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesStrictSysProps.java 
Fri Mar  3 12:04:21 2017
@@ -29,11 +29,11 @@ import org.apache.tomcat.util.buf.ByteCh
 
 /*

svn commit: r1785278 - in /tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/http: TestCookiesDefaultSysProps.java TestCookiesNoFwdStrictSysProps.java TestCookiesNoStrictNamingSysProps.java TestCookies

2017-03-03 Thread markt 
Author: markt
Date: Fri Mar  3 12:07:02 2017
New Revision: 1785278

URL: http://svn.apache.org/viewvc?rev=1785278&view=rev
Log:
Remove unnecessary (according to Eclipse) @SuppressWarnings("javadoc")

Modified:

tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/http/TestCookiesDefaultSysProps.java

tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/http/TestCookiesNoFwdStrictSysProps.java

tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/http/TestCookiesNoStrictNamingSysProps.java

tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/http/TestCookiesStrictSysProps.java

Modified: 
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/http/TestCookiesDefaultSysProps.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/http/TestCookiesDefaultSysProps.java?rev=1785278&r1=1785277&r2=1785278&view=diff
==
--- 
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/http/TestCookiesDefaultSysProps.java
 (original)
+++ 
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/http/TestCookiesDefaultSysProps.java
 Fri Mar  3 12:07:02 2017
@@ -33,7 +33,6 @@ import org.apache.tomcat.util.buf.ByteCh
  * these tests must be executed in a new JVM instance. The tests have been 
place
  * in separate classes to facilitate this when running the unit tests via Ant.
  */
-@SuppressWarnings("javadoc")
 public class TestCookiesDefaultSysProps extends CookiesBaseTest {
 
 @Override

Modified: 
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/http/TestCookiesNoFwdStrictSysProps.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/http/TestCookiesNoFwdStrictSysProps.java?rev=1785278&r1=1785277&r2=1785278&view=diff
==
--- 
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/http/TestCookiesNoFwdStrictSysProps.java
 (original)
+++ 
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/http/TestCookiesNoFwdStrictSysProps.java
 Fri Mar  3 12:07:02 2017
@@ -29,7 +29,6 @@ import org.apache.tomcat.util.buf.ByteCh
  * these tests must be executed in a new JVM instance. The tests have been 
place
  * in separate classes to facilitate this when running the unit tests via Ant.
  */
-@SuppressWarnings("javadoc")
 public class TestCookiesNoFwdStrictSysProps extends CookiesBaseTest {
 
 @Override

Modified: 
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/http/TestCookiesNoStrictNamingSysProps.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/http/TestCookiesNoStrictNamingSysProps.java?rev=1785278&r1=1785277&r2=1785278&view=diff
==
--- 
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/http/TestCookiesNoStrictNamingSysProps.java
 (original)
+++ 
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/http/TestCookiesNoStrictNamingSysProps.java
 Fri Mar  3 12:07:02 2017
@@ -29,7 +29,6 @@ import org.apache.tomcat.util.buf.ByteCh
  * these tests must be executed in a new JVM instance. The tests have been 
place
  * in separate classes to facilitate this when running the unit tests via Ant.
  */
-@SuppressWarnings("javadoc")
 public class TestCookiesNoStrictNamingSysProps extends CookiesBaseTest {
 
 @Override

Modified: 
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/http/TestCookiesStrictSysProps.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/http/TestCookiesStrictSysProps.java?rev=1785278&r1=1785277&r2=1785278&view=diff
==
--- 
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/http/TestCookiesStrictSysProps.java
 (original)
+++ 
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/http/TestCookiesStrictSysProps.java
 Fri Mar  3 12:07:02 2017
@@ -33,7 +33,6 @@ import org.apache.tomcat.util.buf.ByteCh
  * these tests must be executed in a new JVM instance. The tests have been 
place
  * in separate classes to facilitate this when running the unit tests via Ant.
  */
-@SuppressWarnings("javadoc")
 public class TestCookiesStrictSysProps extends CookiesBaseTest {
 
 @Override



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

[Bug 60798] Nested Jar entry could not be read twice consecutively

2017-03-03 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=60798

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|NEW |RESOLVED

--- Comment #2 from Mark Thomas  ---
Thanks for the report. I created a simple test that confirmed the issue and I
have fixed the root cause.

Fixed in:
- trunk for 9.0.0.M18 onwards
- 8.5.x for 8.5.12 onwards
- 8.0.x for 8.0.42 onwards

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 60751] Add 100.64/10 to the default internalProxies

2017-03-03 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=60751

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |WONTFIX

--- Comment #1 from Mark Thomas  ---
The documented use for 100.64/10 is for GCN which means addresses in that range
are not all within the control of a single entity and it is not, therefore,
safe to trust them all by default.

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

[Bug 60560] Support systemd/inetd style socket activation

2017-03-03 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=60560

--- Comment #4 from Mark Thomas  ---
Documentation is in trunk/webapps/docs

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: JDK 9 EA Build 159 and JDK 8u152 is available on java.net

2017-03-03 Thread Rory O'Donnell 

Hi Mark,

There is a second bug that we would like to get fix confirmation on:

JDK-8172726 : ForkJoin common pool retains a reference to the thread 
context class loader


Thanks,Rory

On 03/03/2017 11:23, Rory O'Donnell wrote:


Hi Mark,

*JDK 9 Early Access* b159   is 
available on java.net, summary of  changes are listed here 
.


Can you confirm fix in b159 for  JDK-8175261 : Per-protocol cache 
setting not working for JAR URLConnection


There have been a number of fixes to bugs reported by Open Source 
projects since the last availability email  :


  * b158 - JDK-8173028 : Incorrect processing of supplementary-plane
characters in text fields
  * b158 - JDK-8172967 : [macosx] Exception while working with layout
for text containing unmappable character
  * b158 - JDK-8173804 : javadoc throws UnsupportedOperationException:
should not happen
  * b157 - JDK-8174073 : NPE caused by @link reference to class
  * b156 - JDK-8172726 : ForkJoin common pool retains a reference to
the thread context class loader

The following changeset is included in jdk-9+158:
http://hg.openjdk.java.net/jdk9/dev/jdk/rev/8b0d55e02f54

If you have a user-defined Policy implementation that grants 
FilePermission on ${user.dir}/-, reading a file in the current 
directory using its base name will fail.  Still the same solution: 
Ensure that the path used in permission granting has the same style as 
the one how you access the file.


Setting -Djdk.security.filePermCompat=true will take you back to the 
jdk-9+140 behavior.
Setting -Djdk.io.permissionsUseCanonicalPath=true will take you back 
to the jdk8 behavior.

Feedback is welcome on jdk9-...@openjdk.java.net

*JDK 8u152 **Early Access b01  
*is available on java.net


Other areas of interest

  * JDK 9 Developer Guide [1]
  * JDK 9 Migration Guide [2]
  * JDK Cryptographic Roadmap [3]

Finaly, Dalibor and I gave a presentation at FOSDEM the video is 
available here [*4*]


Rgds,Rory

[1] http://docs.oracle.com/javase/9/javase-docs.htm
[2] 
https://docs.oracle.com/javase/9/migrate/toc.htm#JSMIG-GUID-7744EF96-5899-4FB2-B34E-86D49B2E89B6

[3] https://www.java.com/en/jre-jdk-cryptoroadmap.html
[4] https://fosdem.org/2017/schedule/event/outreach/
--
Rgds,Rory O'Donnell
Quality Engineering Manager
Oracle EMEA , Dublin, Ireland


--
Rgds,Rory O'Donnell
Quality Engineering Manager
Oracle EMEA , Dublin, Ireland

svn commit: r1785310 - in /tomcat/trunk: java/org/apache/catalina/realm/RealmBase.java webapps/docs/changelog.xml

2017-03-03 Thread markt 
Author: markt
Date: Fri Mar  3 14:24:16 2017
New Revision: 1785310

URL: http://svn.apache.org/viewvc?rev=1785310&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60469
Refactor RealmBase for better code re-use when implementing Realms that use a 
custom Principal.

Modified:
tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java?rev=1785310&r1=1785309&r2=1785310&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java Fri Mar  3 
14:24:16 2017
@@ -913,30 +913,32 @@ public abstract class RealmBase extends
 /**
  * Return true if the specified Principal has the specified
  * security role, within the context of this Realm; otherwise return
- * false.  This method can be overridden by Realm
- * implementations, but the default is adequate when an instance of
- * GenericPrincipal is used to represent authenticated
- * Principals from this Realm.
+ * false.  This method or {@link #hasRoleInternal(Principal,
+ * String)} can be overridden by Realm implementations, but the default is
+ * adequate when an instance of GenericPrincipal is used to
+ * represent authenticated Principals from this Realm.
  *
+ * @param wrapper   The servlet to which the current request is mapped
  * @param principal Principal for whom the role is to be checked
- * @param role Security role to be checked
+ * @param role  Security role to be checked
  */
 @Override
 public boolean hasRole(Wrapper wrapper, Principal principal, String role) {
 // Check for a role alias defined in a  element
 if (wrapper != null) {
 String realRole = wrapper.findSecurityReference(role);
-if (realRole != null)
+if (realRole != null) {
 role = realRole;
+}
 }
 
 // Should be overridden in JAASRealm - to avoid pretty inefficient 
conversions
-if ((principal == null) || (role == null) ||
-!(principal instanceof GenericPrincipal))
+if (principal == null || role == null) {
 return false;
+}
+
+boolean result = hasRoleInternal(principal, role);
 
-GenericPrincipal gp = (GenericPrincipal) principal;
-boolean result = gp.hasRole(role);
 if (log.isDebugEnabled()) {
 String name = principal.getName();
 if (result)
@@ -944,8 +946,30 @@ public abstract class RealmBase extends
 else
 log.debug(sm.getString("realmBase.hasRoleFailure", name, 
role));
 }
-return (result);
 
+return result;
+}
+
+
+/**
+ * Return true if the specified Principal has the specified
+ * security role, within the context of this Realm; otherwise return
+ * false.  This method or {@link #hasRoleInternal(Principal,
+ * String)} can be overridden by Realm implementations, but the default is
+ * adequate when an instance of GenericPrincipal is used to
+ * represent authenticated Principals from this Realm.
+ *
+ * @param principal Principal for whom the role is to be checked
+ * @param role  Security role to be checked
+ */
+protected boolean hasRoleInternal(Principal principal, String role) {
+// Should be overridden in JAASRealm - to avoid pretty inefficient 
conversions
+if (!(principal instanceof GenericPrincipal)) {
+return false;
+}
+
+GenericPrincipal gp = (GenericPrincipal) principal;
+return gp.hasRole(role);
 }
 
 

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1785310&r1=1785309&r2=1785310&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Mar  3 14:24:16 2017
@@ -48,6 +48,11 @@
   
 
   
+60469: Refactor RealmBase for better code 
re-use
+when implementing Realms that use a custom Principal.
+(markt)
+  
+  
 60490: Various formatting and layout improvements for the
 ErrorReportValve. Patch provided by Michael Osipov. 
(markt)
   



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

[Bug 60469] RealmBase#hasRole() imposes too much boilerplate code if principal is not of type GenericPrincipal

2017-03-03 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=60469

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|REOPENED|RESOLVED

--- Comment #6 from Mark Thomas  ---
Fixed in:
- trunk for 9.0.0.M18 onwards
- 8.5.x for 8.5.12 onwards

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1785312 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/realm/RealmBase.java webapps/docs/changelog.xml

2017-03-03 Thread markt 
Author: markt
Date: Fri Mar  3 14:25:06 2017
New Revision: 1785312

URL: http://svn.apache.org/viewvc?rev=1785312&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60469
Refactor RealmBase for better code re-use when implementing Realms that use a 
custom Principal.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/RealmBase.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar  3 14:25:06 2017
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
 
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
 
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,1762168,176217
 
2,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,17

buildbot failure in on tomcat-trunk

2017-03-03 Thread buildbot 
The Buildbot has detected a new failure on builder tomcat-trunk while building 
. Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/2144

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1785310
Blamelist: markt

BUILD FAILED: failed compile

Sincerely,
 -The Buildbot




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

Re: JDK 9 EA Build 159 and JDK 8u152 is available on java.net

2017-03-03 Thread Mark Thomas 
On 03/03/17 13:12, Rory O'Donnell wrote:
> Hi Mark,
> 
> There is a second bug that we would like to get fix confirmation on:
> 
> JDK-8172726 : ForkJoin common pool retains a reference to the thread
> context class loader

Fix confirmed with b159.

>> Hi Mark,
>>
>> *JDK 9 Early Access* b159   is
>> available on java.net, summary of  changes are listed here
>> .
>>
>> Can you confirm fix in b159 for  JDK-8175261 : Per-protocol cache
>> setting not working for JAR URLConnection

Also confirmed with b159.

Many thanks.

Mark


>>
>> There have been a number of fixes to bugs reported by Open Source
>> projects since the last availability email  :
>>
>>   * b158 - JDK-8173028 : Incorrect processing of supplementary-plane
>> characters in text fields
>>   * b158 - JDK-8172967 : [macosx] Exception while working with layout
>> for text containing unmappable character
>>   * b158 - JDK-8173804 : javadoc throws UnsupportedOperationException:
>> should not happen
>>   * b157 - JDK-8174073 : NPE caused by @link reference to class
>>   * b156 - JDK-8172726 : ForkJoin common pool retains a reference to
>> the thread context class loader
>>
>> The following changeset is included in jdk-9+158:
>> http://hg.openjdk.java.net/jdk9/dev/jdk/rev/8b0d55e02f54
>>
>> If you have a user-defined Policy implementation that grants
>> FilePermission on ${user.dir}/-, reading a file in the current
>> directory using its base name will fail.  Still the same solution:
>> Ensure that the path used in permission granting has the same style as
>> the one how you access the file.
>>
>> Setting -Djdk.security.filePermCompat=true will take you back to the
>> jdk-9+140 behavior.
>> Setting -Djdk.io.permissionsUseCanonicalPath=true will take you back
>> to the jdk8 behavior.
>> Feedback is welcome on jdk9-...@openjdk.java.net
>>
>> *JDK 8u152 **Early Access b01 
>> *is available on java.net
>>
>> Other areas of interest
>>
>>   * JDK 9 Developer Guide [1]
>>   * JDK 9 Migration Guide [2]
>>   * JDK Cryptographic Roadmap [3]
>>
>> Finaly, Dalibor and I gave a presentation at FOSDEM the video is
>> available here [*4*]
>>
>> Rgds,Rory
>>
>> [1] http://docs.oracle.com/javase/9/javase-docs.htm
>> [2]
>> https://docs.oracle.com/javase/9/migrate/toc.htm#JSMIG-GUID-7744EF96-5899-4FB2-B34E-86D49B2E89B6
>>
>> [3] https://www.java.com/en/jre-jdk-cryptoroadmap.html
>> [4] https://fosdem.org/2017/schedule/event/outreach/
>> -- 
>> Rgds,Rory O'Donnell
>> Quality Engineering Manager
>> Oracle EMEA , Dublin, Ireland
> 


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

svn commit: r1785317 - /tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java

2017-03-03 Thread markt 
Author: markt
Date: Fri Mar  3 14:59:41 2017
New Revision: 1785317

URL: http://svn.apache.org/viewvc?rev=1785317&view=rev
Log:
Use inherited Javadoc where available.
Add missing @return

Modified:
tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java

Modified: tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java?rev=1785317&r1=1785316&r2=1785317&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java Fri Mar  3 
14:59:41 2017
@@ -911,16 +911,12 @@ public abstract class RealmBase extends
 
 
 /**
- * Return true if the specified Principal has the specified
- * security role, within the context of this Realm; otherwise return
- * false.  This method or {@link #hasRoleInternal(Principal,
+ * {@inheritDoc}
+ *
+ * This method or {@link #hasRoleInternal(Principal,
  * String)} can be overridden by Realm implementations, but the default is
  * adequate when an instance of GenericPrincipal is used to
  * represent authenticated Principals from this Realm.
- *
- * @param wrapper   The servlet to which the current request is mapped
- * @param principal Principal for whom the role is to be checked
- * @param role  Security role to be checked
  */
 @Override
 public boolean hasRole(Wrapper wrapper, Principal principal, String role) {
@@ -952,15 +948,20 @@ public abstract class RealmBase extends
 
 
 /**
- * Return true if the specified Principal has the specified
- * security role, within the context of this Realm; otherwise return
- * false.  This method or {@link #hasRoleInternal(Principal,
+ * Check if the specified Principal has the specified
+ * security role, within the context of this Realm.
+ *
+ * This method or {@link #hasRoleInternal(Principal,
  * String)} can be overridden by Realm implementations, but the default is
  * adequate when an instance of GenericPrincipal is used to
  * represent authenticated Principals from this Realm.
  *
  * @param principal Principal for whom the role is to be checked
- * @param role  Security role to be checked
+ * @param role Security role to be checked
+ *
+ * @return true if the specified Principal has the specified
+ * security role, within the context of this Realm; otherwise 
return
+ * false.
  */
 protected boolean hasRoleInternal(Principal principal, String role) {
 // Should be overridden in JAASRealm - to avoid pretty inefficient 
conversions



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

svn commit: r1785318 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/realm/RealmBase.java

2017-03-03 Thread markt 
Author: markt
Date: Fri Mar  3 15:00:42 2017
New Revision: 1785318

URL: http://svn.apache.org/viewvc?rev=1785318&view=rev
Log:
Use inherited Javadoc where available.
Add missing @return

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/RealmBase.java

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar  3 15:00:42 2017
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
 
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
 
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,1762168,176217
 
2,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634-1763635,1763718,1763786,1763798-17637

buildbot success in on tomcat-trunk

2017-03-03 Thread buildbot 
The Buildbot has detected a restored build on builder tomcat-trunk while 
building . Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/2145

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1785317
Blamelist: markt

Build succeeded!

Sincerely,
 -The Buildbot




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

Re: JDK 9 EA Build 159 and JDK 8u152 is available on java.net

2017-03-03 Thread Rory O'Donnell 

Thanks Mark.


On 03/03/2017 14:54, Mark Thomas wrote:

On 03/03/17 13:12, Rory O'Donnell wrote:

Hi Mark,

There is a second bug that we would like to get fix confirmation on:

JDK-8172726 : ForkJoin common pool retains a reference to the thread
context class loader

Fix confirmed with b159.


Hi Mark,

*JDK 9 Early Access* b159   is
available on java.net, summary of  changes are listed here
.

Can you confirm fix in b159 for  JDK-8175261 : Per-protocol cache
setting not working for JAR URLConnection

Also confirmed with b159.

Many thanks.

Mark



There have been a number of fixes to bugs reported by Open Source
projects since the last availability email  :

   * b158 - JDK-8173028 : Incorrect processing of supplementary-plane
 characters in text fields
   * b158 - JDK-8172967 : [macosx] Exception while working with layout
 for text containing unmappable character
   * b158 - JDK-8173804 : javadoc throws UnsupportedOperationException:
 should not happen
   * b157 - JDK-8174073 : NPE caused by @link reference to class
   * b156 - JDK-8172726 : ForkJoin common pool retains a reference to
 the thread context class loader

The following changeset is included in jdk-9+158:
http://hg.openjdk.java.net/jdk9/dev/jdk/rev/8b0d55e02f54

If you have a user-defined Policy implementation that grants
FilePermission on ${user.dir}/-, reading a file in the current
directory using its base name will fail.  Still the same solution:
Ensure that the path used in permission granting has the same style as
the one how you access the file.

Setting -Djdk.security.filePermCompat=true will take you back to the
jdk-9+140 behavior.
Setting -Djdk.io.permissionsUseCanonicalPath=true will take you back
to the jdk8 behavior.
Feedback is welcome on jdk9-...@openjdk.java.net

*JDK 8u152 **Early Access b01 
*is available on java.net

Other areas of interest

   * JDK 9 Developer Guide [1]
   * JDK 9 Migration Guide [2]
   * JDK Cryptographic Roadmap [3]

Finaly, Dalibor and I gave a presentation at FOSDEM the video is
available here [*4*]

Rgds,Rory

[1] http://docs.oracle.com/javase/9/javase-docs.htm
[2]
https://docs.oracle.com/javase/9/migrate/toc.htm#JSMIG-GUID-7744EF96-5899-4FB2-B34E-86D49B2E89B6

[3] https://www.java.com/en/jre-jdk-cryptoroadmap.html
[4] https://fosdem.org/2017/schedule/event/outreach/
--
Rgds,Rory O'Donnell
Quality Engineering Manager
Oracle EMEA , Dublin, Ireland


--
Rgds,Rory O'Donnell
Quality Engineering Manager
Oracle EMEA , Dublin, Ireland


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

[Bug 60808] ServletRequest.getParameterMap() not fully immutable

2017-03-03 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=60808

--- Comment #3 from Woonsan Ko  ---
Hi Mark,

Yes, that makes more sense to use containment instead of extending. Even if
newer JVM has more new API support in the future, ParameterMap implementing
j.u.Map with a contained delegate map should be a lot safer in any case.
I'll create a new pull request using containment soon and update it here.

Regards,

Woonsan

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

[GitHub] tomcat pull request #46: Bug_60808: ensure immutability of ParameterMap.

2017-03-03 Thread woonsan 
Github user woonsan closed the pull request at:

https://github.com/apache/tomcat/pull/46


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

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

[GitHub] tomcat issue #46: Bug_60808: ensure immutability of ParameterMap.

2017-03-03 Thread woonsan 
Github user woonsan commented on the issue:

https://github.com/apache/tomcat/pull/46
  
I'll propose a new PR using containment, not inheritance, as @markt-asf 
suggested.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

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

[GitHub] tomcat pull request #47: Make ParameterMap immutable using containment inste...

2017-03-03 Thread woonsan 
GitHub user woonsan opened a pull request:

https://github.com/apache/tomcat/pull/47

Make ParameterMap immutable using containment instead of inheritance.



You can merge this pull request into a Git repository by running:

$ git pull https://github.com/woonsan/tomcat bugfix/Bug_60808_2

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/tomcat/pull/47.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #47


commit 716e908b0105f99f220db47100171afebf220e18
Author: Woonsan Ko 
Date:   2017-03-03T18:45:34Z

Make ParameterMap immutable using containment instead of inheritance.




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

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

[Bug 60808] ServletRequest.getParameterMap() not fully immutable

2017-03-03 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=60808

--- Comment #4 from Woonsan Ko  ---
I've created a new PR: https://github.com/apache/tomcat/pull/47,
following Mark's suggestion to use containment instead of inheritance.
Indeed, it helps reduce code size and safer in the future changes in JVM.

Please take a review.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GUMP@vmgump-vm3]: Project tomcat-tc8.0.x-test-nio2 (in module tomcat-8.0.x) failed

2017-03-03 Thread 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-nio2 has an issue affecting its community 
integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc8.0.x-test-nio2 :  Tomcat 8.x, a web server implementing the 
Java Servlet 3.1,
...


Full details are available at:

http://vmgump-vm3.apache.org/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.0.x/output/logs-NIO2
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs]



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2.html
Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2 (Type: Build)
Work ended in a state of : Failed
Elapsed: 20 mins 6 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 
-Dbase.path=/srv/gump/public/workspace/tomcat-8.0.x/tomcat-build-libs 
-Dexecute.test.nio2=true -Dtest.temp=output/test-tmp-NIO2 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dtest.accesslog=true 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.6-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20170303.jar
 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20170303/bin/openssl
 -Dexecute.test.nio=false 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dexecute.test.apr=false -Dexecute.test.bio=false 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20170303-native-src.tar.gz
 -Dtest.repor
 ts=output/logs-NIO2 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20170303-native-src.tar.gz
 -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.relaxTiming=true -Dtest.excludePerformance=true 
-Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-8.0.x/true 
-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-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/wo

[Bug 60469] RealmBase#hasRole() imposes too much boilerplate code if principal is not of type GenericPrincipal

2017-03-03 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=60469

--- Comment #7 from Michael Osipov <1983-01...@gmx.net> ---
(In reply to Mark Thomas from comment #6)
> Fixed in:
> - trunk for 9.0.0.M18 onwards
> - 8.5.x for 8.5.12 onwards

Per(In reply to Mark Thomas from comment #6)
> Fixed in:
> - trunk for 9.0.0.M18 onwards
> - 8.5.x for 8.5.12 onwards

Perfect, couldn't be better. Thank you!

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GUMP@vmgump-vm3]: Project tomcat-tc8.0.x-test-nio2 (in module tomcat-8.0.x) failed

2017-03-03 Thread 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-nio2 has an issue affecting its community 
integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc8.0.x-test-nio2 :  Tomcat 8.x, a web server implementing the 
Java Servlet 3.1,
...


Full details are available at:

http://vmgump-vm3.apache.org/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.0.x/output/logs-NIO2
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs]



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2.html
Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2 (Type: Build)
Work ended in a state of : Failed
Elapsed: 19 mins 57 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 
-Dbase.path=/srv/gump/public/workspace/tomcat-8.0.x/tomcat-build-libs 
-Dexecute.test.nio2=true -Dtest.temp=output/test-tmp-NIO2 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dtest.accesslog=true 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.6-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20170304.jar
 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20170304/bin/openssl
 -Dexecute.test.nio=false 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dexecute.test.apr=false -Dexecute.test.bio=false 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20170304-native-src.tar.gz
 -Dtest.repor
 ts=output/logs-NIO2 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20170304-native-src.tar.gz
 -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.relaxTiming=true -Dtest.excludePerformance=true 
-Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-8.0.x/true 
-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-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/outpu