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:
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:
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
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:
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
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
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
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
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
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
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:
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
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,
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:
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:
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:
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
¹
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
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
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:
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:
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:
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:
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:
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
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 <
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:
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
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
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:
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:
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
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:
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:
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:
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
-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
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
/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
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
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/
>
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:
>>
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:
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)
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:
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
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:
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
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
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:
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
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
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
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
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
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"
-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
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)
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:
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
-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
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
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:
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:
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:
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:
/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
67 matches
Mail list logo