svn commit: r1734860 - in /tomcat/tc8.5.x/trunk: ./ res/META-INF/ res/META-INF/jasper.jar/ res/META-INF/tomcat-websocket.jar/

[markt]

Author: markt
Date: Sun Mar 13 21:23:17 2016
New Revision: 1734860

URL: http://svn.apache.org/viewvc?rev=1734860=rev
Log:
More version fixes for 8.5

Modified:
tomcat/tc8.5.x/trunk/build.xml
tomcat/tc8.5.x/trunk/res/META-INF/jasper.jar/web-fragment.xml
tomcat/tc8.5.x/trunk/res/META-INF/servlet-api.jar.license
tomcat/tc8.5.x/trunk/res/META-INF/servlet-api.jar.manifest
tomcat/tc8.5.x/trunk/res/META-INF/servlet-api.jar.notice
tomcat/tc8.5.x/trunk/res/META-INF/tomcat-websocket.jar/web-fragment.xml

Modified: tomcat/tc8.5.x/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/build.xml?rev=1734860=1734859=1734860=diff
==
--- tomcat/tc8.5.x/trunk/build.xml (original)
+++ tomcat/tc8.5.x/trunk/build.xml Sun Mar 13 21:23:17 2016
@@ -44,7 +44,7 @@
   
 
   
-  
+  
   
   
   
@@ -710,7 +710,7 @@
   filesId="files.annotations-api"
   manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
 
-
+
 
 
-
+
 http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/res/META-INF/jasper.jar/web-fragment.xml?rev=1734860=1734859=1734860=diff
==
--- tomcat/tc8.5.x/trunk/res/META-INF/jasper.jar/web-fragment.xml (original)
+++ tomcat/tc8.5.x/trunk/res/META-INF/jasper.jar/web-fragment.xml Sun Mar 13 
21:23:17 2016
@@ -18,8 +18,8 @@
 http://xmlns.jcp.org/xml/ns/javaee;
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
   xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-  http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd;
-  version="4.0"
+  http://xmlns.jcp.org/xml/ns/javaee/web-fragment_3_1.xsd;
+  version="3.1"
   metadata-complete="true">
 org_apache_jasper
 

Modified: tomcat/tc8.5.x/trunk/res/META-INF/servlet-api.jar.license
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/res/META-INF/servlet-api.jar.license?rev=1734860=1734859=1734860=diff
==
--- tomcat/tc8.5.x/trunk/res/META-INF/servlet-api.jar.license (original)
+++ tomcat/tc8.5.x/trunk/res/META-INF/servlet-api.jar.license Sun Mar 13 
21:23:17 2016
@@ -228,10 +228,6 @@ For the following XML Schemas for Java E
  - web-app_3_1.xsd
  - web-common_3_1.xsd
  - web-fragment_3_1.xsd
- - javaee_8.xsd
- - web-app_4_0.xsd
- - web-common_4_0.xsd
- - web-fragment_4_0.xsd
 
 COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
 

Modified: tomcat/tc8.5.x/trunk/res/META-INF/servlet-api.jar.manifest
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/res/META-INF/servlet-api.jar.manifest?rev=1734860=1734859=1734860=diff
==
--- tomcat/tc8.5.x/trunk/res/META-INF/servlet-api.jar.manifest (original)
+++ tomcat/tc8.5.x/trunk/res/META-INF/servlet-api.jar.manifest Sun Mar 13 
21:23:17 2016
@@ -4,8 +4,8 @@ X-Compile-Target-JDK: @target.jdk@
 
 Name: javax/servlet/
 Specification-Title: Java API for Servlets
-Specification-Version: 4.0
+Specification-Version: 3.1
 Specification-Vendor: Sun Microsystems, Inc.
 Implementation-Title: javax.servlet
-Implementation-Version: 4.0.@servlet.revision@
+Implementation-Version: 3.1.@servlet.revision@
 Implementation-Vendor: Apache Software Foundation

Modified: tomcat/tc8.5.x/trunk/res/META-INF/servlet-api.jar.notice
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/res/META-INF/servlet-api.jar.notice?rev=1734860=1734859=1734860=diff
==
--- tomcat/tc8.5.x/trunk/res/META-INF/servlet-api.jar.notice (original)
+++ tomcat/tc8.5.x/trunk/res/META-INF/servlet-api.jar.notice Sun Mar 13 
21:23:17 2016
@@ -22,10 +22,6 @@ The original XML Schemas for Java EE Dep
  - web-app_3_1.xsd
  - web-common_3_1.xsd
  - web-fragment_3_1.xsd
- - javaee_8.xsd
- - web-app_4_0.xsd
- - web-common_4_0.xsd
- - web-fragment_4_0.xsd
 
 may be obtained from:
 http://www.oracle.com/webfolder/technetwork/jsc/xml/ns/javaee/index.html

Modified: 
tomcat/tc8.5.x/trunk/res/META-INF/tomcat-websocket.jar/web-fragment.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/res/META-INF/tomcat-websocket.jar/web-fragment.xml?rev=1734860=1734859=1734860=diff
==
--- tomcat/tc8.5.x/trunk/res/META-INF/tomcat-websocket.jar/web-fragment.xml 
(original)
+++ tomcat/tc8.5.x/trunk/res/META-INF/tomcat-websocket.jar/web-fragment.xml Sun 
Mar 13 21:23:17 2016
@@ -18,8 +18,8 @@
 http://xmlns.jcp.org/xml/ns/javaee;
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
   xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-  http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd;
-  version="4.0"
+ 

svn commit: r1734856 - /tomcat/tc8.5.x/trunk/BUILDING.txt

[markt]

Author: markt
Date: Sun Mar 13 21:18:09 2016
New Revision: 1734856

URL: http://svn.apache.org/viewvc?rev=1734856=rev
Log:
More version corrections

Modified:
tomcat/tc8.5.x/trunk/BUILDING.txt

Modified: tomcat/tc8.5.x/trunk/BUILDING.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/BUILDING.txt?rev=1734856=1734855=1734856=diff
==
--- tomcat/tc8.5.x/trunk/BUILDING.txt (original)
+++ tomcat/tc8.5.x/trunk/BUILDING.txt Sun Mar 13 21:18:09 2016
@@ -20,8 +20,8 @@
 
 
 This subproject contains the source code for Tomcat @VERSION_MAJOR_MINOR@, a 
container that
-implements the Servlet 4.0, JSP 2.4?, EL 3.1? and WebSocket 1.2? specifications
-from the Java Community Process .
+implements the Servlet 3.1, JSP 2.3, EL 3.0, WebSocket 1.1 and JASPIC 1.1
+specifications from the Java Community Process .
 
 Note: If you just need to run Apache Tomcat, it is not necessary to build
 it. You may simply download a binary distribution. It is cross-platform.



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

svn commit: r1734857 - /tomcat/trunk/BUILDING.txt

[markt]

Author: markt
Date: Sun Mar 13 21:18:40 2016
New Revision: 1734857

URL: http://svn.apache.org/viewvc?rev=1734857=rev
Log:
Add JASPIC

Modified:
tomcat/trunk/BUILDING.txt

Modified: tomcat/trunk/BUILDING.txt
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/BUILDING.txt?rev=1734857=1734856=1734857=diff
==
--- tomcat/trunk/BUILDING.txt (original)
+++ tomcat/trunk/BUILDING.txt Sun Mar 13 21:18:40 2016
@@ -20,8 +20,8 @@
 
 
 This subproject contains the source code for Tomcat @VERSION_MAJOR_MINOR@, a 
container that
-implements the Servlet 4.0, JSP 2.4?, EL 3.1? and WebSocket 1.2? specifications
-from the Java Community Process .
+implements the Servlet 4.0, JSP 2.4?, EL 3.1?, WebSocket 1.2? and JASPIC 1.1
+specifications from the Java Community Process .
 
 Note: If you just need to run Apache Tomcat, it is not necessary to build
 it. You may simply download a binary distribution. It is cross-platform.



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

svn commit: r1734854 - /tomcat/tc8.5.x/trunk/test/webapp/WEB-INF/classes/org/apache/tomcat/Bug58096.class

[fschumacher]

Author: fschumacher
Date: Sun Mar 13 20:33:58 2016
New Revision: 1734854

URL: http://svn.apache.org/viewvc?rev=1734854=rev
Log:
Compiled test class with java 7.

Modified:

tomcat/tc8.5.x/trunk/test/webapp/WEB-INF/classes/org/apache/tomcat/Bug58096.class

Modified: 
tomcat/tc8.5.x/trunk/test/webapp/WEB-INF/classes/org/apache/tomcat/Bug58096.class
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/webapp/WEB-INF/classes/org/apache/tomcat/Bug58096.class?rev=1734854=1734853=1734854=diff
==
Binary files - no diff available.



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

Re: [VOTE] Release Apache Tomcat 9.0.0.M4

[Mark Thomas]

On 12/03/2016 13:58, Mark Thomas wrote:
> The proposed 9.0.0.M4 release is:
> [ ] Broken - do not release
> [X] Alpha - go ahead and release as 9.0.0.M4

Unit tests pass on Linux, Windows and OSX with NIO, NIO2 and APR/native
1.2.5

Mark

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

svn commit: r1734852 - in /tomcat/tc8.5.x/trunk/webapps: ROOT/WEB-INF/web.xml examples/WEB-INF/web.xml host-manager/WEB-INF/web.xml manager/WEB-INF/web.xml

[markt]

Author: markt
Date: Sun Mar 13 20:18:52 2016
New Revision: 1734852

URL: http://svn.apache.org/viewvc?rev=1734852=rev
Log:
Downgrade web.xml files

Modified:
tomcat/tc8.5.x/trunk/webapps/ROOT/WEB-INF/web.xml
tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/web.xml
tomcat/tc8.5.x/trunk/webapps/host-manager/WEB-INF/web.xml
tomcat/tc8.5.x/trunk/webapps/manager/WEB-INF/web.xml

Modified: tomcat/tc8.5.x/trunk/webapps/ROOT/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/ROOT/WEB-INF/web.xml?rev=1734852=1734851=1734852=diff
==
--- tomcat/tc8.5.x/trunk/webapps/ROOT/WEB-INF/web.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/ROOT/WEB-INF/web.xml Sun Mar 13 20:18:52 2016
@@ -18,8 +18,8 @@
 http://xmlns.jcp.org/xml/ns/javaee;
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
   xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-  http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd;
-  version="4.0"
+  http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd;
+  version="3.1"
   metadata-complete="true">
 
   Welcome to Tomcat

Modified: tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/web.xml?rev=1734852=1734851=1734852=diff
==
--- tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/web.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/web.xml Sun Mar 13 20:18:52 
2016
@@ -18,8 +18,8 @@
 http://xmlns.jcp.org/xml/ns/javaee;
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
   xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-  http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd;
-  version="4.0"
+  http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd;
+  version="3.1"
   metadata-complete="true">
 
 

Modified: tomcat/tc8.5.x/trunk/webapps/host-manager/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/host-manager/WEB-INF/web.xml?rev=1734852=1734851=1734852=diff
==
--- tomcat/tc8.5.x/trunk/webapps/host-manager/WEB-INF/web.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/host-manager/WEB-INF/web.xml Sun Mar 13 
20:18:52 2016
@@ -18,8 +18,8 @@
 http://xmlns.jcp.org/xml/ns/javaee;
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
   xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-  http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd;
-  version="4.0"
+  http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd;
+  version="3.1"
   metadata-complete="true">
 
   Tomcat Host Manager Application

Modified: tomcat/tc8.5.x/trunk/webapps/manager/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/manager/WEB-INF/web.xml?rev=1734852=1734851=1734852=diff
==
--- tomcat/tc8.5.x/trunk/webapps/manager/WEB-INF/web.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/manager/WEB-INF/web.xml Sun Mar 13 20:18:52 
2016
@@ -18,8 +18,8 @@
 http://xmlns.jcp.org/xml/ns/javaee;
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
   xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-  http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd;
-  version="4.0"
+  http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd;
+  version="3.1"
   metadata-complete="true">
 
   Tomcat Manager Application



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

Re: [PATCH] HTTP Public Key Pinning for Tomcat

[Mark Thomas]

On 13/03/2016 19:56, Patrick Beckmann wrote:
> Hello,
> 
> As an occasional user of Tomcat I was missing HTTP Public Key Pinning
> header support¹. So I have added it to the existing
> "HttpHeaderSecurityFilter" class and would like to share it with you in
> case you are interested. Please see the attached patch.

Patches posted directly to the mailing list can easily get lost if they
aren't acted upon immediately. I strongly recommend that you open an
enhancement request in Bugzilla to track this request and add the patch
there.

I've only glanced at the patch but my immediate feedback is:
- why a hard limit of three pins?
- how to support new algorithms as they are added to the spec

I'd like to see a slightly more generic solution.

Mark

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

svn commit: r1734850 - in /tomcat/tc8.5.x/trunk/webapps/docs: ./ WEB-INF/ appdev/ appdev/sample/web/WEB-INF/ architecture/ config/ funcspecs/

[markt]

Author: markt
Date: Sun Mar 13 20:02:26 2016
New Revision: 1734850

URL: http://svn.apache.org/viewvc?rev=1734850=rev
Log:
Review doc web application for Tomcat 9 / Servlet 4.0 references

Modified:
tomcat/tc8.5.x/trunk/webapps/docs/WEB-INF/web.xml
tomcat/tc8.5.x/trunk/webapps/docs/appdev/deployment.xml
tomcat/tc8.5.x/trunk/webapps/docs/appdev/introduction.xml
tomcat/tc8.5.x/trunk/webapps/docs/appdev/sample/web/WEB-INF/web.xml
tomcat/tc8.5.x/trunk/webapps/docs/architecture/project.xml
tomcat/tc8.5.x/trunk/webapps/docs/building.xml
tomcat/tc8.5.x/trunk/webapps/docs/class-loader-howto.xml
tomcat/tc8.5.x/trunk/webapps/docs/config/project.xml
tomcat/tc8.5.x/trunk/webapps/docs/funcspecs/fs-default.xml
tomcat/tc8.5.x/trunk/webapps/docs/index.xml
tomcat/tc8.5.x/trunk/webapps/docs/jasper-howto.xml
tomcat/tc8.5.x/trunk/webapps/docs/project.xml

Modified: tomcat/tc8.5.x/trunk/webapps/docs/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/WEB-INF/web.xml?rev=1734850=1734849=1734850=diff
==
--- tomcat/tc8.5.x/trunk/webapps/docs/WEB-INF/web.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/WEB-INF/web.xml Sun Mar 13 20:02:26 2016
@@ -18,8 +18,8 @@
 http://xmlns.jcp.org/xml/ns/javaee;
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
   xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-  http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd;
-  version="4.0"
+  http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd;
+  version="3.1"
   metadata-complete="true">
 
   Tomcat Documentation

Modified: tomcat/tc8.5.x/trunk/webapps/docs/appdev/deployment.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/appdev/deployment.xml?rev=1734850=1734849=1734850=diff
==
--- tomcat/tc8.5.x/trunk/webapps/docs/appdev/deployment.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/appdev/deployment.xml Sun Mar 13 20:02:26 
2016
@@ -136,7 +136,7 @@ drivers that are required for both your
 Out of the box, a standard Tomcat installation includes a variety
 of pre-installed shared library files, including:
 
-The Servlet 4.0 and JSP 2.3 APIs that are fundamental
+The Servlet 3.1 and JSP 2.3 APIs that are fundamental
 to writing servlets and JavaServer Pages.
 
 

Modified: tomcat/tc8.5.x/trunk/webapps/docs/appdev/introduction.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/appdev/introduction.xml?rev=1734850=1734849=1734850=diff
==
--- tomcat/tc8.5.x/trunk/webapps/docs/appdev/introduction.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/appdev/introduction.xml Sun Mar 13 
20:02:26 2016
@@ -72,7 +72,6 @@ web applications with Tomcat.
 and packaging JSP pages (Appendix A) is useful.  The Javadoc
 API Documentation is included in the specification, and with the
 Tomcat download.
-
 http://jcp.org/aboutJava/communityprocess/final/jsr340/index.html;>http://jcp.org/aboutJava/communityprocess/final/jsr340/index.html
 -
 Servlet API Specification, Version 3.1.  Describes the
 programming environment that must be provided by all servlet

Modified: tomcat/tc8.5.x/trunk/webapps/docs/appdev/sample/web/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/appdev/sample/web/WEB-INF/web.xml?rev=1734850=1734849=1734850=diff
==
--- tomcat/tc8.5.x/trunk/webapps/docs/appdev/sample/web/WEB-INF/web.xml 
(original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/appdev/sample/web/WEB-INF/web.xml Sun Mar 
13 20:02:26 2016
@@ -18,8 +18,8 @@
 http://xmlns.jcp.org/xml/ns/javaee;
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
   xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-  http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd;
-  version="4.0">
+  http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd;
+  version="3.1">
 
 Hello, World Application
 

Modified: tomcat/tc8.5.x/trunk/webapps/docs/architecture/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/architecture/project.xml?rev=1734850=1734849=1734850=diff
==
--- tomcat/tc8.5.x/trunk/webapps/docs/architecture/project.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/architecture/project.xml Sun Mar 13 
20:02:26 2016
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-http://tomcat.apache.org/;>
 
-Apache Tomcat 9 Architecture
+Apache Tomcat 8 Architecture
 
 
   The Apache Tomcat Servlet/JSP Container

Modified: 

[PATCH] HTTP Public Key Pinning for Tomcat

[Patrick Beckmann]

Hello,

As an occasional user of Tomcat I was missing HTTP Public Key Pinning
header support¹. So I have added it to the existing
"HttpHeaderSecurityFilter" class and would like to share it with you in
case you are interested. Please see the attached patch.

Best Regards,
Patrick Beckmann

¹ https://tools.ietf.org/html/rfc7469
Index: conf/web.xml
===
--- conf/web.xml	(revision 1734844)
+++ conf/web.xml	(working copy)
@@ -436,6 +436,36 @@
   
   
   
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
   
   
   
Index: java/org/apache/catalina/filters/HttpHeaderSecurityFilter.java
===
--- java/org/apache/catalina/filters/HttpHeaderSecurityFilter.java	(revision 1734844)
+++ java/org/apache/catalina/filters/HttpHeaderSecurityFilter.java	(working copy)
@@ -45,6 +45,19 @@
 private boolean hstsIncludeSubDomains = false;
 private String hstsHeaderValue;
 
+// HPKP
+private static final String HPKP_HEADER_NAME = "Public-Key-Pins";
+private static final String HPKP_RO_HEADER_NAME = "Public-Key-Pins-Report-Only";
+private boolean hpkpEnabled = false;
+private boolean hpkpReportOnly = false;
+private int hpkpMaxAgeSeconds = 0;
+private boolean hpkpIncludeSubDomains = false;
+private String hpkpReportUri = null;
+private String hpkpPin1 = null;
+private String hpkpPin2 = null;
+private String hpkpPin3 = null;
+private String hpkpHeaderValue;
+
 // Click-jacking protection
 private static final String ANTI_CLICK_JACKING_HEADER_NAME = "X-Frame-Options";
 private boolean antiClickJackingEnabled = true;
@@ -74,6 +87,34 @@
 }
 hstsHeaderValue = hstsValue.toString();
 
+// Build HPKP header value
+StringBuilder hpkpValue = new StringBuilder("max-age=");
+hpkpValue.append(hpkpMaxAgeSeconds);
+if (hpkpIncludeSubDomains) {
+hpkpValue.append("; includeSubDomains");
+}
+if (hpkpReportUri != null) {
+hpkpValue.append("; report-uri=\"");
+hpkpValue.append(hpkpReportUri);
+hpkpValue.append("\"");
+}
+if (hpkpPin1 != null) {
+hpkpValue.append("; pin-sha256=\"");
+hpkpValue.append(hpkpPin1);
+hpkpValue.append("\"");
+}
+if (hpkpPin2 != null) {
+hpkpValue.append("; pin-sha256=\"");
+hpkpValue.append(hpkpPin2);
+hpkpValue.append("\"");
+}
+if (hpkpPin3 != null) {
+hpkpValue.append("; pin-sha256=\"");
+hpkpValue.append(hpkpPin3);
+hpkpValue.append("\"");
+}
+hpkpHeaderValue = hpkpValue.toString();
+
 // Anti click-jacking
 StringBuilder cjValue = new StringBuilder(antiClickJackingOption.headerValue);
 if (antiClickJackingOption == XFrameOption.ALLOW_FROM) {
@@ -100,6 +141,15 @@
 httpResponse.setHeader(HSTS_HEADER_NAME, hstsHeaderValue);
 }
 
+// HPKP
+if (hpkpEnabled && request.isSecure()) {
+if (hpkpReportOnly) {
+httpResponse.setHeader(HPKP_RO_HEADER_NAME, hpkpHeaderValue);
+} else {
+httpResponse.setHeader(HPKP_HEADER_NAME, hpkpHeaderValue);
+}
+}
+
 // anti click-jacking
 if (antiClickJackingEnabled) {
 httpResponse.setHeader(ANTI_CLICK_JACKING_HEADER_NAME, antiClickJackingHeaderValue);
@@ -169,7 +219,90 @@
 }
 
 
+public boolean isHpkpEnabled() {
+return hpkpEnabled;
+}
 
+
+public void setHpkpEnabled(boolean hpkpEnabled) {
+this.hpkpEnabled = hpkpEnabled;
+}
+
+
+public boolean isHpkpReportOnly() {
+return hpkpReportOnly;
+}
+
+
+public void setHpkpReportOnly(boolean hpkpReportOnly) {
+this.hpkpReportOnly = hpkpReportOnly;
+}
+
+
+public int getHpkpMaxAgeSeconds() {
+return hpkpMaxAgeSeconds;
+}
+
+
+public void setHpkpMaxAgeSeconds(int hpkpMaxAgeSeconds) {
+if (hpkpMaxAgeSeconds < 0) {
+this.hpkpMaxAgeSeconds = 0;
+} else {
+this.hpkpMaxAgeSeconds = hpkpMaxAgeSeconds;
+}
+}
+
+
+public boolean isHpkpIncludeSubDomains() {
+return hpkpIncludeSubDomains;
+}
+
+
+public void setHpkpIncludeSubDomains(boolean hpkpIncludeSubDomains) {
+this.hpkpIncludeSubDomains = hpkpIncludeSubDomains;
+}
+
+
+public String getHpkpReportUri() {
+return this.hpkpReportUri;
+}
+
+
+public void setHpkpReportUri(String hpkpReportUri) {
+this.hpkpReportUri = hpkpReportUri;
+}
+
+
+public String getHpkpPin1() {
+return this.hpkpPin1;
+}
+
+
+public void setHpkpPin1(String hpkpPin1) {
+   

svn commit: r1734848 - in /tomcat/tc8.0.x/trunk/java/org/apache: catalina/ catalina/ant/jmx/ catalina/core/ catalina/filters/ catalina/ha/session/ catalina/realm/ catalina/session/ catalina/startup/ c

[markt]

Author: markt
Date: Sun Mar 13 19:51:50 2016
New Revision: 1734848

URL: http://svn.apache.org/viewvc?rev=1734848=rev
Log:
By default, these will all be deprecated in 8.5.x. That can be pushed back to 
9.0.x if removal causes problems in 8.5.x.

Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/Context.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/Globals.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/InstanceEvent.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/InstanceListener.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/LifecycleState.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/Manager.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/Wrapper.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardService.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/CorsFilter.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/StandardSession.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/Membership.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/LinkObject.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/SingleRemoveSynchronizedAddLock.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/IOTools.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/InstanceSupport.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/RequestUtil.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/Constants.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/servlet/JspServlet.java

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/URL.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/Constants.java

Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/Context.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/Context.java?rev=1734848=1734847=1734848=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/Context.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/Context.java Sun Mar 13 
19:51:50 2016
@@ -801,7 +801,7 @@ public interface Context extends Contain
  *
  * @param listener Java class name of an InstanceListener class
  *
- * @deprecated Will be removed in 9.0.x onwards
+ * @deprecated Will be removed in 8.5.x onwards
  */
 @Deprecated
 public void addInstanceListener(String listener);
@@ -991,7 +991,7 @@ public interface Context extends Contain
  * Return the set of InstanceListener classes that will be added to
  * newly created Wrappers automatically.
  *
- * @deprecated Will be removed in 9.0.x onwards
+ * @deprecated Will be removed in 8.5.x onwards
  */
 @Deprecated
 public String[] findInstanceListeners();
@@ -1221,7 +1221,7 @@ public interface Context extends Contain
  *
  * @param listener Class name of an InstanceListener class to be removed
  *
- * @deprecated Will be removed in 9.0.x onwards
+ * @deprecated Will be removed in 8.5.x onwards
  */
 @Deprecated
 public void removeInstanceListener(String listener);

Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/Globals.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/Globals.java?rev=1734848=1734847=1734848=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/Globals.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/Globals.java Sun Mar 13 
19:51:50 2016
@@ -309,9 +309,9 @@ public final class Globals {
 public static final String JASPER_XML_BLOCK_EXTERNAL_INIT_PARAM =
 

svn commit: r1734846 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/ha/session/ClusterManagerBase.java java/org/apache/catalina/session/StandardSession.java

[markt]

Author: markt
Date: Sun Mar 13 19:47:07 2016
New Revision: 1734846

URL: http://svn.apache.org/viewvc?rev=1734846=rev
Log:
Remove deprecated code

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

tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/session/StandardSession.java

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar 13 19:47:07 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799
+/tomcat/trunk:1734785,1734799,1734845

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java?rev=1734846=1734845=1734846=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
 (original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
 Sun Mar 13 19:47:07 2016
@@ -76,37 +76,6 @@ public abstract class ClusterManagerBase
 this.notifyListenersOnReplication = notifyListenersOnReplication;
 }
 
-/**
- * Return the string pattern used for including session attributes
- * to replication.
- *
- * @return the sessionAttributeFilter
- *
- * @deprecated Use {@link #getSessionAttributeNameFilter()}. Will be 
removed
- * in Tomcat 9.0.x
- */
-@Deprecated
-public String getSessionAttributeFilter() {
-return getSessionAttributeNameFilter();
-}
-
-/**
- * Set the pattern used for including session attributes to replication.
- * If not set, all session attributes will be eligible for replication.
- * 
- * E.g. ^(userName|sessionHistory)$
- * 
- *
- * @param sessionAttributeFilter
- *the filter name pattern to set
- *
- * @deprecated Use {@link #setSessionAttributeNameFilter(String)}. Will be
- * removed in Tomcat 9.0.x
- */
-@Deprecated
-public void setSessionAttributeFilter(String sessionAttributeFilter) {
-setSessionAttributeNameFilter(sessionAttributeFilter);
-}
 
 public boolean isRecordAllActions() {
 return recordAllActions;
@@ -116,21 +85,6 @@ public abstract class ClusterManagerBase
 this.recordAllActions = recordAllActions;
 }
 
-/**
- * Check whether the given session attribute should be distributed based on
- * attribute name only.
- *
- * @param name The attribute name
- * @return true if the attribute should be distributed
- *
- * @deprecated Use {@link #willAttributeDistribute(String, Object)}. Will 
be
- * removed in Tomcat 9.0.x
- */
-@Deprecated
-public boolean willAttributeDistribute(String name) {
-return willAttributeDistribute(name, null);
-}
-
 
 public static ClassLoader[] getClassLoaders(Context context) {
 ClassLoader tccl = Thread.currentThread().getContextClassLoader();

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/session/StandardSession.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/session/StandardSession.java?rev=1734846=1734845=1734846=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/session/StandardSession.java 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/session/StandardSession.java 
Sun Mar 13 19:47:07 2016
@@ -161,19 +161,6 @@ public class StandardSession implements
 
 
 /**
- * Set of attribute names which are not allowed to be persisted.
- *
- * @deprecated Use {@link Constants#excludedAttributeNames} instead. Will 
be
- * removed in Tomcat 9.
- */
-@Deprecated
-protected static final String[] excludedAttributes = {
-Globals.SUBJECT_ATTR,
-Globals.GSS_CREDENTIAL_ATTR
-};
-
-
-/**
  * We are currently processing a session expiration, so bypass
  * certain IllegalStateException tests.  NOTE:  This value is not
  * included in the serialized version of this object.
@@ -1718,21 +1705,6 @@ public class StandardSession implements
 }
 
 
-/**
- * Exclude standard attributes that cannot be serialized.
- * @param name the attribute's name
- * @return true if the specified attribute should be
- *excluded from serialization
- *
- * @deprecated Use {@link #exclude(String, Object)}. Will be removed in
- * Tomcat 9.0.x.
- */
-@Deprecated
-protected boolean exclude(String name){
-return exclude(name, null);
-}
-
-
 /**
  * Should the given session attribute be excluded? This implementation
  * checks:

svn commit: r1734845 - in /tomcat/trunk/java/org/apache/catalina: ha/session/ClusterManagerBase.java session/StandardSession.java

[markt]

Author: markt
Date: Sun Mar 13 19:46:24 2016
New Revision: 1734845

URL: http://svn.apache.org/viewvc?rev=1734845=rev
Log:
Remove deprecated code

Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
tomcat/trunk/java/org/apache/catalina/session/StandardSession.java

Modified: 
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java?rev=1734845=1734844=1734845=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java 
Sun Mar 13 19:46:24 2016
@@ -76,37 +76,6 @@ public abstract class ClusterManagerBase
 this.notifyListenersOnReplication = notifyListenersOnReplication;
 }
 
-/**
- * Return the string pattern used for including session attributes
- * to replication.
- *
- * @return the sessionAttributeFilter
- *
- * @deprecated Use {@link #getSessionAttributeNameFilter()}. Will be 
removed
- * in Tomcat 9.0.x
- */
-@Deprecated
-public String getSessionAttributeFilter() {
-return getSessionAttributeNameFilter();
-}
-
-/**
- * Set the pattern used for including session attributes to replication.
- * If not set, all session attributes will be eligible for replication.
- * 
- * E.g. ^(userName|sessionHistory)$
- * 
- *
- * @param sessionAttributeFilter
- *the filter name pattern to set
- *
- * @deprecated Use {@link #setSessionAttributeNameFilter(String)}. Will be
- * removed in Tomcat 9.0.x
- */
-@Deprecated
-public void setSessionAttributeFilter(String sessionAttributeFilter) {
-setSessionAttributeNameFilter(sessionAttributeFilter);
-}
 
 public boolean isRecordAllActions() {
 return recordAllActions;
@@ -116,21 +85,6 @@ public abstract class ClusterManagerBase
 this.recordAllActions = recordAllActions;
 }
 
-/**
- * Check whether the given session attribute should be distributed based on
- * attribute name only.
- *
- * @param name The attribute name
- * @return true if the attribute should be distributed
- *
- * @deprecated Use {@link #willAttributeDistribute(String, Object)}. Will 
be
- * removed in Tomcat 9.0.x
- */
-@Deprecated
-public boolean willAttributeDistribute(String name) {
-return willAttributeDistribute(name, null);
-}
-
 
 public static ClassLoader[] getClassLoaders(Context context) {
 ClassLoader tccl = Thread.currentThread().getContextClassLoader();

Modified: tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardSession.java?rev=1734845=1734844=1734845=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/StandardSession.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/StandardSession.java Sun Mar 
13 19:46:24 2016
@@ -161,19 +161,6 @@ public class StandardSession implements
 
 
 /**
- * Set of attribute names which are not allowed to be persisted.
- *
- * @deprecated Use {@link Constants#excludedAttributeNames} instead. Will 
be
- * removed in Tomcat 9.
- */
-@Deprecated
-protected static final String[] excludedAttributes = {
-Globals.SUBJECT_ATTR,
-Globals.GSS_CREDENTIAL_ATTR
-};
-
-
-/**
  * We are currently processing a session expiration, so bypass
  * certain IllegalStateException tests.  NOTE:  This value is not
  * included in the serialized version of this object.
@@ -1718,21 +1705,6 @@ public class StandardSession implements
 }
 
 
-/**
- * Exclude standard attributes that cannot be serialized.
- * @param name the attribute's name
- * @return true if the specified attribute should be
- *excluded from serialization
- *
- * @deprecated Use {@link #exclude(String, Object)}. Will be removed in
- * Tomcat 9.0.x.
- */
-@Deprecated
-protected boolean exclude(String name){
-return exclude(name, null);
-}
-
-
 /**
  * Should the given session attribute be excluded? This implementation
  * checks:



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

svn commit: r1734844 - /tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java

[fschumacher]

Author: fschumacher
Date: Sun Mar 13 19:36:51 2016
New Revision: 1734844

URL: http://svn.apache.org/viewvc?rev=1734844=rev
Log:
honorCipherOrder has to default to false, as it is not available with java 7.

Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java?rev=1734844=1734843=1734844=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java Sun 
Mar 13 19:36:51 2016
@@ -84,7 +84,7 @@ public class SSLHostConfig {
 private String ciphers = "HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!kRSA";
 private LinkedHashSet cipherList = null;
 private List jsseCipherNames = null;
-private boolean honorCipherOrder = true;
+private boolean honorCipherOrder = false;
 private Set protocols = new HashSet<>();
 // JSSE
 private String keyManagerAlgorithm = 
KeyManagerFactory.getDefaultAlgorithm();



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

Back-port strategy

[Mark Thomas]

With the introduction of 8.5.x, we need to figure out where it fits in
our back-port strategy.

I see the following options:

A: 9.0.x -> 8.5.x -> 8.0.x -> 7.0.x -> 6.0.x

B: 9.0.x -> 8.5.x -> 7.0.x -> 6.0.x
   9.0.x -> 8.0.x

C: 9.0.x -> 8.5.x -> 7.0.x -> 6.0.x
8.5.x -> 8.0.x

D: 9.0.x -> 8.0.x -> 7.0.x -> 6.0.x
   9.0.x -> 8.5.x

E: Something else?


Given that we will be dropping 8.0.x in ~6 months, I don't think D makes
much sense.

For the same reason, I like A least of the remaining options because it
essentially means another change in ~ 6 months.

Of B & C I think C makes more sense because if there is a Servlet 3.1
specific fix then the fix can be made in 8.5.x and back-ported to 8.0.x.
With B, we couldn't easily back-port.

Thoughts?

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

Re: svn commit: r1734771 - in /tomcat/tc8.5.x: ./ branches/ tags/ trunk/

[Mark Thomas]

On 13/03/2016 17:18, Felix Schumacher wrote:
> Am 13.03.2016 um 15:49 schrieb Felix Schumacher:
>> Am 13.03.2016 um 14:48 schrieb Felix Schumacher:
>>> Am 13.03.2016 um 14:40 schrieb Mark Thomas:
 On 13/03/2016 13:04, Felix Schumacher wrote:
> Am 13.03.2016 um 12:16 schrieb Rémy Maucherat:
>> 2016-03-13 11:52 GMT+01:00 Felix Schumacher <
>> felix.schumac...@internetallee.de>:
>>
>>> Am 13.03.2016 um 11:31 schrieb Rémy Maucherat:
>>>
 2016-03-13 11:01 GMT+01:00 Mark Thomas :

 The task list is (probably):
>> - Switch to Java 7 for source and target
>> - Cleanup "9" version numbers in various places
>> - Resolve Java 7 issues
>> - Replace javax.servlet API with the classes from Tomcat 8.0
>>
>>From that list, what can I do without causing conflicts ?
>>
> If you can start on the Java 7 issues that would be great. I'll
> work on
> the Servlet API stuff next and then help out with Java 7 if
> necessary.
>
> Ok, I'll do that.
>
 I could help, too.
>>> I think I will try  to convert the RestCsrfPreventionFilter.
>>>
>>> Sure, go ahead and fix any you find.
> What should we do with
> SSLParameters#setUseCipherSuitesOrder(boolean) in
> AbstractJsseEndpoint?
 What does Tomcat 8 do in the equivalent code?
>>> It uses reflection to test for java 8. Will look into it. (Should
>>> have looked closer in the first place)
>> ant test compiles without an error. Let's see, if it runs without an
>> error.
> ant test runs without any error except cipher suite tests, which are
> expected on my ubuntu 14.04 setup.

Wow. I can't believe how quickly we got that done. And on a Sunday
afternoon as well.

There are probably a few issues still to find but the bulk of things
looks to be done.

I'll start some new threads shortly on some admin type things we need to
figure out.

Mark


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

svn commit: r1734840 - in /tomcat/tc8.5.x/trunk/java/org/apache/jasper: JspC.java compiler/JDTCompiler.java resources/LocalStrings.properties resources/LocalStrings_es.properties resources/LocalString

[fschumacher]

Author: fschumacher
Date: Sun Mar 13 18:41:22 2016
New Revision: 1734840

URL: http://svn.apache.org/viewvc?rev=1734840=rev
Log:
Use java 7 as default for jsp comilation

Modified:
tomcat/tc8.5.x/trunk/java/org/apache/jasper/JspC.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JDTCompiler.java

tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties

tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties

tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties

tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties

Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/JspC.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/JspC.java?rev=1734840=1734839=1734840=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/JspC.java Sun Mar 13 18:41:22 
2016
@@ -193,8 +193,8 @@ public class JspC extends Task implement
 
 protected String compiler = null;
 
-protected String compilerTargetVM = "1.8";
-protected String compilerSourceVM = "1.8";
+protected String compilerTargetVM = "1.7";
+protected String compilerSourceVM = "1.7";
 
 protected boolean classDebugInfo = true;
 

Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JDTCompiler.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JDTCompiler.java?rev=1734840=1734839=1734840=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JDTCompiler.java 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JDTCompiler.java Sun 
Mar 13 18:41:22 2016
@@ -318,12 +318,12 @@ public class JDTCompiler extends org.apa
 } else {
 log.warn("Unknown source VM " + opt + " ignored.");
 settings.put(CompilerOptions.OPTION_Source,
-CompilerOptions.VERSION_1_8);
+CompilerOptions.VERSION_1_7);
 }
 } else {
-// Default to 1.8
+// Default to 1.7
 settings.put(CompilerOptions.OPTION_Source,
-CompilerOptions.VERSION_1_8);
+CompilerOptions.VERSION_1_7);
 }
 
 // Target JVM
@@ -369,14 +369,14 @@ public class JDTCompiler extends org.apa
 } else {
 log.warn("Unknown target VM " + opt + " ignored.");
 settings.put(CompilerOptions.OPTION_TargetPlatform,
-CompilerOptions.VERSION_1_8);
+CompilerOptions.VERSION_1_7);
 }
 } else {
-// Default to 1.8
+// Default to 1.7
 settings.put(CompilerOptions.OPTION_TargetPlatform,
-CompilerOptions.VERSION_1_8);
+CompilerOptions.VERSION_1_7);
 settings.put(CompilerOptions.OPTION_Compliance,
-CompilerOptions.VERSION_1_8);
+CompilerOptions.VERSION_1_7);
 }
 
 final IProblemFactory problemFactory =

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=1734840=1734839=1734840=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties 
(original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties 
Sun Mar 13 18:41:22 2016
@@ -182,8 +182,8 @@ where options include:\n\
 \-xpoweredByAdd X-Powered-By response header\n\
 \-trimSpacesTrim spaces in template text between actions, 
directives\n\
 \-javaEncoding  Set the encoding charset for Java classes (default 
UTF-8)\n\
-\-sourceSet the -source argument to the compiler (default 
1.8)\n\
-\-targetSet the -target argument to the compiler (default 
1.8)\n\
+\-sourceSet the -source argument to the compiler (default 
1.7)\n\
+\-targetSet the -target argument to the compiler (default 
1.7)\n\
 
 jspc.webxml.header=\n\
 \n\

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties?rev=1734840=1734839=1734840=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
 (original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
 Sun Mar 13 18:41:22 2016

svn commit: r1734839 - /tomcat/tc8.5.x/trunk/build.properties.default

[markt]

Author: markt
Date: Sun Mar 13 18:35:12 2016
New Revision: 1734839

URL: http://svn.apache.org/viewvc?rev=1734839=rev
Log:
And put the right suffix back

Modified:
tomcat/tc8.5.x/trunk/build.properties.default

Modified: tomcat/tc8.5.x/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/build.properties.default?rev=1734839=1734838=1734839=diff
==
--- tomcat/tc8.5.x/trunk/build.properties.default (original)
+++ tomcat/tc8.5.x/trunk/build.properties.default Sun Mar 13 18:35:12 2016
@@ -27,7 +27,7 @@ version.major=8
 version.minor=5
 version.build=0
 version.patch=0
-version.suffix=
+version.suffix=-dev
 
 # - Build control flags -
 # Note enabling validation uses Checkstyle which is LGPL licensed



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

svn commit: r1734838 - /tomcat/tc8.5.x/trunk/build.properties.default

[markt]

Author: markt
Date: Sun Mar 13 18:33:11 2016
New Revision: 1734838

URL: http://svn.apache.org/viewvc?rev=1734838=rev
Log:
Remove the version suffix

Modified:
tomcat/tc8.5.x/trunk/build.properties.default

Modified: tomcat/tc8.5.x/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/build.properties.default?rev=1734838=1734837=1734838=diff
==
--- tomcat/tc8.5.x/trunk/build.properties.default (original)
+++ tomcat/tc8.5.x/trunk/build.properties.default Sun Mar 13 18:33:11 2016
@@ -27,7 +27,7 @@ version.major=8
 version.minor=5
 version.build=0
 version.patch=0
-version.suffix=.M4
+version.suffix=
 
 # - Build control flags -
 # Note enabling validation uses Checkstyle which is LGPL licensed



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

svn commit: r1734837 - in /tomcat/tc8.5.x/trunk: conf/web.xml java/org/apache/jasper/EmbeddedServletOptions.java

[markt]

Author: markt
Date: Sun Mar 13 18:32:51 2016
New Revision: 1734837

URL: http://svn.apache.org/viewvc?rev=1734837=rev
Log:
Switch Jasper defaults back to 1.7

Modified:
tomcat/tc8.5.x/trunk/conf/web.xml
tomcat/tc8.5.x/trunk/java/org/apache/jasper/EmbeddedServletOptions.java

Modified: tomcat/tc8.5.x/trunk/conf/web.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/conf/web.xml?rev=1734837=1734836=1734837=diff
==
--- tomcat/tc8.5.x/trunk/conf/web.xml (original)
+++ tomcat/tc8.5.x/trunk/conf/web.xml Sun Mar 13 18:32:51 2016
@@ -138,9 +138,9 @@
   
   
   
-  
+  
   
-  
+  
   
   
   

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/EmbeddedServletOptions.java?rev=1734837=1734836=1734837=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/EmbeddedServletOptions.java 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/EmbeddedServletOptions.java Sun 
Mar 13 18:32:51 2016
@@ -132,12 +132,12 @@ public final class EmbeddedServletOption
 /**
  * Compiler target VM.
  */
-private String compilerTargetVM = "1.8";
+private String compilerTargetVM = "1.7";
 
 /**
  * The compiler source VM.
  */
-private String compilerSourceVM = "1.8";
+private String compilerSourceVM = "1.7";
 
 /**
  * The compiler class name.



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

svn commit: r1734834 - in /tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup: web-fragment-1name.xml web-fragment-1ordering.xml web-fragment-2name.xml web-fragment-2ordering.xml

[fschumacher]

Author: fschumacher
Date: Sun Mar 13 18:05:30 2016
New Revision: 1734834

URL: http://svn.apache.org/viewvc?rev=1734834=rev
Log:
More changes of 4.0 to 3.1 in web xml files.

Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-fragment-1name.xml

tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-fragment-1ordering.xml
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-fragment-2name.xml

tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-fragment-2ordering.xml

Modified: 
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-fragment-1name.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-fragment-1name.xml?rev=1734834=1734833=1734834=diff
==
--- 
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-fragment-1name.xml 
(original)
+++ 
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-fragment-1name.xml 
Sun Mar 13 18:05:30 2016
@@ -18,8 +18,8 @@
 http://xmlns.jcp.org/xml/ns/javaee;
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
   xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-  http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd;
-  version="4.0"
+  http://xmlns.jcp.org/xml/ns/javaee/web-fragment_3_1.xsd;
+  version="3.1"
   metadata-complete="true">
   name1
 
\ No newline at end of file

Modified: 
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-fragment-1ordering.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-fragment-1ordering.xml?rev=1734834=1734833=1734834=diff
==
--- 
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-fragment-1ordering.xml
 (original)
+++ 
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-fragment-1ordering.xml
 Sun Mar 13 18:05:30 2016
@@ -18,8 +18,8 @@
 http://xmlns.jcp.org/xml/ns/javaee;
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
   xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-  http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd;
-  version="4.0"
+  http://xmlns.jcp.org/xml/ns/javaee/web-fragment_3_1.xsd;
+  version="3.1"
   metadata-complete="true">
   
 

Modified: 
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-fragment-2name.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-fragment-2name.xml?rev=1734834=1734833=1734834=diff
==
--- 
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-fragment-2name.xml 
(original)
+++ 
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-fragment-2name.xml 
Sun Mar 13 18:05:30 2016
@@ -18,8 +18,8 @@
 http://xmlns.jcp.org/xml/ns/javaee;
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
   xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-  http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd;
-  version="4.0"
+  http://xmlns.jcp.org/xml/ns/javaee/web-fragment_3_1.xsd;
+  version="3.1"
   metadata-complete="true">
   name1
   name2

Modified: 
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-fragment-2ordering.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-fragment-2ordering.xml?rev=1734834=1734833=1734834=diff
==
--- 
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-fragment-2ordering.xml
 (original)
+++ 
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-fragment-2ordering.xml
 Sun Mar 13 18:05:30 2016
@@ -18,8 +18,8 @@
 http://xmlns.jcp.org/xml/ns/javaee;
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
   xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-  http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd;
-  version="4.0"
+  http://xmlns.jcp.org/xml/ns/javaee/web-fragment_3_1.xsd;
+  version="3.1"
   metadata-complete="true">
   
 



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

svn commit: r1734832 - in /tomcat/tc8.5.x/trunk/test/org/apache/jasper: TestJspC.java compiler/TestJspConfig.java compiler/TestValidator.java

[remm]

Author: remm
Date: Sun Mar 13 17:45:05 2016
New Revision: 1734832

URL: http://svn.apache.org/viewvc?rev=1734832=rev
Log:
Remove some instances of 4.0 use.

Modified:
tomcat/tc8.5.x/trunk/test/org/apache/jasper/TestJspC.java
tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestJspConfig.java
tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestValidator.java

Modified: tomcat/tc8.5.x/trunk/test/org/apache/jasper/TestJspC.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/jasper/TestJspC.java?rev=1734832=1734831=1734832=diff
==
--- tomcat/tc8.5.x/trunk/test/org/apache/jasper/TestJspC.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/jasper/TestJspC.java Sun Mar 13 
17:45:05 2016
@@ -95,14 +95,6 @@ public class TestJspC {
 verify(webappOut);
 }
 
-@Test
-public void precompileWebapp_4_0() throws IOException {
-File appDir = new File("test/webapp-4.0");
-File webappOut = new File(outputDir, appDir.getName());
-precompile(appDir, webappOut);
-verify(webappOut);
-}
-
 private void verify(File webappOut) {
 // for now, just check some expected files exist
 Assert.assertTrue(new File(webappOut, "generated_web.xml").exists());

Modified: 
tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestJspConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestJspConfig.java?rev=1734832=1734831=1734832=diff
==
--- tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestJspConfig.java 
(original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestJspConfig.java Sun 
Mar 13 17:45:05 2016
@@ -141,21 +141,4 @@ public class TestJspConfig extends Tomca
 assertTrue(result.indexOf("00-hello world") > 0);
 }
 
-@Test
-public void testServlet40NoEL() throws Exception {
-Tomcat tomcat = getTomcatInstance();
-
-File appDir = new File("test/webapp-4.0");
-// app dir is relative to server home
-tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-
-tomcat.start();
-
-ByteChunk res = getUrl("http://localhost:; + getPort() +
-"/test/el-as-literal.jsp");
-
-String result = res.toString();
-
-assertTrue(result.indexOf("00-hello world") > 0);
-}
 }

Modified: 
tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestValidator.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestValidator.java?rev=1734832=1734831=1734832=diff
==
--- tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestValidator.java 
(original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestValidator.java Sun 
Mar 13 17:45:05 2016
@@ -195,31 +195,6 @@ public class TestValidator extends Tomca
 assertTrue(result.indexOf("06-hello world") > 0);
 }
 
-@Test
-public void testTldVersions40() throws Exception {
-Tomcat tomcat = getTomcatInstance();
-
-File appDir =
-new File("test/webapp-4.0");
-// app dir is relative to server home
-tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-
-tomcat.start();
-
-ByteChunk res = getUrl("http://localhost:; + getPort() +
-"/test/tld-versions.jsp");
-
-String result = res.toString();
-
-assertTrue(result.indexOf("00-hello world") > 0);
-assertTrue(result.indexOf("#{'01-hello world'}") > 0);
-assertTrue(result.indexOf("02-hello world") > 0);
-assertTrue(result.indexOf("#{'03-hello world'}") > 0);
-assertTrue(result.indexOf("04-hello world") > 0);
-assertTrue(result.indexOf("#{'05-hello world'}") > 0);
-assertTrue(result.indexOf("06-hello world") > 0);
-}
-
 public static class Echo extends TagSupport {
 
 private static final long serialVersionUID = 1L;



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

svn commit: r1734831 - /tomcat/tc8.5.x/trunk/test/webapp-4.0/

[remm]

Author: remm
Date: Sun Mar 13 17:41:01 2016
New Revision: 1734831

URL: http://svn.apache.org/viewvc?rev=1734831=rev
Log:
Remove Servlet 4 test webapp.

Removed:
tomcat/tc8.5.x/trunk/test/webapp-4.0/


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

svn commit: r1734827 - /tomcat/tc8.5.x/trunk/modules/jdbc-pool/build.properties.default

[fschumacher]

Author: fschumacher
Date: Sun Mar 13 17:28:08 2016
New Revision: 1734827

URL: http://svn.apache.org/viewvc?rev=1734827=rev
Log:
Use java 7 to compile jdbc-pool

Modified:
tomcat/tc8.5.x/trunk/modules/jdbc-pool/build.properties.default

Modified: tomcat/tc8.5.x/trunk/modules/jdbc-pool/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/modules/jdbc-pool/build.properties.default?rev=1734827=1734826=1734827=diff
==
--- tomcat/tc8.5.x/trunk/modules/jdbc-pool/build.properties.default (original)
+++ tomcat/tc8.5.x/trunk/modules/jdbc-pool/build.properties.default Sun Mar 13 
17:28:08 2016
@@ -35,8 +35,8 @@ version.suffix=
 # contexts by the various build scripts.
 base.path=${basedir}/includes
 
-compile.source=1.8
-compile.target=1.8
+compile.source=1.7
+compile.target=1.7
 compile.debug=true
 
 # Do not pass -deprecation (-Xlint:deprecation) flag to javac



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

Re: svn commit: r1734771 - in /tomcat/tc8.5.x: ./ branches/ tags/ trunk/

[Felix Schumacher]

Am 13.03.2016 um 15:49 schrieb Felix Schumacher:

Am 13.03.2016 um 14:48 schrieb Felix Schumacher:

Am 13.03.2016 um 14:40 schrieb Mark Thomas:

On 13/03/2016 13:04, Felix Schumacher wrote:

Am 13.03.2016 um 12:16 schrieb Rémy Maucherat:

2016-03-13 11:52 GMT+01:00 Felix Schumacher <
felix.schumac...@internetallee.de>:


Am 13.03.2016 um 11:31 schrieb Rémy Maucherat:


2016-03-13 11:01 GMT+01:00 Mark Thomas :

The task list is (probably):

- Switch to Java 7 for source and target
- Cleanup "9" version numbers in various places
- Resolve Java 7 issues
- Replace javax.servlet API with the classes from Tomcat 8.0

   From that list, what can I do without causing conflicts ?


If you can start on the Java 7 issues that would be great. I'll
work on
the Servlet API stuff next and then help out with Java 7 if 
necessary.


Ok, I'll do that.


I could help, too.

I think I will try  to convert the RestCsrfPreventionFilter.

Sure, go ahead and fix any you find.
What should we do with 
SSLParameters#setUseCipherSuitesOrder(boolean) in

AbstractJsseEndpoint?

What does Tomcat 8 do in the equivalent code?
It uses reflection to test for java 8. Will look into it. (Should 
have looked closer in the first place)
ant test compiles without an error. Let's see, if it runs without an 
error.
ant test runs without any error except cipher suite tests, which are 
expected on my ubuntu 14.04 setup.


Felix



Felix


Felix


Mark


-
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




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




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

svn commit: r1734826 - /tomcat/tc8.5.x/trunk/test/org/apache/jasper/servlet/TestJspCServletContext.java

[fschumacher]

Author: fschumacher
Date: Sun Mar 13 17:17:32 2016
New Revision: 1734826

URL: http://svn.apache.org/viewvc?rev=1734826=rev
Log:
Remove tests for servlet api 4.0

Modified:

tomcat/tc8.5.x/trunk/test/org/apache/jasper/servlet/TestJspCServletContext.java

Modified: 
tomcat/tc8.5.x/trunk/test/org/apache/jasper/servlet/TestJspCServletContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/jasper/servlet/TestJspCServletContext.java?rev=1734826=1734825=1734826=diff
==
--- 
tomcat/tc8.5.x/trunk/test/org/apache/jasper/servlet/TestJspCServletContext.java 
(original)
+++ 
tomcat/tc8.5.x/trunk/test/org/apache/jasper/servlet/TestJspCServletContext.java 
Sun Mar 13 17:17:32 2016
@@ -33,8 +33,8 @@ public class TestJspCServletContext {
 File appDir = new File("test/webapp");
 JspCServletContext context = new JspCServletContext(
 null, appDir.toURI().toURL(), null, false, false);
-Assert.assertEquals(4, context.getEffectiveMajorVersion());
-Assert.assertEquals(0, context.getEffectiveMinorVersion());
+Assert.assertEquals(3, context.getEffectiveMajorVersion());
+Assert.assertEquals(1, context.getEffectiveMinorVersion());
 JspConfigDescriptor jspConfigDescriptor =
 context.getJspConfigDescriptor();
 Assert.assertTrue(jspConfigDescriptor.getTaglibs().isEmpty());
@@ -113,22 +113,13 @@ public class TestJspCServletContext {
 Assert.assertEquals(1, context.getEffectiveMinorVersion());
 }
 
-@Test
-public void testWebapp_4_0() throws Exception {
-File appDir = new File("test/webapp-4.0");
-JspCServletContext context = new JspCServletContext(
-null, appDir.toURI().toURL(), null, false, false);
-Assert.assertEquals(4, context.getEffectiveMajorVersion());
-Assert.assertEquals(0, context.getEffectiveMinorVersion());
-}
-
 
 @Test
 public void testWebresources() throws Exception {
 File appDir = new File("test/webresources/dir1");
 JspCServletContext context = new JspCServletContext(
 null, appDir.toURI().toURL(), null, false, false);
-Assert.assertEquals(4, context.getEffectiveMajorVersion());
-Assert.assertEquals(0, context.getEffectiveMinorVersion());
+Assert.assertEquals(3, context.getEffectiveMajorVersion());
+Assert.assertEquals(1, context.getEffectiveMinorVersion());
 }
 }



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

svn commit: r1734825 - in /tomcat/tc8.5.x/trunk/test: javax/servlet/resources/TestSchemaValidation.java org/apache/tomcat/util/descriptor/web/TestWebXml.java

[fschumacher]

Author: fschumacher
Date: Sun Mar 13 16:34:30 2016
New Revision: 1734825

URL: http://svn.apache.org/viewvc?rev=1734825=rev
Log:
Remove tests for servlet api 4.0

Modified:
tomcat/tc8.5.x/trunk/test/javax/servlet/resources/TestSchemaValidation.java

tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java

Modified: 
tomcat/tc8.5.x/trunk/test/javax/servlet/resources/TestSchemaValidation.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/javax/servlet/resources/TestSchemaValidation.java?rev=1734825=1734824=1734825=diff
==
--- tomcat/tc8.5.x/trunk/test/javax/servlet/resources/TestSchemaValidation.java 
(original)
+++ tomcat/tc8.5.x/trunk/test/javax/servlet/resources/TestSchemaValidation.java 
Sun Mar 13 16:34:30 2016
@@ -39,7 +39,7 @@ public class TestSchemaValidation {
 digester.push(new WebXml());
 WebXml desc = (WebXml) digester.parse(
 new File("test/webapp/WEB-INF/web.xml"));
-Assert.assertEquals("4.0", desc.getVersion());
+Assert.assertEquals("3.1", desc.getVersion());
 Assert.assertEquals(0, handler.getErrors().size());
 Assert.assertEquals(0, handler.getWarnings().size());
 }
@@ -129,18 +129,4 @@ public class TestSchemaValidation {
 Assert.assertEquals(0, handler.getErrors().size());
 Assert.assertEquals(0, handler.getWarnings().size());
 }
-
-@Test
-public void testWebapp_4_0() throws Exception {
-XmlErrorHandler handler = new XmlErrorHandler();
-Digester digester = DigesterFactory.newDigester(
-true, true, new WebRuleSet(false), true);
-digester.setErrorHandler(handler);
-digester.push(new WebXml());
-WebXml desc = (WebXml) digester.parse(
-new File("test/webapp-4.0/WEB-INF/web.xml"));
-Assert.assertEquals("4.0", desc.getVersion());
-Assert.assertEquals(0, handler.getErrors().size());
-Assert.assertEquals(0, handler.getWarnings().size());
-}
 }

Modified: 
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java?rev=1734825=1734824=1734825=diff
==
--- 
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java 
(original)
+++ 
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java 
Sun Mar 13 16:34:30 2016
@@ -44,8 +44,8 @@ public class TestWebXml {
 WebXml webxml = new WebXml();
 
 // Defaults
-Assert.assertEquals(4, webxml.getMajorVersion());
-Assert.assertEquals(0, webxml.getMinorVersion());
+Assert.assertEquals(3, webxml.getMajorVersion());
+Assert.assertEquals(1, webxml.getMinorVersion());
 
 // Both get changed
 webxml.setVersion("2.5");
@@ -130,17 +130,6 @@ public class TestWebXml {
 }
 
 @Test
-public void testParseVersion40() {
-
-WebXml webxml = new WebXml();
-
-webxml.setVersion("4.0");
-Assert.assertEquals(4, webxml.getMajorVersion());
-Assert.assertEquals(0, webxml.getMinorVersion());
-Assert.assertEquals("4.0", webxml.getVersion());
-}
-
-@Test
 public void testValidateVersion22() throws IOException, SAXException {
 doTestValidateVersion("2.2");
 }
@@ -170,11 +159,6 @@ public class TestWebXml {
 doTestValidateVersion("3.1");
 }
 
-@Test
-public void testValidateVersion40() throws IOException, SAXException {
-doTestValidateVersion("4.0");
-}
-
 private void doTestValidateVersion(String version) throws IOException, 
SAXException {
 WebXml webxml = new WebXml();
 



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

svn commit: r1734820 - /tomcat/tc8.5.x/trunk/test/org/apache/catalina/filters/TestRestCsrfPreventionFilter2.java

[remm]

Author: remm
Date: Sun Mar 13 15:37:03 2016
New Revision: 1734820

URL: http://svn.apache.org/viewvc?rev=1734820=rev
Log:
WS.

Modified:

tomcat/tc8.5.x/trunk/test/org/apache/catalina/filters/TestRestCsrfPreventionFilter2.java

Modified: 
tomcat/tc8.5.x/trunk/test/org/apache/catalina/filters/TestRestCsrfPreventionFilter2.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/filters/TestRestCsrfPreventionFilter2.java?rev=1734820=1734819=1734820=diff
==
--- 
tomcat/tc8.5.x/trunk/test/org/apache/catalina/filters/TestRestCsrfPreventionFilter2.java
 (original)
+++ 
tomcat/tc8.5.x/trunk/test/org/apache/catalina/filters/TestRestCsrfPreventionFilter2.java
 Sun Mar 13 15:37:03 2016
@@ -371,11 +371,11 @@ public class TestRestCsrfPreventionFilte
 return path;
 }
 }
-
+
 private interface Predicate {
 boolean test(T x);
 }
-
+
 private static boolean nonNull(Object o) {
 return o != null;
 }
@@ -393,7 +393,7 @@ public class TestRestCsrfPreventionFilte
 }
 };
 }
-
+
 /**
  * @return a Predicate to check for non emptiness of a List of Strings
  */



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

svn commit: r1734821 - in /tomcat/tc8.5.x/trunk: build.xml conf/web.xml java/org/apache/tomcat/util/descriptor/DigesterFactory.java java/org/apache/tomcat/util/descriptor/XmlIdentifiers.java java/org/

[remm]

Author: remm
Date: Sun Mar 13 15:37:41 2016
New Revision: 1734821

URL: http://svn.apache.org/viewvc?rev=1734821=rev
Log:
Remove some instances of 4.0 use.

Modified:
tomcat/tc8.5.x/trunk/build.xml
tomcat/tc8.5.x/trunk/conf/web.xml

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/XmlIdentifiers.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java

Modified: tomcat/tc8.5.x/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/build.xml?rev=1734821=1734820=1734821=diff
==
--- tomcat/tc8.5.x/trunk/build.xml (original)
+++ tomcat/tc8.5.x/trunk/build.xml Sun Mar 13 15:37:41 2016
@@ -81,7 +81,7 @@
   
   
 
-  
+  
   
   
 

Modified: tomcat/tc8.5.x/trunk/conf/web.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/conf/web.xml?rev=1734821=1734820=1734821=diff
==
--- tomcat/tc8.5.x/trunk/conf/web.xml (original)
+++ tomcat/tc8.5.x/trunk/conf/web.xml Sun Mar 13 15:37:41 2016
@@ -18,8 +18,8 @@
 http://xmlns.jcp.org/xml/ns/javaee;
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
   xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-  http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd;
-  version="4.0">
+  http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd;
+  version="3.1">
 
   
   

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java?rev=1734821=1734820=1734821=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
 (original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
 Sun Mar 13 15:37:41 2016
@@ -120,12 +120,6 @@ public class DigesterFactory {
 addSelf(systemIds, "javaee_web_services_1_4.xsd");
 addSelf(systemIds, "javaee_web_services_client_1_4.xsd");
 
-// from JavaEE 8
-add(systemIds, XmlIdentifiers.WEB_40_XSD, 
locationFor("web-app_4_0.xsd"));
-add(systemIds, XmlIdentifiers.WEB_FRAGMENT_40_XSD, 
locationFor("web-fragment_4_0.xsd"));
-addSelf(systemIds, "web-common_4_0.xsd");
-addSelf(systemIds, "javaee_8.xsd");
-
 SERVLET_API_PUBLIC_IDS = Collections.unmodifiableMap(publicIds);
 SERVLET_API_SYSTEM_IDS = Collections.unmodifiableMap(systemIds);
 }

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/XmlIdentifiers.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/XmlIdentifiers.java?rev=1734821=1734820=1734821=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/XmlIdentifiers.java 
(original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/XmlIdentifiers.java 
Sun Mar 13 15:37:41 2016
@@ -73,11 +73,6 @@ public final class XmlIdentifiers {
 public static final String WEB_FRAGMENT_31_XSD = JAVAEE_7_NS + 
"/web-fragment_3_1.xsd";
 public static final String WEBSERVICES_14_XSD = JAVAEE_7_NS + 
"/javaee_web_services_1_4.xsd";
 
-// from JavaEE 8
-public static final String JAVAEE_8_NS = JAVAEE_7_NS;
-public static final String WEB_40_XSD = JAVAEE_8_NS + "/web-app_4_0.xsd";
-public static final String WEB_FRAGMENT_40_XSD = JAVAEE_8_NS + 
"/web-fragment_4_0.xsd";
-
 private XmlIdentifiers() {
 }
 }
\ No newline at end of file

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java?rev=1734821=1734820=1734821=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java 
Sun Mar 13 15:37:41 2016
@@ -160,10 +160,6 @@ public class WebXml {
 majorVersion = 3;
 minorVersion = 1;
 break;
-case "4.0":
-majorVersion = 4;
-minorVersion = 0;
-break;
 default:
 log.warn(sm.getString("webXml.version.unknown", version));
 }
@@ -215,9 +211,9 @@ public class WebXml {
 }
 
 // Derived major and minor version attributes
-// Default to 4.0 until we know otherwise
-private int majorVersion = 4;
-private int minorVersion = 0;
+// Default to 3,1
+private int majorVersion = 3;
+ 

svn commit: r1734818 - in /tomcat/tc8.5.x/trunk/test: org/apache/catalina/startup/ webapp/WEB-INF/

[fschumacher]

Author: fschumacher
Date: Sun Mar 13 15:31:14 2016
New Revision: 1734818

URL: http://svn.apache.org/viewvc?rev=1734818=rev
Log:
Change web.xml fragments in test to use web-app_3_1.xsd

Modified:

tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-1lifecyclecallback.xml
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-1ordering.xml

tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-2lifecyclecallback.xml
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-2ordering.xml
tomcat/tc8.5.x/trunk/test/webapp/WEB-INF/web.xml

Modified: 
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-1lifecyclecallback.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-1lifecyclecallback.xml?rev=1734818=1734817=1734818=diff
==
--- 
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-1lifecyclecallback.xml
 (original)
+++ 
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-1lifecyclecallback.xml
 Sun Mar 13 15:31:14 2016
@@ -18,8 +18,8 @@
 http://xmlns.jcp.org/xml/ns/javaee;
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
   xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-  http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd;
-  version="4.0"
+  http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd;
+  version="3.1"
   metadata-complete="true">
   
 test.TestServlet

Modified: 
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-1ordering.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-1ordering.xml?rev=1734818=1734817=1734818=diff
==
--- tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-1ordering.xml 
(original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-1ordering.xml Sun 
Mar 13 15:31:14 2016
@@ -18,8 +18,8 @@
 http://xmlns.jcp.org/xml/ns/javaee;
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
   xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-  http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd;
-  version="4.0"
+  http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd;
+  version="3.1"
   metadata-complete="true">
   
 bar

Modified: 
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-2lifecyclecallback.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-2lifecyclecallback.xml?rev=1734818=1734817=1734818=diff
==
--- 
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-2lifecyclecallback.xml
 (original)
+++ 
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-2lifecyclecallback.xml
 Sun Mar 13 15:31:14 2016
@@ -18,8 +18,8 @@
 http://xmlns.jcp.org/xml/ns/javaee;
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
   xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-  http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd;
-  version="4.0"
+  http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd;
+  version="3.1"
   metadata-complete="true">
   
 test.TestServlet

Modified: 
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-2ordering.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-2ordering.xml?rev=1734818=1734817=1734818=diff
==
--- tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-2ordering.xml 
(original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/web-2ordering.xml Sun 
Mar 13 15:31:14 2016
@@ -18,8 +18,8 @@
 http://xmlns.jcp.org/xml/ns/javaee;
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
   xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-  http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd;
-  version="4.0"
+  http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd;
+  version="3.1"
   metadata-complete="true">
   
 foo

Modified: tomcat/tc8.5.x/trunk/test/webapp/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/webapp/WEB-INF/web.xml?rev=1734818=1734817=1734818=diff
==
--- tomcat/tc8.5.x/trunk/test/webapp/WEB-INF/web.xml (original)
+++ tomcat/tc8.5.x/trunk/test/webapp/WEB-INF/web.xml Sun Mar 13 15:31:14 2016
@@ -18,8 +18,8 @@
 http://xmlns.jcp.org/xml/ns/javaee;
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
   xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-  http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd;
-  version="4.0"
+  http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd;
+  version="3.1"
   

Re: svn commit: r1734771 - in /tomcat/tc8.5.x: ./ branches/ tags/ trunk/

[Felix Schumacher]

Am 13.03.2016 um 14:48 schrieb Felix Schumacher:

Am 13.03.2016 um 14:40 schrieb Mark Thomas:

On 13/03/2016 13:04, Felix Schumacher wrote:

Am 13.03.2016 um 12:16 schrieb Rémy Maucherat:

2016-03-13 11:52 GMT+01:00 Felix Schumacher <
felix.schumac...@internetallee.de>:


Am 13.03.2016 um 11:31 schrieb Rémy Maucherat:


2016-03-13 11:01 GMT+01:00 Mark Thomas :

The task list is (probably):

- Switch to Java 7 for source and target
- Cleanup "9" version numbers in various places
- Resolve Java 7 issues
- Replace javax.servlet API with the classes from Tomcat 8.0

   From that list, what can I do without causing conflicts ?


If you can start on the Java 7 issues that would be great. I'll
work on
the Servlet API stuff next and then help out with Java 7 if 
necessary.


Ok, I'll do that.


I could help, too.

I think I will try  to convert the RestCsrfPreventionFilter.

Sure, go ahead and fix any you find.
What should we do with 
SSLParameters#setUseCipherSuitesOrder(boolean) in

AbstractJsseEndpoint?

What does Tomcat 8 do in the equivalent code?
It uses reflection to test for java 8. Will look into it. (Should have 
looked closer in the first place)

ant test compiles without an error. Let's see, if it runs without an error.

Felix


Felix


Mark


-
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




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

svn commit: r1734815 - /tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java

[fschumacher]

Author: fschumacher
Date: Sun Mar 13 14:48:21 2016
New Revision: 1734815

URL: http://svn.apache.org/viewvc?rev=1734815=rev
Log:
Use final on buffer to make it available in the CompletionHandler

Modified:

tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java

Modified: 
tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java?rev=1734815=1734814=1734815=diff
==
--- 
tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
 (original)
+++ 
tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
 Sun Mar 13 14:48:21 2016
@@ -192,7 +192,7 @@ public class TestUpgradeInternalHandler
 // Arbitrarily located in the init, could be in the initial read 
event, asynchronous, etc.
 // Note: the completion check used will not call the completion 
handler if the IO completed inline and without error.
 // Using a completion check that always calls complete would be 
easier here since the action is the same even with inline completion.
-ByteBuffer buffer = ByteBuffer.allocate(1024);
+final ByteBuffer buffer = ByteBuffer.allocate(1024);
 CompletionState state = wrapper.read(false, 10, TimeUnit.SECONDS, 
null, SocketWrapperBase.READ_DATA, new CompletionHandler() {
 @Override
 public void completed(Long result, Void attachment) {



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

svn commit: r1734814 - /tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java

[fschumacher]

Author: fschumacher
Date: Sun Mar 13 14:45:33 2016
New Revision: 1734814

URL: http://svn.apache.org/viewvc?rev=1734814=rev
Log:
Use final to make resp and ac available to Runnable.

Modified:
tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java

Modified: 
tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java?rev=1734814=1734813=1734814=diff
==
--- tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java 
(original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java 
Sun Mar 13 14:45:33 2016
@@ -745,9 +745,9 @@ public class TestHttp11Processor extends
 private static final long serialVersionUID = 1L;
 
 @Override
-protected void doPut(HttpServletRequest req, HttpServletResponse resp)
+protected void doPut(HttpServletRequest req, final HttpServletResponse 
resp)
 throws ServletException, IOException {
-AsyncContext ac = req.startAsync();
+final AsyncContext ac = req.startAsync();
 ac.start(new Runnable() {
 @Override
 public void run() {



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

svn commit: r1734813 - /tomcat/tc8.5.x/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java

[fschumacher]

Author: fschumacher
Date: Sun Mar 13 14:43:04 2016
New Revision: 1734813

URL: http://svn.apache.org/viewvc?rev=1734813=rev
Log:
Help java 7 to see, that we are creating a List of Integers.

Modified:

tomcat/tc8.5.x/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java

Modified: 
tomcat/tc8.5.x/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java?rev=1734813=1734812=1734813=diff
==
--- 
tomcat/tc8.5.x/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java 
(original)
+++ 
tomcat/tc8.5.x/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java 
Sun Mar 13 14:43:04 2016
@@ -937,8 +937,8 @@ public class TestAbstractAjpProcessor ex
 
 public ReadBodyServlet(boolean callAvailable) {
 this.callAvailable = callAvailable;
-this.availableList = callAvailable ? new ArrayList<>() : null;
-this.readList = callAvailable ? new ArrayList<>() : null;
+this.availableList = callAvailable ? new ArrayList() : 
null;
+this.readList = callAvailable ? new ArrayList() : null;
 }
 
 @Override



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

svn commit: r1734812 - /tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java

[fschumacher]

Author: fschumacher
Date: Sun Mar 13 14:40:58 2016
New Revision: 1734812

URL: http://svn.apache.org/viewvc?rev=1734812=rev
Log:
Use final to make actxt available to Runnable.

Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java

Modified: 
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java?rev=1734812=1734811=1734812=diff
==
--- 
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java 
(original)
+++ 
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java 
Sun Mar 13 14:40:58 2016
@@ -1371,7 +1371,7 @@ public class TestAsyncContextImpl extend
 protected void doGet(HttpServletRequest req, final HttpServletResponse 
resp)
 throws ServletException, IOException {
 
-AsyncContext actxt = req.startAsync();
+final AsyncContext actxt = req.startAsync();
 actxt.setTimeout(TIMEOUT);
 if (threaded) {
 actxt.start(new Runnable() {



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

svn commit: r1734811 - /tomcat/tc8.5.x/trunk/test/org/apache/catalina/filters/TestRestCsrfPreventionFilter2.java

[fschumacher]

Author: fschumacher
Date: Sun Mar 13 14:39:47 2016
New Revision: 1734811

URL: http://svn.apache.org/viewvc?rev=1734811=rev
Log:
Convert java 8 usage of Predicates and forEach to a java 7 compatible 
implementation.

Modified:

tomcat/tc8.5.x/trunk/test/org/apache/catalina/filters/TestRestCsrfPreventionFilter2.java

Modified: 
tomcat/tc8.5.x/trunk/test/org/apache/catalina/filters/TestRestCsrfPreventionFilter2.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/filters/TestRestCsrfPreventionFilter2.java?rev=1734811=1734810=1734811=diff
==
--- 
tomcat/tc8.5.x/trunk/test/org/apache/catalina/filters/TestRestCsrfPreventionFilter2.java
 (original)
+++ 
tomcat/tc8.5.x/trunk/test/org/apache/catalina/filters/TestRestCsrfPreventionFilter2.java
 Sun Mar 13 14:39:47 2016
@@ -23,7 +23,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.function.Predicate;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
@@ -207,13 +206,13 @@ public class TestRestCsrfPreventionFilte
 Map reqHeaders = new HashMap<>();
 Map respHeaders = new HashMap<>();
 
-addNonce(reqHeaders, nonce, n -> Objects.nonNull(n));
+addNonce(reqHeaders, nonce, nonNullPredicate(String.class));
 
 if (useCookie) {
-addCookies(reqHeaders, l -> Objects.nonNull(l) && l.size() > 0);
+addCookies(reqHeaders, notEmptyPredicate());
 }
 
-addCredentials(reqHeaders, credentials, c -> Objects.nonNull(c));
+addCredentials(reqHeaders, credentials, 
nonNullPredicate(BasicCredentials.class));
 
 ByteChunk bc = new ByteChunk();
 int rc;
@@ -228,7 +227,7 @@ public class TestRestCsrfPreventionFilte
 if (expectedRC == HttpServletResponse.SC_OK) {
 assertEquals(expectedResponse, bc.toString());
 List newCookies = respHeaders.get(SERVER_COOKIE_HEADER);
-saveCookies(newCookies, l -> Objects.nonNull(l) && l.size() > 0);
+saveCookies(newCookies, notEmptyPredicate());
 }
 
 if (!expectCsrfRH) {
@@ -236,7 +235,7 @@ public class TestRestCsrfPreventionFilte
 } else {
 List respHeaderValue = 
respHeaders.get(Constants.CSRF_REST_NONCE_HEADER_NAME);
 assertNotNull(respHeaderValue);
-if (Objects.nonNull(expectedCsrfRHV)) {
+if (nonNull(expectedCsrfRHV)) {
 assertTrue(respHeaderValue.contains(expectedCsrfRHV));
 } else {
 validNonce = respHeaderValue.get(0);
@@ -246,7 +245,9 @@ public class TestRestCsrfPreventionFilte
 
 private void saveCookies(List newCookies, Predicate 
tester) {
 if (tester.test(newCookies)) {
-newCookies.forEach(h -> cookies.add(h.substring(0, 
h.indexOf(';';
+for (String newCookie: newCookies) {
+cookies.add(newCookie.substring(0, newCookie.indexOf(';')));
+}
 }
 }
 
@@ -364,10 +365,44 @@ public class TestRestCsrfPreventionFilte
 
 private String getRequestedPath(HttpServletRequest request) {
 String path = request.getServletPath();
-if (Objects.nonNull(request.getPathInfo())) {
+if (nonNull(request.getPathInfo())) {
 path = path + request.getPathInfo();
 }
 return path;
 }
 }
+
+private interface Predicate {
+boolean test(T x);
+}
+
+private static boolean nonNull(Object o) {
+return o != null;
+}
+
+/**
+ * @param clazz
+ *class parameter to enable use of generics
+ * @return a Predicate to test for non null-ness
+ */
+private static  Predicate nonNullPredicate(Class clazz) {
+return new Predicate() {
+@Override
+public boolean test(T x) {
+return x != null;
+}
+};
+}
+
+/**
+ * @return a Predicate to check for non emptiness of a List of Strings
+ */
+private static Predicate notEmptyPredicate() {
+return new Predicate() {
+@Override
+public boolean test(List x) {
+return x != null && !x.isEmpty();
+}
+};
+}
 }



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

svn commit: r1734808 - in /tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net: AbstractJsseEndpoint.java LocalStrings.properties SSLHostConfig.java

[fschumacher]

Author: fschumacher
Date: Sun Mar 13 14:04:10 2016
New Revision: 1734808

URL: http://svn.apache.org/viewvc?rev=1734808=rev
Log:
Use reflection to detect the presence of SSLParameters#setUseCipherSuitesOrder, 
which is a java 8 method

Modified:

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java?rev=1734808=1734807=1734808=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java 
(original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java 
Sun Mar 13 14:04:10 2016
@@ -16,6 +16,8 @@
  */
 package org.apache.tomcat.util.net;
 
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
@@ -146,7 +148,20 @@ public abstract class AbstractJsseEndpoi
 engine.setEnabledProtocols(sslHostConfig.getEnabledProtocols());
 
 SSLParameters sslParameters = engine.getSSLParameters();
-
sslParameters.setUseCipherSuitesOrder(sslHostConfig.getHonorCipherOrder());
+if (sslHostConfig.getHonorCipherOrder()) {
+// SSLParameters#setUseCipherSuiteOrder is java 8 and upwards
+try {
+Method m = SSLParameters.class.getMethod(
+"setUseCipherSuitesOrder", Boolean.TYPE);
+m.invoke(sslParameters, Boolean.TRUE);
+} catch (NoSuchMethodException | SecurityException
+| IllegalAccessException | IllegalArgumentException
+| InvocationTargetException e) {
+throw new UnsupportedOperationException(
+
sm.getString("endpoint.jsse.cannotHonorServerCipherOrder"),
+e);
+}
+}
 // In case the getter returns a defensive copy
 engine.setSSLParameters(sslParameters);
 

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties?rev=1734808=1734807=1734808=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties 
(original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties 
Sun Mar 13 14:04:10 2016
@@ -77,6 +77,7 @@ endpoint.apr.pollUnknownEvent=A socket w
 endpoint.apr.tooManyCertFiles=More certificate files were configured than the 
AprEndpoint can handle
 endpoint.apr.remoteport=APR socket [{0}] opened with remote port [{1}]
 endpoint.jsse.noSslContext=No SSLContext could be found for the host name [{0}]
+endpoint.jsse.cannotHonorServerCipherOrder=Java Runtime does not support 
"useServerCipherSuitesOrder". You must use Java 8 or later to use this feature.
 endpoint.nio.selectorCloseFail=Failed to close selector when closing the poller
 endpoint.nio.timeoutCme=Exception during processing of timeouts. The code has 
been checked repeatedly and no concurrent modification has been found. If you 
are able to repeat this error please open a Tomcat bug and provide the steps to 
reproduce.
 endpoint.nio2.exclusiveExecutor=The NIO2 connector requires an exclusive 
executor to operate properly on shutdown

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java?rev=1734808=1734807=1734808=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java Sun 
Mar 13 14:04:10 2016
@@ -25,6 +25,7 @@ import java.util.Map;
 import java.util.Set;
 
 import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLParameters;
 import javax.net.ssl.TrustManagerFactory;
 
 import org.apache.juli.logging.Log;
@@ -347,6 +348,11 @@ public class SSLHostConfig {
 
 
 public void setHonorCipherOrder(boolean honorCipherOrder) {
+try {
+SSLParameters.class.getMethod("setUseCipherSuitesOrder", 
Boolean.TYPE);
+} catch (NoSuchMethodException | SecurityException e) {
+throw new 
UnsupportedOperationException(sm.getString("endpoint.jsse.cannotHonorServerCipherOrder"),
 e);
+}
 this.honorCipherOrder = honorCipherOrder;
 }
 

Re: svn commit: r1734771 - in /tomcat/tc8.5.x: ./ branches/ tags/ trunk/

[Felix Schumacher]

Am 13.03.2016 um 14:40 schrieb Mark Thomas:

On 13/03/2016 13:04, Felix Schumacher wrote:

Am 13.03.2016 um 12:16 schrieb Rémy Maucherat:

2016-03-13 11:52 GMT+01:00 Felix Schumacher <
felix.schumac...@internetallee.de>:


Am 13.03.2016 um 11:31 schrieb Rémy Maucherat:


2016-03-13 11:01 GMT+01:00 Mark Thomas :

The task list is (probably):

- Switch to Java 7 for source and target
- Cleanup "9" version numbers in various places
- Resolve Java 7 issues
- Replace javax.servlet API with the classes from Tomcat 8.0

   From that list, what can I do without causing conflicts ?


If you can start on the Java 7 issues that would be great. I'll
work on
the Servlet API stuff next and then help out with Java 7 if necessary.

Ok, I'll do that.


I could help, too.

I think I will try  to convert the RestCsrfPreventionFilter.

Sure, go ahead and fix any you find.

What should we do with SSLParameters#setUseCipherSuitesOrder(boolean) in
AbstractJsseEndpoint?

What does Tomcat 8 do in the equivalent code?
It uses reflection to test for java 8. Will look into it. (Should have 
looked closer in the first place)


Felix


Mark


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




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

Re: svn commit: r1734771 - in /tomcat/tc8.5.x: ./ branches/ tags/ trunk/

[Mark Thomas]

On 13/03/2016 13:04, Felix Schumacher wrote:
> Am 13.03.2016 um 12:16 schrieb Rémy Maucherat:
>> 2016-03-13 11:52 GMT+01:00 Felix Schumacher <
>> felix.schumac...@internetallee.de>:
>>
>>> Am 13.03.2016 um 11:31 schrieb Rémy Maucherat:
>>>
 2016-03-13 11:01 GMT+01:00 Mark Thomas :

 The task list is (probably):
>> - Switch to Java 7 for source and target
>> - Cleanup "9" version numbers in various places
>> - Resolve Java 7 issues
>> - Replace javax.servlet API with the classes from Tomcat 8.0
>>
>>   From that list, what can I do without causing conflicts ?
>>
> If you can start on the Java 7 issues that would be great. I'll
> work on
> the Servlet API stuff next and then help out with Java 7 if necessary.
>
> Ok, I'll do that.
>
 I could help, too.
>>> I think I will try  to convert the RestCsrfPreventionFilter.
>>>
>>> Sure, go ahead and fix any you find.
> What should we do with SSLParameters#setUseCipherSuitesOrder(boolean) in
> AbstractJsseEndpoint?

What does Tomcat 8 do in the equivalent code?

Mark


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

svn commit: r1734806 - /tomcat/trunk/java/org/apache/catalina/ssi/SSIFilter.java

[markt]

Author: markt
Date: Sun Mar 13 13:37:53 2016
New Revision: 1734806

URL: http://svn.apache.org/viewvc?rev=1734806=rev
Log:
Remove unnecessary code

Modified:
tomcat/trunk/java/org/apache/catalina/ssi/SSIFilter.java

Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSIFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIFilter.java?rev=1734806=1734805=1734806=diff
==
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSIFilter.java Sun Mar 13 
13:37:53 2016
@@ -169,9 +169,4 @@ public class SSIFilter extends GenericFi
 out.write(bytes);
 }
 }
-
-@Override
-public void destroy() {
-// NOOP
-}
 }



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

svn commit: r1734805 [1/2] - in /tomcat/tc8.5.x/trunk: java/javax/el/ java/javax/servlet/ java/javax/servlet/http/ java/javax/servlet/resources/ java/org/apache/catalina/connector/ java/org/apache/cat

[markt]

Author: markt
Date: Sun Mar 13 13:37:40 2016
New Revision: 1734805

URL: http://svn.apache.org/viewvc?rev=1734805=rev
Log:
First pass at reverting Servlet 3.0 to Servlet 4.0.DRAFT changes

Removed:
tomcat/tc8.5.x/trunk/java/javax/servlet/GenericFilter.java
tomcat/tc8.5.x/trunk/java/javax/servlet/http/HttpFilter.java
tomcat/tc8.5.x/trunk/java/javax/servlet/http/Mapping.java
tomcat/tc8.5.x/trunk/java/javax/servlet/http/MappingMatch.java
tomcat/tc8.5.x/trunk/java/javax/servlet/http/PushBuilder.java
tomcat/tc8.5.x/trunk/java/javax/servlet/resources/javaee_8.xsd
tomcat/tc8.5.x/trunk/java/javax/servlet/resources/web-app_4_0.xsd
tomcat/tc8.5.x/trunk/java/javax/servlet/resources/web-common_4_0.xsd
tomcat/tc8.5.x/trunk/java/javax/servlet/resources/web-fragment_4_0.xsd
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationMapping.java

tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationMapping.java
Modified:
tomcat/tc8.5.x/trunk/java/javax/el/ImportHandler.java
tomcat/tc8.5.x/trunk/java/javax/servlet/Filter.java
tomcat/tc8.5.x/trunk/java/javax/servlet/ServletContext.java
tomcat/tc8.5.x/trunk/java/javax/servlet/ServletContextAttributeListener.java
tomcat/tc8.5.x/trunk/java/javax/servlet/ServletContextListener.java
tomcat/tc8.5.x/trunk/java/javax/servlet/ServletRegistration.java
tomcat/tc8.5.x/trunk/java/javax/servlet/ServletRequest.java
tomcat/tc8.5.x/trunk/java/javax/servlet/ServletRequestAttributeListener.java
tomcat/tc8.5.x/trunk/java/javax/servlet/ServletRequestListener.java
tomcat/tc8.5.x/trunk/java/javax/servlet/ServletRequestWrapper.java
tomcat/tc8.5.x/trunk/java/javax/servlet/SingleThreadModel.java
tomcat/tc8.5.x/trunk/java/javax/servlet/UnavailableException.java
tomcat/tc8.5.x/trunk/java/javax/servlet/http/HttpServletRequest.java
tomcat/tc8.5.x/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java
tomcat/tc8.5.x/trunk/java/javax/servlet/http/HttpServletResponse.java
tomcat/tc8.5.x/trunk/java/javax/servlet/http/HttpServletResponseWrapper.java
tomcat/tc8.5.x/trunk/java/javax/servlet/http/HttpSession.java

tomcat/tc8.5.x/trunk/java/javax/servlet/http/HttpSessionActivationListener.java

tomcat/tc8.5.x/trunk/java/javax/servlet/http/HttpSessionAttributeListener.java
tomcat/tc8.5.x/trunk/java/javax/servlet/http/HttpSessionBindingListener.java
tomcat/tc8.5.x/trunk/java/javax/servlet/http/HttpSessionContext.java
tomcat/tc8.5.x/trunk/java/javax/servlet/http/HttpSessionListener.java
tomcat/tc8.5.x/trunk/java/javax/servlet/http/HttpUtils.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Request.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/RequestFacade.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/CorsFilter.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/WebdavFixFilter.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/mapper/Mapper.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/mapper/MappingData.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/ssi/SSIFilter.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/server/WsFilter.java

tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestNamingContextListener.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestStandardContext.java

tomcat/tc8.5.x/trunk/test/org/apache/catalina/filters/TesterHttpServletRequest.java

tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/DuplicateMappingParamFilter.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/ParamFilter.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/TestListener.java
tomcat/tc8.5.x/trunk/test/org/apache/coyote/http2/Http2TestBase.java

tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestELInterpreterFactory.java

tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java

tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java

tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java

tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardContextListener.java

Modified: tomcat/tc8.5.x/trunk/java/javax/el/ImportHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/javax/el/ImportHandler.java?rev=1734805=1734804=1734805=diff
==
--- tomcat/tc8.5.x/trunk/java/javax/el/ImportHandler.java (original)
+++ 

svn commit: r1734805 [2/2] - in /tomcat/tc8.5.x/trunk: java/javax/el/ java/javax/servlet/ java/javax/servlet/http/ java/javax/servlet/resources/ java/org/apache/catalina/connector/ java/org/apache/cat

[markt]

Modified: 
tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java?rev=1734805=1734804=1734805=diff
==
--- 
tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
 (original)
+++ 
tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
 Sun Mar 13 13:37:40 2016
@@ -23,8 +23,9 @@ import java.util.Enumeration;
 import java.util.List;
 import java.util.StringTokenizer;
 
+import javax.servlet.Filter;
 import javax.servlet.FilterChain;
-import javax.servlet.GenericFilter;
+import javax.servlet.FilterConfig;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
@@ -38,9 +39,7 @@ import javax.servlet.http.HttpServletRes
  * @author Amy Roh
  * @author Dmitri Valdin
  */
-public class CompressionFilter extends GenericFilter {
-
-private static final long serialVersionUID = 1L;
+public class CompressionFilter implements Filter {
 
 /**
  * Minimal reasonable threshold.
@@ -72,14 +71,21 @@ public class CompressionFilter extends G
  */
 private int debug = 0;
 
+/**
+ * Place this filter into service.
+ *
+ * @param filterConfig The filter configuration object
+ */
 @Override
-public void init() {
-String str = getInitParameter("debug");
-if (str != null) {
-debug = Integer.parseInt(str);
+public void init(FilterConfig filterConfig) {
+
+if (filterConfig != null) {
+String value = filterConfig.getInitParameter("debug");
+if (value!=null) {
+debug = Integer.parseInt(value);
 }
 
-str = getInitParameter("compressionThreshold");
+String str = filterConfig.getInitParameter("compressionThreshold");
 if (str != null) {
 compressionThreshold = Integer.parseInt(str);
 if (compressionThreshold != 0 && compressionThreshold < 
minThreshold) {
@@ -91,7 +97,7 @@ public class CompressionFilter extends G
 }
 }
 
-str = getInitParameter("compressionBuffer");
+str = filterConfig.getInitParameter("compressionBuffer");
 if (str != null) {
 compressionBuffer = Integer.parseInt(str);
 if (compressionBuffer < minBuffer) {
@@ -103,7 +109,7 @@ public class CompressionFilter extends G
 }
 }
 
-str = getInitParameter("compressionMimeTypes");
+str = filterConfig.getInitParameter("compressionMimeTypes");
 if (str != null) {
 List values = new ArrayList<>();
 StringTokenizer st = new StringTokenizer(str, ",");
@@ -129,6 +135,15 @@ public class CompressionFilter extends G
 }
 }
 
+}
+
+/**
+* Take this filter out of service.
+*/
+@Override
+public void destroy() {
+}
+
 /**
  * The doFilter method of the Filter is called by the 
container
  * each time a request/response pair is passed through the chain due

Modified: 
tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java?rev=1734805=1734804=1734805=diff
==
--- 
tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java
 (original)
+++ 
tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java
 Sun Mar 13 13:37:40 2016
@@ -20,8 +20,9 @@ package filters;
 
 import java.io.IOException;
 
+import javax.servlet.Filter;
 import javax.servlet.FilterChain;
-import javax.servlet.GenericFilter;
+import javax.servlet.FilterConfig;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
@@ -42,10 +43,10 @@ import javax.servlet.ServletResponse;
  *
  * @author Craig McClanahan
  */
-public final class ExampleFilter extends GenericFilter {
+public final class ExampleFilter implements Filter {
 
 
-private static final long serialVersionUID = 1L;
+// - Instance Variables
 
 
 /**
@@ -55,6 +56,28 @@ public final class ExampleFilter extends
 
 
 /**
+ * The filter configuration object we are associated with.  If this value
+ * is null, this filter instance is not currently configured.
+ */
+private FilterConfig filterConfig = null;
+
+
+// - Public Methods
+
+
+/**
+ * Take this filter out of service.
+ */
+@Override
+public void destroy() {
+
+this.attribute = 

Re: svn commit: r1734771 - in /tomcat/tc8.5.x: ./ branches/ tags/ trunk/

[Felix Schumacher]

Am 13.03.2016 um 14:04 schrieb Felix Schumacher:

Am 13.03.2016 um 12:16 schrieb Rémy Maucherat:

2016-03-13 11:52 GMT+01:00 Felix Schumacher <
felix.schumac...@internetallee.de>:


Am 13.03.2016 um 11:31 schrieb Rémy Maucherat:


2016-03-13 11:01 GMT+01:00 Mark Thomas :

The task list is (probably):

- Switch to Java 7 for source and target
- Cleanup "9" version numbers in various places
- Resolve Java 7 issues
- Replace javax.servlet API with the classes from Tomcat 8.0

  From that list, what can I do without causing conflicts ?

If you can start on the Java 7 issues that would be great. I'll 
work on
the Servlet API stuff next and then help out with Java 7 if 
necessary.


Ok, I'll do that.


I could help, too.

I think I will try  to convert the RestCsrfPreventionFilter.

Sure, go ahead and fix any you find.
What should we do with SSLParameters#setUseCipherSuitesOrder(boolean) 
in AbstractJsseEndpoint?


That seems the last java 7 related issue in normal tomcat classes.

I will look at the webapps code now.
The webapps issues are missing destroy() methods and usage of 
GenericFilter in the filters.

I think these should be adressed, once the javax.servlet parts are resolved.

Felix


Felix

Rémy




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




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

Re: svn commit: r1734771 - in /tomcat/tc8.5.x: ./ branches/ tags/ trunk/

[Felix Schumacher]

Am 13.03.2016 um 12:16 schrieb Rémy Maucherat:

2016-03-13 11:52 GMT+01:00 Felix Schumacher <
felix.schumac...@internetallee.de>:


Am 13.03.2016 um 11:31 schrieb Rémy Maucherat:


2016-03-13 11:01 GMT+01:00 Mark Thomas :

The task list is (probably):

- Switch to Java 7 for source and target
- Cleanup "9" version numbers in various places
- Resolve Java 7 issues
- Replace javax.servlet API with the classes from Tomcat 8.0

  From that list, what can I do without causing conflicts ?


If you can start on the Java 7 issues that would be great. I'll work on
the Servlet API stuff next and then help out with Java 7 if necessary.

Ok, I'll do that.


I could help, too.

I think I will try  to convert the RestCsrfPreventionFilter.

Sure, go ahead and fix any you find.
What should we do with SSLParameters#setUseCipherSuitesOrder(boolean) in 
AbstractJsseEndpoint?


That seems the last java 7 related issue in normal tomcat classes.

I will look at the webapps code now.

Felix

Rémy




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

svn commit: r1734802 - /tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java

[fschumacher]

Author: fschumacher
Date: Sun Mar 13 12:49:41 2016
New Revision: 1734802

URL: http://svn.apache.org/viewvc?rev=1734802=rev
Log:
Convert stream-api to for loop, so it can be used with java 7

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

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java?rev=1734802=1734801=1734802=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java 
Sun Mar 13 12:49:41 2016
@@ -1388,7 +1388,16 @@ public class Http2UpgradeHandler extends
 }
 
 public long getRoundTripTimeNano() {
-return (long) roundTripTimes.stream().mapToLong(x -> 
x.longValue()).average().orElse(0);
+long sum = 0;
+long count = 0;
+for (Long roundTripTime: roundTripTimes) {
+sum += roundTripTime.longValue();
+count++;
+}
+if (count > 0) {
+return sum / count;
+}
+return 0;
 }
 }
 



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

svn commit: r1734801 - in /tomcat/tc8.0.x/trunk/java/javax: el/CompositeELResolver.java servlet/ServletContext.java servlet/jsp/el/ScopedAttributeELResolver.java websocket/SendResult.java

[markt]

Author: markt
Date: Sun Mar 13 12:46:36 2016
New Revision: 1734801

URL: http://svn.apache.org/viewvc?rev=1734801=rev
Log:
Back-port clean-up and Javadoc fixes from trunk to simplify diff with new 8.5.x 
release branch

Modified:
tomcat/tc8.0.x/trunk/java/javax/el/CompositeELResolver.java
tomcat/tc8.0.x/trunk/java/javax/servlet/ServletContext.java

tomcat/tc8.0.x/trunk/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java
tomcat/tc8.0.x/trunk/java/javax/websocket/SendResult.java

Modified: tomcat/tc8.0.x/trunk/java/javax/el/CompositeELResolver.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/javax/el/CompositeELResolver.java?rev=1734801=1734800=1734801=diff
==
--- tomcat/tc8.0.x/trunk/java/javax/el/CompositeELResolver.java (original)
+++ tomcat/tc8.0.x/trunk/java/javax/el/CompositeELResolver.java Sun Mar 13 
12:46:36 2016
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package javax.el;
 
 import java.beans.FeatureDescriptor;
@@ -27,8 +26,7 @@ public class CompositeELResolver extends
 static {
 Class clazz = null;
 try {
-clazz =
-
Class.forName("javax.servlet.jsp.el.ScopedAttributeELResolver");
+clazz = 
Class.forName("javax.servlet.jsp.el.ScopedAttributeELResolver");
 } catch (ClassNotFoundException e) {
 // Ignore. This is expected if using the EL stand-alone
 }
@@ -61,9 +59,8 @@ public class CompositeELResolver extends
 public Object getValue(ELContext context, Object base, Object property) {
 context.setPropertyResolved(false);
 int sz = this.size;
-Object result = null;
 for (int i = 0; i < sz; i++) {
-result = this.resolvers[i].getValue(context, base, property);
+Object result = this.resolvers[i].getValue(context, base, 
property);
 if (context.isPropertyResolved()) {
 return result;
 }
@@ -79,10 +76,8 @@ public class CompositeELResolver extends
 Class[] paramTypes, Object[] params) {
 context.setPropertyResolved(false);
 int sz = this.size;
-Object obj;
 for (int i = 0; i < sz; i++) {
-obj = this.resolvers[i].invoke(context, base, method, paramTypes,
-params);
+Object obj = this.resolvers[i].invoke(context, base, method, 
paramTypes, params);
 if (context.isPropertyResolved()) {
 return obj;
 }
@@ -94,18 +89,15 @@ public class CompositeELResolver extends
 public Class getType(ELContext context, Object base, Object property) {
 context.setPropertyResolved(false);
 int sz = this.size;
-Class type;
 for (int i = 0; i < sz; i++) {
-type = this.resolvers[i].getType(context, base, property);
+Class type = this.resolvers[i].getType(context, base, property);
 if (context.isPropertyResolved()) {
 if (SCOPED_ATTRIBUTE_EL_RESOLVER != null &&
-SCOPED_ATTRIBUTE_EL_RESOLVER.isAssignableFrom(
-resolvers[i].getClass())) {
+
SCOPED_ATTRIBUTE_EL_RESOLVER.isAssignableFrom(resolvers[i].getClass())) {
 // Special case since
 // javax.servlet.jsp.el.ScopedAttributeELResolver will
 // always return Object.class for type
-Object value =
-resolvers[i].getValue(context, base, property);
+Object value = resolvers[i].getValue(context, base, 
property);
 if (value != null) {
 return value.getClass();
 }
@@ -117,8 +109,7 @@ public class CompositeELResolver extends
 }
 
 @Override
-public void setValue(ELContext context, Object base, Object property,
-Object value) {
+public void setValue(ELContext context, Object base, Object property, 
Object value) {
 context.setPropertyResolved(false);
 int sz = this.size;
 for (int i = 0; i < sz; i++) {
@@ -133,9 +124,8 @@ public class CompositeELResolver extends
 public boolean isReadOnly(ELContext context, Object base, Object property) 
{
 context.setPropertyResolved(false);
 int sz = this.size;
-boolean readOnly = false;
 for (int i = 0; i < sz; i++) {
-readOnly = this.resolvers[i].isReadOnly(context, base, property);
+boolean readOnly = this.resolvers[i].isReadOnly(context, base, 
property);
 if (context.isPropertyResolved()) {
 return readOnly;
 }
@@ -150,12 +140,11 @@ public class CompositeELResolver extends
 
 @Override
 public Class getCommonPropertyType(ELContext context, 

svn commit: r1734800 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/coyote/http2/Http2UpgradeHandler.java

[fschumacher]

Author: fschumacher
Date: Sun Mar 13 12:41:25 2016
New Revision: 1734800

URL: http://svn.apache.org/viewvc?rev=1734800=rev
Log:
Use ConcurrentMap as interface instead of Map.

Merge r1734799 from /tomcat/trunk

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar 13 12:41:25 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785
+/tomcat/trunk:1734785,1734799

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java?rev=1734800=1734799=1734800=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java 
Sun Mar 13 12:41:25 2016
@@ -30,6 +30,7 @@ import java.util.Set;
 import java.util.TreeSet;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -138,7 +139,7 @@ public class Http2UpgradeHandler extends
 private final PingManager pingManager = new PingManager();
 private volatile int newStreamsSinceLastPrune = 0;
 // Tracking for when the connection is blocked (windowSize < 1)
-private final Map backLogStreams = new 
ConcurrentHashMap<>();
+private final ConcurrentMap backLogStreams = new 
ConcurrentHashMap<>();
 private long backLogSize = 0;
 
 



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

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

[fschumacher]

Author: fschumacher
Date: Sun Mar 13 12:39:50 2016
New Revision: 1734799

URL: http://svn.apache.org/viewvc?rev=1734799=rev
Log:
Use ConcurrentMap as interface instead of Map.

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=1734799=1734798=1734799=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Sun Mar 
13 12:39:50 2016
@@ -30,6 +30,7 @@ import java.util.Set;
 import java.util.TreeSet;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -138,7 +139,7 @@ public class Http2UpgradeHandler extends
 private final PingManager pingManager = new PingManager();
 private volatile int newStreamsSinceLastPrune = 0;
 // Tracking for when the connection is blocked (windowSize < 1)
-private final Map backLogStreams = new 
ConcurrentHashMap<>();
+private final ConcurrentMap backLogStreams = new 
ConcurrentHashMap<>();
 private long backLogSize = 0;
 
 



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

svn commit: r1734798 - /tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/FrameType.java

[fschumacher]

Author: fschumacher
Date: Sun Mar 13 12:35:24 2016
New Revision: 1734798

URL: http://svn.apache.org/viewvc?rev=1734798=rev
Log:
Convert usage of IntPredicate to something that is java 7 compatible

Modified:
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/FrameType.java

Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/FrameType.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/FrameType.java?rev=1734798=1734797=1734798=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/FrameType.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/FrameType.java Sun Mar 13 
12:35:24 2016
@@ -16,23 +16,21 @@
  */
 package org.apache.coyote.http2;
 
-import java.util.function.IntPredicate;
-
 import org.apache.tomcat.util.res.StringManager;
 
 public enum FrameType {
 
-DATA  (0,   false,  true, null,  false),
-HEADERS   (1,   false,  true, null,   true),
-PRIORITY  (2,   false,  true, (x) -> x == 5, false),
-RST   (3,   false,  true, (x) -> x == 4, false),
-SETTINGS  (4,true, false, (x) -> x % 6 == 0,  true),
-PUSH_PROMISE  (5,   false,  true, (x) -> x >= 4,  true),
-PING  (6,true, false, (x) -> x == 8, false),
-GOAWAY(7,true, false, (x) -> x >= 8, false),
-WINDOW_UPDATE (8,true,  true, (x) -> x == 4,  true),
-CONTINUATION  (9,   false,  true, null,   true),
-UNKNOWN   (256,  true,  true, null,  false);
+DATA  (0,   false,  true, null,   false),
+HEADERS   (1,   false,  true, null,true),
+PRIORITY  (2,   false,  true, equals(5),  false),
+RST   (3,   false,  true, equals(4),  false),
+SETTINGS  (4,true, false, dividableBy(6),  true),
+PUSH_PROMISE  (5,   false,  true, greaterOrEquals(4),  true),
+PING  (6,true, false, equals(8),  false),
+GOAWAY(7,true, false, greaterOrEquals(8), false),
+WINDOW_UPDATE (8,true,  true, equals(4),   true),
+CONTINUATION  (9,   false,  true, null,true),
+UNKNOWN   (256,  true,  true, null,   false);
 
 private static final StringManager sm = 
StringManager.getManager(FrameType.class);
 
@@ -106,4 +104,35 @@ public enum FrameType {
 return UNKNOWN;
 }
 }
+
+private interface IntPredicate {
+boolean test(int x);
+}
+
+private static IntPredicate greaterOrEquals(final int y) {
+return new IntPredicate() {
+@Override
+public boolean test(int x) {
+return x >= y;
+}
+};
+}
+
+private static IntPredicate equals(final int y) {
+return new IntPredicate() {
+@Override
+public boolean test(int x) {
+return x == y;
+}
+};
+}
+
+private static IntPredicate dividableBy(final int y) {
+return new IntPredicate() {
+@Override
+public boolean test(int x) {
+return x % y == 0;
+}
+};
+}
 }



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

svn commit: r1734793 - /tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/ConnectionSettingsBase.java

[fschumacher]

Author: fschumacher
Date: Sun Mar 13 12:10:06 2016
New Revision: 1734793

URL: http://svn.apache.org/viewvc?rev=1734793=rev
Log:
Use Math.min and Math.max instead of Long.min/max as these are java 8, only.

Modified:

tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/ConnectionSettingsBase.java

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/ConnectionSettingsBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/ConnectionSettingsBase.java?rev=1734793=1734792=1734793=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/ConnectionSettingsBase.java 
(original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/ConnectionSettingsBase.java 
Sun Mar 13 12:10:06 2016
@@ -138,7 +138,7 @@ public abstract class ConnectionSettings
 if (pendingValue == null) {
 return currentValue;
 } else {
-return Long.min(pendingValue.longValue(), currentValue);
+return Math.min(pendingValue.longValue(), currentValue);
 }
 }
 
@@ -159,7 +159,7 @@ public abstract class ConnectionSettings
 if (pendingValue == null) {
 return currentValue;
 } else {
-return Long.max(pendingValue.longValue(), currentValue);
+return Math.max(pendingValue.longValue(), currentValue);
 }
 }
 



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

svn commit: r1734791 - /tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java

[fschumacher]

Author: fschumacher
Date: Sun Mar 13 12:00:04 2016
New Revision: 1734791

URL: http://svn.apache.org/viewvc?rev=1734791=rev
Log:
Use o.a.t.u.c.b.Base64 instead of java 8 Base64 encoder.

Modified:

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java?rev=1734791=1734790=1734791=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
 (original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
 Sun Mar 13 12:00:04 2016
@@ -23,7 +23,6 @@ import java.security.cert.CertificateExc
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
-import java.util.Base64;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -43,6 +42,7 @@ import org.apache.tomcat.jni.Certificate
 import org.apache.tomcat.jni.Pool;
 import org.apache.tomcat.jni.SSL;
 import org.apache.tomcat.jni.SSLContext;
+import org.apache.tomcat.util.codec.binary.Base64;
 import org.apache.tomcat.util.net.AbstractEndpoint;
 import org.apache.tomcat.util.net.Constants;
 import org.apache.tomcat.util.net.SSLHostConfig;
@@ -53,6 +53,8 @@ import org.apache.tomcat.util.res.String
 
 public class OpenSSLContext implements org.apache.tomcat.util.net.SSLContext {
 
+private static final Base64 BASE64_ENCODER = new Base64(64, new byte[] 
{'\n'});
+
 private static final Log log = LogFactory.getLog(OpenSSLContext.class);
 
 // Note: this uses the main "net" package strings as many are common with 
APR
@@ -325,7 +327,7 @@ public class OpenSSLContext implements o
 X509Certificate certificate = 
keyManager.getCertificateChain(alias)[0];
 PrivateKey key = keyManager.getPrivateKey(alias);
 StringBuilder sb = new StringBuilder(BEGIN_KEY);
-sb.append(Base64.getMimeEncoder(64, new byte[] 
{'\n'}).encodeToString(key.getEncoded()));
+sb.append(BASE64_ENCODER.encodeToString(key.getEncoded()));
 sb.append(END_KEY);
 SSLContext.setCertificateRaw(ctx, certificate.getEncoded(), 
sb.toString().getBytes(StandardCharsets.US_ASCII), SSL.SSL_AIDX_RSA);
 }



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

svn commit: r1734789 - /tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/CustomObjectInputStream.java

[fschumacher]

Author: fschumacher
Date: Sun Mar 13 11:39:54 2016
New Revision: 1734789

URL: http://svn.apache.org/viewvc?rev=1734789=rev
Log:
Convert usage of Map#putIfAbsent to java 7

Modified:

tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/CustomObjectInputStream.java

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/CustomObjectInputStream.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/CustomObjectInputStream.java?rev=1734789=1734788=1734789=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/CustomObjectInputStream.java 
(original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/CustomObjectInputStream.java 
Sun Mar 13 11:39:54 2016
@@ -113,14 +113,15 @@ public final class CustomObjectInputStre
 }
 if (reportedClasses == null) {
 reportedClasses = Collections.newSetFromMap(new 
ConcurrentHashMap());
-Set original;
 synchronized (reportedClassCache) {
-original = reportedClassCache.putIfAbsent(classLoader, 
reportedClasses);
-}
-if (original != null) {
-// Concurrent attempts to create the new Set. Make sure all
-// threads use the first successfully added Set.
-reportedClasses = original;
+Set original = reportedClassCache.get(classLoader);
+if (original == null) {
+reportedClassCache.put(classLoader, reportedClasses);
+} else {
+// Concurrent attempts to create the new Set. Make sure all
+// threads use the first successfully added Set.
+reportedClasses = original;
+}
 }
 }
 this.reportedClasses = reportedClasses;



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

svn commit: r1734786 - in /tomcat/tc8.5.x/trunk: ./ build.xml java/org/apache/catalina/tribes/transport/SenderState.java

[fschumacher]

Author: fschumacher
Date: Sun Mar 13 11:30:27 2016
New Revision: 1734786

URL: http://svn.apache.org/viewvc?rev=1734786=rev
Log:
Use ConcurrentMap as interface instead of simple Map.

Merge r1734785 from /tomcat/trunk

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

tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/transport/SenderState.java

Propchange: tomcat/tc8.5.x/trunk/
--
svn:mergeinfo = /tomcat/trunk:1734785

Modified: tomcat/tc8.5.x/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/build.xml?rev=1734786=1734785=1734786=diff
==
--- tomcat/tc8.5.x/trunk/build.xml (original)
+++ tomcat/tc8.5.x/trunk/build.xml Sun Mar 13 11:30:27 2016
@@ -82,8 +82,8 @@
   
 
   
-  
-  
+  
+  
 
   
   

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/transport/SenderState.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/transport/SenderState.java?rev=1734786=1734785=1734786=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/transport/SenderState.java 
(original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/transport/SenderState.java 
Sun Mar 13 11:30:27 2016
@@ -16,8 +16,8 @@
  */
 package org.apache.catalina.tribes.transport;
 
-import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 
 import org.apache.catalina.tribes.Member;
 
@@ -27,7 +27,7 @@ public class SenderState {
 public static final int SUSPECT = 1;
 public static final int FAILING = 2;
 
-protected static final Map memberStates = new 
ConcurrentHashMap<>();
+protected static final ConcurrentMap memberStates = 
new ConcurrentHashMap<>();
 
 public static SenderState getSenderState(Member member) {
 return getSenderState(member, true);



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

svn commit: r1734785 - /tomcat/trunk/java/org/apache/catalina/tribes/transport/SenderState.java

[fschumacher]

Author: fschumacher
Date: Sun Mar 13 11:28:01 2016
New Revision: 1734785

URL: http://svn.apache.org/viewvc?rev=1734785=rev
Log:
Use ConcurrentMap as interface instead of simple Map.

Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/SenderState.java

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/transport/SenderState.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/SenderState.java?rev=1734785=1734784=1734785=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/SenderState.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/SenderState.java Sun 
Mar 13 11:28:01 2016
@@ -16,8 +16,8 @@
  */
 package org.apache.catalina.tribes.transport;
 
-import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 
 import org.apache.catalina.tribes.Member;
 
@@ -27,7 +27,7 @@ public class SenderState {
 public static final int SUSPECT = 1;
 public static final int FAILING = 2;
 
-protected static final Map memberStates = new 
ConcurrentHashMap<>();
+protected static final ConcurrentMap memberStates = 
new ConcurrentHashMap<>();
 
 public static SenderState getSenderState(Member member) {
 return getSenderState(member, true);



-
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,
 and has been outstanding for 6 runs.
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: 41 mins 32 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-7.0.x/tomcat-build-libs 
-Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x 
-Dtest.temp=output/test-tmp-NIO 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160313.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 -Dexe
 cute.test.bio=false 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160313-native-src.tar.gz
 -Dtest.reports=output/logs-NIO 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160313-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-20160313.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

Re: svn commit: r1734771 - in /tomcat/tc8.5.x: ./ branches/ tags/ trunk/

[Rémy Maucherat]

2016-03-13 11:52 GMT+01:00 Felix Schumacher <
felix.schumac...@internetallee.de>:

> Am 13.03.2016 um 11:31 schrieb Rémy Maucherat:
>
>> 2016-03-13 11:01 GMT+01:00 Mark Thomas :
>>
>> The task list is (probably):
 - Switch to Java 7 for source and target
 - Cleanup "9" version numbers in various places
 - Resolve Java 7 issues
 - Replace javax.servlet API with the classes from Tomcat 8.0

  From that list, what can I do without causing conflicts ?

>>> If you can start on the Java 7 issues that would be great. I'll work on
>>> the Servlet API stuff next and then help out with Java 7 if necessary.
>>>
>>> Ok, I'll do that.
>>>
>> I could help, too.
> I think I will try  to convert the RestCsrfPreventionFilter.
>
> Sure, go ahead and fix any you find.

Rémy

svn commit: r1734784 - /tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java

[fschumacher]

Author: fschumacher
Date: Sun Mar 13 11:12:47 2016
New Revision: 1734784

URL: http://svn.apache.org/viewvc?rev=1734784=rev
Log:
Replace usage of Map#putIfAbsent to comply with java 7

Modified:

tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java?rev=1734784=1734783=1734784=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java 
(original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java 
Sun Mar 13 11:12:47 2016
@@ -924,7 +924,9 @@ public abstract class WebappClassLoaderB
 ResourceEntry entry = new ResourceEntry();
 entry.lastModified = resource.getLastModified();
 synchronized(resourceEntries) {
-resourceEntries.putIfAbsent(path, entry);
+if (!resourceEntries.containsKey(path)) {
+resourceEntries.put(path, entry);
+}
 }
 }
 



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

svn commit: r1734783 - in /tomcat/tc8.5.x/trunk/java: javax/el/ org/apache/catalina/connector/ org/apache/catalina/filters/ org/apache/catalina/tribes/group/interceptors/ org/apache/catalina/util/ org

[remm]

Author: remm
Date: Sun Mar 13 10:59:08 2016
New Revision: 1734783

URL: http://svn.apache.org/viewvc?rev=1734783=rev
Log:
First pass form some Java 7 issues.

Modified:
tomcat/tc8.5.x/trunk/java/javax/el/ExpressionFactory.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/InputBuffer.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/CorsFilter.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/RestCsrfPreventionFilter.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/WebdavFixFilter.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/CustomObjectInputStream.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2Parser.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Stream.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/server/WsFilter.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/server/WsSessionListener.java

Modified: tomcat/tc8.5.x/trunk/java/javax/el/ExpressionFactory.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/javax/el/ExpressionFactory.java?rev=1734783=1734782=1734783=diff
==
--- tomcat/tc8.5.x/trunk/java/javax/el/ExpressionFactory.java (original)
+++ tomcat/tc8.5.x/trunk/java/javax/el/ExpressionFactory.java Sun Mar 13 
10:59:08 2016
@@ -325,7 +325,7 @@ public abstract class ExpressionFactory
 }
 
 public void setFactoryClass(Class clazz) {
-ref = new WeakReference<>(clazz);
+ref = new WeakReference(clazz);
 }
 }
 

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/InputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/InputBuffer.java?rev=1734783=1734782=1734783=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/InputBuffer.java 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/InputBuffer.java 
Sun Mar 13 10:59:08 2016
@@ -558,7 +558,7 @@ public class InputBuffer extends Reader
 }
 
 
-private static B2CConverter createConverter(Charset charset) throws 
IOException {
+private static B2CConverter createConverter(final Charset charset) throws 
IOException {
 if (SecurityUtil.isPackageProtectionEnabled()){
 try {
 return AccessController.doPrivileged(

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java?rev=1734783=1734782=1734783=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java 
Sun Mar 13 10:59:08 2016
@@ -567,7 +567,7 @@ public class OutputBuffer extends Writer
 }
 
 
-private static Charset getCharset(String encoding) throws IOException {
+private static Charset getCharset(final String encoding) throws 
IOException {
 if (Globals.IS_SECURITY_ENABLED) {
 try {
 return AccessController.doPrivileged(
@@ -591,7 +591,7 @@ public class OutputBuffer extends Writer
 }
 
 
-private static C2BConverter createConverter(Charset charset) throws 
IOException {
+private static C2BConverter createConverter(final Charset charset) throws 
IOException {
 if (Globals.IS_SECURITY_ENABLED){
 try {
 return AccessController.doPrivileged(

Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/CorsFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/CorsFilter.java?rev=1734783=1734782=1734783=diff
==
--- 

Re: svn commit: r1734771 - in /tomcat/tc8.5.x: ./ branches/ tags/ trunk/

[Felix Schumacher]

Am 13.03.2016 um 11:31 schrieb Rémy Maucherat:

2016-03-13 11:01 GMT+01:00 Mark Thomas :


The task list is (probably):
- Switch to Java 7 for source and target
- Cleanup "9" version numbers in various places
- Resolve Java 7 issues
- Replace javax.servlet API with the classes from Tomcat 8.0

 From that list, what can I do without causing conflicts ?

If you can start on the Java 7 issues that would be great. I'll work on
the Servlet API stuff next and then help out with Java 7 if necessary.

Ok, I'll do that.

I could help, too.
I think I will try  to convert the RestCsrfPreventionFilter.

Felix

Rémy




-
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-apr (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-apr has an issue affecting its community 
integration.
This issue affects 1 projects,
 and has been outstanding for 7 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc7.0.x-test-apr :  Tomcat 7.x, a web server implementing Java 
Servlet 3.0,
...


Full details are available at:

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

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp-src.jar.
 -DEBUG- Dependency on 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-APR
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-APR/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-apr/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 42 mins 30 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-7.0.x/tomcat-build-libs 
-Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x 
-Dtest.temp=output/test-tmp-APR 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160313.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=true -Dexec
 ute.test.bio=false 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160313-native-src.tar.gz
 -Dtest.reports=output/logs-APR 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160313-native-src.tar.gz
 -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-12/dest-20160313/lib 
-Dexecute.test.nio=false -Dtest.accesslog=true 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20160313.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

Re: svn commit: r1734771 - in /tomcat/tc8.5.x: ./ branches/ tags/ trunk/

[Rémy Maucherat]

2016-03-13 11:01 GMT+01:00 Mark Thomas :

> > The task list is (probably):
> > - Switch to Java 7 for source and target
> > - Cleanup "9" version numbers in various places
> > - Resolve Java 7 issues
> > - Replace javax.servlet API with the classes from Tomcat 8.0
> >
> > From that list, what can I do without causing conflicts ?
>
> If you can start on the Java 7 issues that would be great. I'll work on
> the Servlet API stuff next and then help out with Java 7 if necessary.
>
> Ok, I'll do that.

Rémy

Re: svn commit: r1734771 - in /tomcat/tc8.5.x: ./ branches/ tags/ trunk/

[Mark Thomas]

On 13/03/2016 09:57, Rémy Maucherat wrote:
> 2016-03-13 10:34 GMT+01:00 :
> 
>> Author: markt
>> Date: Sun Mar 13 09:34:22 2016
>> New Revision: 1734771
>>
>> URL: http://svn.apache.org/viewvc?rev=1734771=rev
>> Log:
>> Create new 8.5.x trunk from 9.0.0.M4 tag
>>
>> Added:
>> tomcat/tc8.5.x/
>> tomcat/tc8.5.x/branches/
>> tomcat/tc8.5.x/tags/
>> tomcat/tc8.5.x/trunk/
>>   - copied from r1734770, tomcat/tags/TOMCAT_9_0_0_M4/
>>
> The task list is (probably):
> - Switch to Java 7 for source and target
> - Cleanup "9" version numbers in various places
> - Resolve Java 7 issues
> - Replace javax.servlet API with the classes from Tomcat 8.0
> 
> From that list, what can I do without causing conflicts ?

If you can start on the Java 7 issues that would be great. I'll work on
the Servlet API stuff next and then help out with Java 7 if necessary.

Mark


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

svn commit: r1734774 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/util/ res/ide-support/eclipse/ res/maven/ webapps/docs/

[markt]

Author: markt
Date: Sun Mar 13 09:58:11 2016
New Revision: 1734774

URL: http://svn.apache.org/viewvc?rev=1734774=rev
Log:
First pass at updating version number to 8.5.x

Removed:
tomcat/tc8.5.x/trunk/TOMCAT-NEXT.txt
Modified:
tomcat/tc8.5.x/trunk/build.properties.default
tomcat/tc8.5.x/trunk/build.xml
tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/ServerInfo.java
tomcat/tc8.5.x/trunk/res/ide-support/eclipse/eclipse.project
tomcat/tc8.5.x/trunk/res/ide-support/eclipse/start-tomcat.launch
tomcat/tc8.5.x/trunk/res/ide-support/eclipse/stop-tomcat.launch
tomcat/tc8.5.x/trunk/res/maven/mvn-pub.xml
tomcat/tc8.5.x/trunk/res/maven/mvn.properties.default
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.5.x/trunk/webapps/docs/tomcat-docs.xsl

Modified: tomcat/tc8.5.x/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/build.properties.default?rev=1734774=1734773=1734774=diff
==
--- tomcat/tc8.5.x/trunk/build.properties.default (original)
+++ tomcat/tc8.5.x/trunk/build.properties.default Sun Mar 13 09:58:11 2016
@@ -23,8 +23,8 @@
 # -
 
 # - Version Control Flags -
-version.major=9
-version.minor=0
+version.major=8
+version.minor=5
 version.build=0
 version.patch=0
 version.suffix=.M4

Modified: tomcat/tc8.5.x/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/build.xml?rev=1734774=1734773=1734774=diff
==
--- tomcat/tc8.5.x/trunk/build.xml (original)
+++ tomcat/tc8.5.x/trunk/build.xml Sun Mar 13 09:58:11 2016
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
+
 
   
 

Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/ServerInfo.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/ServerInfo.java?rev=1734774=1734773=1734774=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/ServerInfo.java 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/ServerInfo.java Sun Mar 
13 09:58:11 2016
@@ -69,11 +69,11 @@ public class ServerInfo {
 ExceptionUtils.handleThrowable(t);
 }
 if (info == null)
-info = "Apache Tomcat 9.0.x-dev";
+info = "Apache Tomcat 8.5.x-dev";
 if (built == null)
 built = "unknown";
 if (number == null)
-number = "9.0.x";
+number = "8.5.x";
 
 serverInfo = info;
 serverBuilt = built;

Modified: tomcat/tc8.5.x/trunk/res/ide-support/eclipse/eclipse.project
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/res/ide-support/eclipse/eclipse.project?rev=1734774=1734773=1734774=diff
==
--- tomcat/tc8.5.x/trunk/res/ide-support/eclipse/eclipse.project (original)
+++ tomcat/tc8.5.x/trunk/res/ide-support/eclipse/eclipse.project Sun Mar 13 
09:58:11 2016
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 
-tomcat-9.0.x
+tomcat-8.5.x
 
 
 

Modified: tomcat/tc8.5.x/trunk/res/ide-support/eclipse/start-tomcat.launch
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/res/ide-support/eclipse/start-tomcat.launch?rev=1734774=1734773=1734774=diff
==
--- tomcat/tc8.5.x/trunk/res/ide-support/eclipse/start-tomcat.launch (original)
+++ tomcat/tc8.5.x/trunk/res/ide-support/eclipse/start-tomcat.launch Sun Mar 13 
09:58:11 2016
@@ -17,13 +17,13 @@
 -->
 
 
-
+
 
 
 
 
 
 
-
-
+
+
 

Modified: tomcat/tc8.5.x/trunk/res/ide-support/eclipse/stop-tomcat.launch
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/res/ide-support/eclipse/stop-tomcat.launch?rev=1734774=1734773=1734774=diff
==
--- tomcat/tc8.5.x/trunk/res/ide-support/eclipse/stop-tomcat.launch (original)
+++ tomcat/tc8.5.x/trunk/res/ide-support/eclipse/stop-tomcat.launch Sun Mar 13 
09:58:11 2016
@@ -17,13 +17,13 @@
 -->
 
 
-
+
 
 
 
 
 
 
-
-
+
+
 

Modified: tomcat/tc8.5.x/trunk/res/maven/mvn-pub.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/res/maven/mvn-pub.xml?rev=1734774=1734773=1734774=diff
==
--- tomcat/tc8.5.x/trunk/res/maven/mvn-pub.xml (original)
+++ tomcat/tc8.5.x/trunk/res/maven/mvn-pub.xml Sun Mar 13 09:58:11 2016
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
   
-
-  
-
-  
-Ensure that /WEB-INF/classes is never processed 

Re: svn commit: r1734771 - in /tomcat/tc8.5.x: ./ branches/ tags/ trunk/

[Rémy Maucherat]

2016-03-13 10:34 GMT+01:00 :

> Author: markt
> Date: Sun Mar 13 09:34:22 2016
> New Revision: 1734771
>
> URL: http://svn.apache.org/viewvc?rev=1734771=rev
> Log:
> Create new 8.5.x trunk from 9.0.0.M4 tag
>
> Added:
> tomcat/tc8.5.x/
> tomcat/tc8.5.x/branches/
> tomcat/tc8.5.x/tags/
> tomcat/tc8.5.x/trunk/
>   - copied from r1734770, tomcat/tags/TOMCAT_9_0_0_M4/
>
> The task list is (probably):
- Switch to Java 7 for source and target
- Cleanup "9" version numbers in various places
- Resolve Java 7 issues
- Replace javax.servlet API with the classes from Tomcat 8.0

>From that list, what can I do without causing conflicts ?

Rémy

[GUMP@vmgump]: Project tomcat-trunk-test-apr (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-apr has an issue affecting its community integration.
This issue affects 1 projects,
 and has been outstanding for 3 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-trunk-test-apr :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/index.html

That said, some information snippets are provided here.

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



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 50 mins 5 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-APR 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160313-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-trunk/dest-20160313/lib 
-Dtest.relaxTiming=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160313.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160313-nat
 ive-src.tar.gz -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true 
-Dexecute.test.nio=false 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20160313/bin/openssl
 -Dexecute.test.apr=true -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

svn commit: r1734771 - in /tomcat/tc8.5.x: ./ branches/ tags/ trunk/

[markt]

Author: markt
Date: Sun Mar 13 09:34:22 2016
New Revision: 1734771

URL: http://svn.apache.org/viewvc?rev=1734771=rev
Log:
Create new 8.5.x trunk from 9.0.0.M4 tag

Added:
tomcat/tc8.5.x/
tomcat/tc8.5.x/branches/
tomcat/tc8.5.x/tags/
tomcat/tc8.5.x/trunk/
  - copied from r1734770, tomcat/tags/TOMCAT_9_0_0_M4/


-
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-bio (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-bio has an issue affecting its community 
integration.
This issue affects 1 projects,
 and has been outstanding for 6 runs.
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-bio :  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-bio/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-BIO
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-BIO/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-bio/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-bio.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-bio (Type: Build)
Work ended in a state of : Failed
Elapsed: 32 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 
-Dbase.path=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-build-libs 
-Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x 
-Dtest.temp=output/test-tmp-BIO 
-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-20160313.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 -Dexe
 cute.test.bio=true 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160313-native-src.tar.gz
 -Dtest.reports=output/logs-BIO 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160313-native-src.tar.gz
 -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dexecute.test.nio=false -Dtest.accesslog=true 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20160313.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

[GUMP@vmgump]: Project tomcat-trunk-test-nio2 (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-nio2 has an issue affecting its community integration.
This issue affects 1 projects,
 and has been outstanding for 9 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-trunk-test-nio2 :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio2/index.html

That said, some information snippets are provided here.

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



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio2/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio2.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-nio2 (Type: Build)
Work ended in a state of : Failed
Elapsed: 45 mins 25 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-NIO2 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160313-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs 
-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-20160313.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160313-native-src.tar.gz
 -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true -Dexecute
 .test.nio=false 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20160313/bin/openssl
 -Dexecute.test.apr=false -Dtest.excludePerformance=true 
-Dexecute.test.nio2=true 
-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