[Bug 58178] Exception not passed to c:catch in custom jsp tag

[bugzilla]

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

--- Comment #5 from prashant  ---
Hello Mark, 
Is there way to patch the fix to 8.0.23? 
Could you please let us know the class/java files need to replaced in 8.0.23 to
make this work?

-- 
You are receiving this mail because:
You are the assignee for the bug.

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

[Bug 58178] Exception not passed to c:catch in custom jsp tag

[bugzilla]

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

--- Comment #6 from Mark Thomas  ---
The patches for 8.0.x are r1694503 and r1694548.

I would not recommend copying class files from one version to another. If you
really want to patch this in 8.0.23 then you need to checkout the 8.0.23 tag,
apply the two patches above and then build your patched version of 8.0.23 from
source.

I'd recommend not pathcing and upgrading to 8.0.latest instead.

-- 
You are receiving this mail because:
You are the assignee for the bug.

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

[GUMP@vmgump]: Project tomcat-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 7 runs.
The current state of this project is 'Failed', with reason 'Build Timed Out'.
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 timed out
 -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: 1 hour 1 sec
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar
 -Dtest.reports=output/logs-APR 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151009-native-src.tar.gz
 -Dexamples.sources.skip=true 
-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-20151009/lib 
-Dtest.relaxTiming=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151009.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151009-native-src.tar.gz
 -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -
 Dexecute.test.nio=false 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20151009/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-trunk/output/build/lib/catalina-tribes.jar:/srv/g

Early Access build 83 for JDK 9 and JDK 9 with Project Jigsaw are available for download.

[Rory O'Donnell]

Hi Mark/Mladen,

JDK 9 with Project Jigsaw Early Access build b83 is available for 
download at jdk9.java.net/jigsaw .


Notable changes:

 * The -Xoverride option has been extended and renamed to -Xpatch, and
   the -XaddReads option has been restored [1] (changesets
   04dd0430530e, 095fc622bf01).
 * ClassLoader::getPackage now works as it did previously, walking the
   class-loader hierarchy in order to find Package objects, which
   enables NetBeans to start up [2] (5805781b9370).
 * Class::getResource will now return a URL to a resource in a module,
   when invoked from code within that module (0fbe4c72638a).
 * The big module-summary table has been improved, and will now be
   posted with each build [3] (e922b207c170).


JDK 9 Early Access build b83 is available for download 
 , summary of  changes are listed here 
.


 * Request for G1 GC Feedback at wiki -
   https://wiki.openjdk.java.net/display/HotSpot/G1GC+Feedback
 * This wiki-page aims to outline the basic JVM parameters switching to
   G1GC, and how you can help collecting data comparing the G1GC and
   Parallel GC.

Rgds, Rory

[1]http://mail.openjdk.java.net/pipermail/jigsaw-dev/2015-September/004740.html
[2]http://mail.openjdk.java.net/pipermail/jigsaw-dev/2015-September/004730.html
[3]http://cr.openjdk.java.net/~mr/jigsaw/ea/module-summary.html


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

[Bug 58490] New: Webapp does not start when using web-fragments icw unpackWARs="false"

[bugzilla]

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

Bug ID: 58490
   Summary: Webapp does not start when using web-fragments icw
unpackWARs="false"
   Product: Tomcat 8
   Version: trunk
  Hardware: PC
OS: All
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: rgansev...@gmail.com

When I deploy a webapp that uses web-fragments it does not start when the host
is configured with unpackWARs="false".

With unpackWARs="true" the same webapp starts fine.

This can be shown on a clean install of tomcat8, deploy webfragments sample
from apache-geronimo.

The war can be downloaded from maven central:
http://search.maven.org/remotecontent?filepath=org/apache/geronimo/samples/javaee6/webfragment-javaee6-war/3.0.0/webfragment-javaee6-war-3.0.0.war

The only change in conf/server.xml is unpackWARs setting from true to false:

 



INFO: Deploying web application archive
/crypt/apache/tomcat/trunk/output/build/webapps/webfragment-javaee6-war-3.0.0.war
Oct 09, 2015 10:07:56 AM org.apache.catalina.startup.ContextConfig
processServletContainerInitializers
SEVERE: Failed to process JAR found at URL [/webfragment-javaee6-war-3.0.0] for
ServletContainerInitializers for context with name [{1}]
java.net.MalformedURLException: no !/ in spec
at java.net.URL.(URL.java:619)
at java.net.URL.(URL.java:482)
at java.net.URL.(URL.java:431)
at java.net.JarURLConnection.parseSpecs(JarURLConnection.java:179)
at java.net.JarURLConnection.(JarURLConnection.java:162)
at
sun.net.www.protocol.jar.JarURLConnection.(JarURLConnection.java:81)
at sun.net.www.protocol.jar.Handler.openConnection(Handler.java:41)
at java.net.URL.openConnection(URL.java:971)
at java.net.URL.openStream(URL.java:1037)
at
org.apache.catalina.startup.WebappServiceLoader.parseConfigFile(WebappServiceLoader.java:161)
at
org.apache.catalina.startup.WebappServiceLoader.load(WebappServiceLoader.java:118)
at
org.apache.catalina.startup.ContextConfig.processServletContainerInitializers(ContextConfig.java:1616)
at
org.apache.catalina.startup.ContextConfig.webConfig(ContextConfig.java:1128)
at
org.apache.catalina.startup.ContextConfig.configureStart(ContextConfig.java:771)
at
org.apache.catalina.startup.ContextConfig.lifecycleEvent(ContextConfig.java:305)
at
org.apache.catalina.util.LifecycleSupport.fireLifecycleEvent(LifecycleSupport.java:95)
at
org.apache.catalina.util.LifecycleBase.fireLifecycleEvent(LifecycleBase.java:90)
at
org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:5080)
at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:150)
at
org.apache.catalina.core.ContainerBase.addChildInternal(ContainerBase.java:725)
at org.apache.catalina.core.ContainerBase.addChild(ContainerBase.java:701)
at org.apache.catalina.core.StandardHost.addChild(StandardHost.java:717)
at org.apache.catalina.startup.HostConfig.deployWAR(HostConfig.java:945)
at
org.apache.catalina.startup.HostConfig$DeployWar.run(HostConfig.java:1798)
at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:471)
at java.util.concurrent.FutureTask.run(FutureTask.java:262)
at
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:744)
Caused by: java.lang.NullPointerException: no !/ in spec
at sun.net.www.protocol.jar.Handler.parseAbsoluteSpec(Handler.java:170)
at sun.net.www.protocol.jar.Handler.parseURL(Handler.java:150)
at java.net.URL.(URL.java:614)
... 28 more

-- 
You are receiving this mail because:
You are the assignee for the bug.

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

svn commit: r10752 [2/2] - in /dev/tomcat/tomcat-7/v7.0.65: ./ bin/ bin/embed/ bin/extras/ src/

[violetagg]

Added: dev/tomcat/tomcat-7/v7.0.65/bin/embed/apache-tomcat-7.0.65-embed.zip.md5
==
--- dev/tomcat/tomcat-7/v7.0.65/bin/embed/apache-tomcat-7.0.65-embed.zip.md5 
(added)
+++ dev/tomcat/tomcat-7/v7.0.65/bin/embed/apache-tomcat-7.0.65-embed.zip.md5 
Fri Oct  9 10:56:53 2015
@@ -0,0 +1 @@
+7b99b2cfa822bf9e4366e15d3a8dd2bb *apache-tomcat-7.0.65-embed.zip
\ No newline at end of file

Added: dev/tomcat/tomcat-7/v7.0.65/bin/embed/apache-tomcat-7.0.65-embed.zip.sha1
==
--- dev/tomcat/tomcat-7/v7.0.65/bin/embed/apache-tomcat-7.0.65-embed.zip.sha1 
(added)
+++ dev/tomcat/tomcat-7/v7.0.65/bin/embed/apache-tomcat-7.0.65-embed.zip.sha1 
Fri Oct  9 10:56:53 2015
@@ -0,0 +1 @@
+296f4cb897d06785f6eeb405a2907c9cc53cb81b *apache-tomcat-7.0.65-embed.zip
\ No newline at end of file

Added: dev/tomcat/tomcat-7/v7.0.65/bin/extras/catalina-jmx-remote.jar
==
Binary file - no diff available.

Propchange: dev/tomcat/tomcat-7/v7.0.65/bin/extras/catalina-jmx-remote.jar
--
svn:mime-type = application/octet-stream

Added: dev/tomcat/tomcat-7/v7.0.65/bin/extras/catalina-jmx-remote.jar.asc
==
--- dev/tomcat/tomcat-7/v7.0.65/bin/extras/catalina-jmx-remote.jar.asc (added)
+++ dev/tomcat/tomcat-7/v7.0.65/bin/extras/catalina-jmx-remote.jar.asc Fri Oct  
9 10:56:53 2015
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2
+
+iQIcBAABCgAGBQJWF30BAAoJECCLCrHWMBHHMmkQAJdC0vtkczgOaJgaZ+g+bRRw
+Tibxex3eleHknvaV6PW75vFFEzrQEmVZsz4SDC/bMhq9u6K3IkeKUFwVOuNfsfPg
+coL0nzWaFwCFYNe6YugfOSJjII+jZ58wtTxy+WExkbGwJwJb3ZCCDflmX1hsUZR0
+GwhLu5nplWXT8Z42uxEmcB/gWVB/qQNCWByWNB81Fylpqza1/q772nNhKqOjjhNh
+nKuuLXDPvtkHP9bq5Y1swEzGDvV7C2XIx1Dmm3TrM1ktT1J4qXpzWzwetL4ZDwTx
+GqhQSLZcALIwNGVrtYVp0NZ4OKfIB1nu0n1rWGELp87dXB+0szbothw3B6Tm6ptI
+zlvT7J5Pwsfn72Mfa6oClhW8npbCqMd0Pb0p5MY1/ebXTFUCY6VjGYEEK1exuGEQ
+/b9RXXebuxxi4mJ+iz1RB8z1h8oLslhs2cGjTLjzoB1UPGmm7QnaJY01IxB8HoDs
+XopjwW7yut90HwHJv2jrJ8c5u6Vi5OvqMjgG0fwXwN5VWH+vhDqB18wT3CkG+Ei2
+c5A/X+Z2NubeAnNn+WbeA+VK/wni4O1Fs+Rc1lO01uhqP9OJS63/q13vM3TUvXXS
+gwXrez7bEO6PLPVy78Pzu4HaTf+ra/YIDbuR8KlrjWFXOtH5FzfLvur2TzhU1gMC
+ddQe/n+0vMJV5cV5USMU
+=8jTJ
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-7/v7.0.65/bin/extras/catalina-jmx-remote.jar.md5
==
--- dev/tomcat/tomcat-7/v7.0.65/bin/extras/catalina-jmx-remote.jar.md5 (added)
+++ dev/tomcat/tomcat-7/v7.0.65/bin/extras/catalina-jmx-remote.jar.md5 Fri Oct  
9 10:56:53 2015
@@ -0,0 +1 @@
+88197ba473152d129485697429b8061d *catalina-jmx-remote.jar
\ No newline at end of file

Added: dev/tomcat/tomcat-7/v7.0.65/bin/extras/catalina-jmx-remote.jar.sha1
==
--- dev/tomcat/tomcat-7/v7.0.65/bin/extras/catalina-jmx-remote.jar.sha1 (added)
+++ dev/tomcat/tomcat-7/v7.0.65/bin/extras/catalina-jmx-remote.jar.sha1 Fri Oct 
 9 10:56:53 2015
@@ -0,0 +1 @@
+5ab4764ee4194d50baf2ff3636f1d4e6dcd24f5e *catalina-jmx-remote.jar
\ No newline at end of file

Added: dev/tomcat/tomcat-7/v7.0.65/bin/extras/catalina-ws.jar
==
Binary file - no diff available.

Propchange: dev/tomcat/tomcat-7/v7.0.65/bin/extras/catalina-ws.jar
--
svn:mime-type = application/octet-stream

Added: dev/tomcat/tomcat-7/v7.0.65/bin/extras/catalina-ws.jar.asc
==
--- dev/tomcat/tomcat-7/v7.0.65/bin/extras/catalina-ws.jar.asc (added)
+++ dev/tomcat/tomcat-7/v7.0.65/bin/extras/catalina-ws.jar.asc Fri Oct  9 
10:56:53 2015
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2
+
+iQIcBAABCgAGBQJWF30AAAoJECCLCrHWMBHHd4sP/0urvYRBhkqwFrayoozgUu5R
+3LnEKkwqv3n5L9ny5puGfyg1QSeCbm0uCQsxlC6vMZJcs4WDw2W8Euq8vKcbwmxq
+DmX0XCE0teAGDl4EHv0tpTkc2PYUNR2Q3+WTNbW1ViHWvoPUBvz2HtPyF1nUiZNb
+GlD0617SebpPOHOBtjT/uqSrZ5m4BC4NquTCDnMkpt0IXdbwpbLBi73e4Ah9ZAdX
+aZb9K6AqRnyHacVTkgkjC2Z29+CgUWG1apZXXAtk+jtcgGmRiN/L2BBYJiHD4v41
+7w8Z29l4tEugLYO64Cekpy1cMPHiwug7WzeFH781l6aDFZbgSxHW0tvrcLZVDkUa
+rrMcQUWx4cL7bU6TNTu4095+GW7W1IoBzuU6vn3ePh9aD7yOeU2q7wCqoTjC1p6b
+O8i43kXtwVJkQbXl2oX15dxNqvCHxgsqmBkCco4z+fTZuA+llz8HZYcZaudIihYf
+6TOjdnnKSKOgaSHLqWzs9VZbAWZgVE2N9AlUcTOYIw1rCJR3AxUkMv0qZ4iA+xiC
+q1qc3vo7SWO1sIFkB8UK7pvuhhrjB/d+UrdBpPndhJMBxf8kD09EfGmxmOpd3l20
+fBPh99N/UiVlyD6RiRUh7/ChhI7I68tgd4y/q6XO3/HSKRhDvJcGKvjIv99c/MbN
+uoXmv8oh74pq+biHezR5
+=Uhdn
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-7/v7.0.65/bin/extras/catalina-ws.jar.md5
===

svn commit: r10752 [1/2] - in /dev/tomcat/tomcat-7/v7.0.65: ./ bin/ bin/embed/ bin/extras/ src/

[violetagg]

Author: violetagg
Date: Fri Oct  9 10:56:53 2015
New Revision: 10752

Log:
Stage 7.0.65RC

Added:
dev/tomcat/tomcat-7/v7.0.65/
dev/tomcat/tomcat-7/v7.0.65/KEYS   (with props)
dev/tomcat/tomcat-7/v7.0.65/README.html   (with props)
dev/tomcat/tomcat-7/v7.0.65/RELEASE-NOTES
dev/tomcat/tomcat-7/v7.0.65/bin/
dev/tomcat/tomcat-7/v7.0.65/bin/README.html   (with props)
dev/tomcat/tomcat-7/v7.0.65/bin/apache-tomcat-7.0.65-deployer.tar.gz   
(with props)
dev/tomcat/tomcat-7/v7.0.65/bin/apache-tomcat-7.0.65-deployer.tar.gz.asc
dev/tomcat/tomcat-7/v7.0.65/bin/apache-tomcat-7.0.65-deployer.tar.gz.md5
dev/tomcat/tomcat-7/v7.0.65/bin/apache-tomcat-7.0.65-deployer.tar.gz.sha1
dev/tomcat/tomcat-7/v7.0.65/bin/apache-tomcat-7.0.65-deployer.zip   (with 
props)
dev/tomcat/tomcat-7/v7.0.65/bin/apache-tomcat-7.0.65-deployer.zip.asc
dev/tomcat/tomcat-7/v7.0.65/bin/apache-tomcat-7.0.65-deployer.zip.md5
dev/tomcat/tomcat-7/v7.0.65/bin/apache-tomcat-7.0.65-deployer.zip.sha1
dev/tomcat/tomcat-7/v7.0.65/bin/apache-tomcat-7.0.65-fulldocs.tar.gz   
(with props)
dev/tomcat/tomcat-7/v7.0.65/bin/apache-tomcat-7.0.65-fulldocs.tar.gz.asc
dev/tomcat/tomcat-7/v7.0.65/bin/apache-tomcat-7.0.65-fulldocs.tar.gz.md5
dev/tomcat/tomcat-7/v7.0.65/bin/apache-tomcat-7.0.65-fulldocs.tar.gz.sha1
dev/tomcat/tomcat-7/v7.0.65/bin/apache-tomcat-7.0.65-windows-i64.zip   
(with props)
dev/tomcat/tomcat-7/v7.0.65/bin/apache-tomcat-7.0.65-windows-i64.zip.asc
dev/tomcat/tomcat-7/v7.0.65/bin/apache-tomcat-7.0.65-windows-i64.zip.md5
dev/tomcat/tomcat-7/v7.0.65/bin/apache-tomcat-7.0.65-windows-i64.zip.sha1
dev/tomcat/tomcat-7/v7.0.65/bin/apache-tomcat-7.0.65-windows-x64.zip   
(with props)
dev/tomcat/tomcat-7/v7.0.65/bin/apache-tomcat-7.0.65-windows-x64.zip.asc
dev/tomcat/tomcat-7/v7.0.65/bin/apache-tomcat-7.0.65-windows-x64.zip.md5
dev/tomcat/tomcat-7/v7.0.65/bin/apache-tomcat-7.0.65-windows-x64.zip.sha1
dev/tomcat/tomcat-7/v7.0.65/bin/apache-tomcat-7.0.65-windows-x86.zip   
(with props)
dev/tomcat/tomcat-7/v7.0.65/bin/apache-tomcat-7.0.65-windows-x86.zip.asc
dev/tomcat/tomcat-7/v7.0.65/bin/apache-tomcat-7.0.65-windows-x86.zip.md5
dev/tomcat/tomcat-7/v7.0.65/bin/apache-tomcat-7.0.65-windows-x86.zip.sha1
dev/tomcat/tomcat-7/v7.0.65/bin/apache-tomcat-7.0.65.exe   (with props)
dev/tomcat/tomcat-7/v7.0.65/bin/apache-tomcat-7.0.65.exe.asc
dev/tomcat/tomcat-7/v7.0.65/bin/apache-tomcat-7.0.65.exe.md5
dev/tomcat/tomcat-7/v7.0.65/bin/apache-tomcat-7.0.65.exe.sha1
dev/tomcat/tomcat-7/v7.0.65/bin/apache-tomcat-7.0.65.tar.gz   (with props)
dev/tomcat/tomcat-7/v7.0.65/bin/apache-tomcat-7.0.65.tar.gz.asc
dev/tomcat/tomcat-7/v7.0.65/bin/apache-tomcat-7.0.65.tar.gz.md5
dev/tomcat/tomcat-7/v7.0.65/bin/apache-tomcat-7.0.65.tar.gz.sha1
dev/tomcat/tomcat-7/v7.0.65/bin/apache-tomcat-7.0.65.zip   (with props)
dev/tomcat/tomcat-7/v7.0.65/bin/apache-tomcat-7.0.65.zip.asc
dev/tomcat/tomcat-7/v7.0.65/bin/apache-tomcat-7.0.65.zip.md5
dev/tomcat/tomcat-7/v7.0.65/bin/apache-tomcat-7.0.65.zip.sha1
dev/tomcat/tomcat-7/v7.0.65/bin/embed/
dev/tomcat/tomcat-7/v7.0.65/bin/embed/apache-tomcat-7.0.65-embed.tar.gz   
(with props)
dev/tomcat/tomcat-7/v7.0.65/bin/embed/apache-tomcat-7.0.65-embed.tar.gz.asc
dev/tomcat/tomcat-7/v7.0.65/bin/embed/apache-tomcat-7.0.65-embed.tar.gz.md5
dev/tomcat/tomcat-7/v7.0.65/bin/embed/apache-tomcat-7.0.65-embed.tar.gz.sha1
dev/tomcat/tomcat-7/v7.0.65/bin/embed/apache-tomcat-7.0.65-embed.zip   
(with props)
dev/tomcat/tomcat-7/v7.0.65/bin/embed/apache-tomcat-7.0.65-embed.zip.asc
dev/tomcat/tomcat-7/v7.0.65/bin/embed/apache-tomcat-7.0.65-embed.zip.md5
dev/tomcat/tomcat-7/v7.0.65/bin/embed/apache-tomcat-7.0.65-embed.zip.sha1
dev/tomcat/tomcat-7/v7.0.65/bin/extras/
dev/tomcat/tomcat-7/v7.0.65/bin/extras/catalina-jmx-remote.jar   (with 
props)
dev/tomcat/tomcat-7/v7.0.65/bin/extras/catalina-jmx-remote.jar.asc
dev/tomcat/tomcat-7/v7.0.65/bin/extras/catalina-jmx-remote.jar.md5
dev/tomcat/tomcat-7/v7.0.65/bin/extras/catalina-jmx-remote.jar.sha1
dev/tomcat/tomcat-7/v7.0.65/bin/extras/catalina-ws.jar   (with props)
dev/tomcat/tomcat-7/v7.0.65/bin/extras/catalina-ws.jar.asc
dev/tomcat/tomcat-7/v7.0.65/bin/extras/catalina-ws.jar.md5
dev/tomcat/tomcat-7/v7.0.65/bin/extras/catalina-ws.jar.sha1
dev/tomcat/tomcat-7/v7.0.65/bin/extras/tomcat-juli-adapters.jar   (with 
props)
dev/tomcat/tomcat-7/v7.0.65/bin/extras/tomcat-juli-adapters.jar.asc
dev/tomcat/tomcat-7/v7.0.65/bin/extras/tomcat-juli-adapters.jar.md5
dev/tomcat/tomcat-7/v7.0.65/bin/extras/tomcat-juli-adapters.jar.sha1
dev/tomcat/tomcat-7/v7.0.65/bin/extras/tomcat-juli.jar   (with props)
dev/tomcat/tomcat-7/v7.0.65/bin/extras/tomcat-juli.jar.asc
dev/tomcat/tomcat-7/v7.0.65/bin/extras/tomcat-juli.jar.md5
dev/tomcat/tomcat-7/v7.0.65/bin/extras/tomcat-juli.jar.sha1
  

svn commit: r1707691 - in /tomcat/tc7.0.x/trunk: build.properties.default res/maven/mvn.properties.default webapps/docs/changelog.xml

[violetagg]

Author: violetagg
Date: Fri Oct  9 10:58:15 2015
New Revision: 1707691

URL: http://svn.apache.org/viewvc?rev=1707691&view=rev
Log:
Prep for next version

Modified:
tomcat/tc7.0.x/trunk/build.properties.default
tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc7.0.x/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.properties.default?rev=1707691&r1=1707690&r2=1707691&view=diff
==
--- tomcat/tc7.0.x/trunk/build.properties.default (original)
+++ tomcat/tc7.0.x/trunk/build.properties.default Fri Oct  9 10:58:15 2015
@@ -25,7 +25,7 @@
 # - Version Control Flags -
 version.major=7
 version.minor=0
-version.build=65
+version.build=66
 version.patch=0
 version.suffix=-dev
 

Modified: tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default?rev=1707691&r1=1707690&r2=1707691&view=diff
==
--- tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default (original)
+++ tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default Fri Oct  9 10:58:15 
2015
@@ -35,7 +35,7 @@ maven.asf.release.repo.url=https://repos
 maven.asf.release.repo.repositoryId=apache.releases
 
 # Release version info
-maven.asf.release.deploy.version=7.0.65
+maven.asf.release.deploy.version=7.0.66
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1707691&r1=1707690&r2=1707691&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Oct  9 10:58:15 2015
@@ -57,6 +57,8 @@
   They eventually become mixed with the numbered issues. (I.e., numbered
   issues do not "pop up" wrt. others).
 -->
+
+
 
   
 



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

Re: [VOTE] Release Apache Tomcat 8.0.28

[Felix Schumacher]

Am 7. Oktober 2015 21:13:07 MESZ, schrieb Mark Thomas :
>The proposed Apache Tomcat 8.0.28 release is now available for voting.
>
>The main changes since 8.0.27 are:
>
>- Allow file based configuration resources (e.g. key stores) to be
>  configured using URLs
>
>- Restore code signing to the Windows installer an uninstaller
>
>There is a smaller that usual collection of bug fixes, new features and
>performance improvements. For full details, see the changelog:
>http://svn.us.apache.org/repos/asf/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
>
>It can be obtained from:
>https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.28/
>The Maven staging repo is:
>https://repository.apache.org/content/repositories/orgapachetomcat-1052/
>The svn tag is:
>http://svn.apache.org/repos/asf/tomcat/tc8.0.x/tags/TOMCAT_8_0_28/
>
>The proposed 8.0.28 release is:
>[ ] Broken - do not release
>[x] Stable - go ahead and release as 8.0.28 (non-binding)

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


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

[VOTE] Release Apache Tomcat 7.0.65

[Violeta Georgieva]

The proposed Apache Tomcat 7.0.65 release is now available for voting.

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.65/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1053/
The svn tag is:
http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_65/

The proposed 7.0.65 release is:
[ ] Broken - do not release
[ ] Stable - go ahead and release as 7.0.65 Stable

Regards,
Violeta

svn commit: r1707706 - /tomcat/trunk/java/javax/servlet/ServletContext.java

[markt]

Author: markt
Date: Fri Oct  9 12:39:35 2015
New Revision: 1707706

URL: http://svn.apache.org/viewvc?rev=1707706&view=rev
Log:
Servlet 4.0.
Javadoc updates for ServletContext methods to clarify that null 
attribute/parameter names are not allowed.

Modified:
tomcat/trunk/java/javax/servlet/ServletContext.java

Modified: tomcat/trunk/java/javax/servlet/ServletContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletContext.java?rev=1707706&r1=1707705&r2=1707706&view=diff
==
--- tomcat/trunk/java/javax/servlet/ServletContext.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletContext.java Fri Oct  9 12:39:35 2015
@@ -430,6 +430,8 @@ public interface ServletContext {
  *whose value is requested
  * @return a String containing the value of the initialization
  * parameter
+ * @throws NullPointerException If the provided parameter name is
+ * null
  * @see ServletConfig#getInitParameter
  */
 public String getInitParameter(String name);
@@ -462,6 +464,8 @@ public interface ServletContext {
  *{@link javax.servlet.annotation.WebListener}. For example, a
  *{@link ServletContextListener} defined in a TLD would not be able to
  *use this method.
+ * @throws NullPointerException If the provided parameter name is
+ * null
  * @since Servlet 3.0
  */
 public boolean setInitParameter(String name, String value);
@@ -483,6 +487,8 @@ public interface ServletContext {
  *a String specifying the name of the attribute
  * @return an Object containing the value of the attribute, or
  * null if no attribute exists matching the given name
+ * @throws NullPointerException If the provided attribute name is
+ * null
  * @see ServletContext#getAttributeNames
  */
 public Object getAttribute(String name);
@@ -516,6 +522,8 @@ public interface ServletContext {
  *a String specifying the name of the attribute
  * @param object
  *an Object representing the attribute to be bound
+ * @throws NullPointerException If the provided attribute name is
+ * null
  */
 public void setAttribute(String name, Object object);
 



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

svn commit: r1707707 - in /tomcat/trunk/java: javax/servlet/ServletContext.java org/apache/catalina/core/ApplicationContext.java

[markt]

Author: markt
Date: Fri Oct  9 12:43:21 2015
New Revision: 1707707

URL: http://svn.apache.org/viewvc?rev=1707707&view=rev
Log:
Javadoc improvements.
Use inherited Javadoc since it has more information.

Modified:
tomcat/trunk/java/javax/servlet/ServletContext.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java

Modified: tomcat/trunk/java/javax/servlet/ServletContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletContext.java?rev=1707707&r1=1707706&r2=1707707&view=diff
==
--- tomcat/trunk/java/javax/servlet/ServletContext.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletContext.java Fri Oct  9 12:43:21 2015
@@ -58,6 +58,11 @@ public interface ServletContext {
  */
 public static final String ORDERED_LIBS = 
"javax.servlet.context.orderedLibs";
 
+/**
+ * Return the main path associated with this context.
+ *
+ * @since Servlet 2.5
+ */
 public String getContextPath();
 
 /**

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1707707&r1=1707706&r2=1707707&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Fri Oct  
9 12:43:21 2015
@@ -209,22 +209,12 @@ public class ApplicationContext
 
 // - ServletContext Methods
 
-/**
- * Return the value of the specified context attribute, if any;
- * otherwise return null.
- *
- * @param name Name of the context attribute to return
- */
 @Override
 public Object getAttribute(String name) {
 return (attributes.get(name));
 }
 
 
-/**
- * Return an enumeration of the names of the context attributes
- * associated with this context.
- */
 @Override
 public Enumeration getAttributeNames() {
 Set names = new HashSet<>();
@@ -233,16 +223,6 @@ public class ApplicationContext
 }
 
 
-/**
- * Return a ServletContext object that corresponds to a
- * specified URI on the server.  This method allows servlets to gain
- * access to the context for various parts of the server, and as needed
- * obtain RequestDispatcher objects or resources from the
- * context.  The given path must be absolute (beginning with a "/"),
- * and is interpreted based on our virtual host's document root.
- *
- * @param uri Absolute URI of a resource on the server
- */
 @Override
 public ServletContext getContext(String uri) {
 
@@ -304,21 +284,12 @@ public class ApplicationContext
 }
 
 
-/**
- * Return the main path associated with this context.
- */
 @Override
 public String getContextPath() {
 return context.getPath();
 }
 
 
-/**
- * Return the value of the specified initialization parameter, or
- * null if this parameter does not exist.
- *
- * @param name Name of the initialization parameter to retrieve
- */
 @Override
 public String getInitParameter(final String name) {
 // Special handling for XML settings as the context setting must
@@ -337,10 +308,6 @@ public class ApplicationContext
 }
 
 
-/**
- * Return the names of the context's initialization parameters, or an
- * empty enumeration if the context has no initialization parameters.
- */
 @Override
 public Enumeration getInitParameterNames() {
 Set names = new HashSet<>();



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

buildbot success in ASF Buildbot on tomcat-trunk

[buildbot]

The Buildbot has detected a restored build on builder tomcat-trunk while 
building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/tomcat-trunk/builds/408

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

Buildslave for this Build: silvanus_ubuntu

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

Build succeeded!

Sincerely,
 -The Buildbot




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

svn commit: r1707713 - in /tomcat/trunk: ./ java/javax/servlet/ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache/tomcat/util/descriptor/web/ res/META-INF/ test/javax/

[markt]

Author: markt
Date: Fri Oct  9 12:58:48 2015
New Revision: 1707713

URL: http://svn.apache.org/viewvc?rev=1707713&view=rev
Log:
Update Servlet version to 4.0.
This adds some TODOs that require updated XSDs before they can be completed.

Modified:
tomcat/trunk/RELEASE-NOTES
tomcat/trunk/build.xml
tomcat/trunk/java/javax/servlet/ServletContext.java
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/trunk/java/org/apache/catalina/core/Constants.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
tomcat/trunk/res/META-INF/servlet-api.jar.manifest
tomcat/trunk/test/javax/servlet/resources/TestSchemaValidation.java
tomcat/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java
tomcat/trunk/webapps/docs/class-loader-howto.xml
tomcat/trunk/webapps/docs/funcspecs/fs-default.xml
tomcat/trunk/webapps/docs/index.xml

Modified: tomcat/trunk/RELEASE-NOTES
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/RELEASE-NOTES?rev=1707713&r1=1707712&r2=1707713&view=diff
==
--- tomcat/trunk/RELEASE-NOTES (original)
+++ tomcat/trunk/RELEASE-NOTES Fri Oct  9 12:58:48 2015
@@ -77,7 +77,7 @@ for use by web applications (by placing
 * jasper.jar (Jasper 2 Compiler and Runtime)
 * jasper-el.jar (Jasper 2 EL implementation)
 * jsp-api.jar (JSP 2.3 API)
-* servlet-api.jar (Servlet 3.1 API)
+* servlet-api.jar (Servlet 4.0 API)
 * tomcat-api.jar (Interfaces shared by Catalina and Jasper)
 * tomcat-coyote.jar (Tomcat connectors and utility classes)
 * tomcat-dbcp.jar (package renamed database connection pool based on Commons 
DBCP)

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1707713&r1=1707712&r2=1707713&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Fri Oct  9 12:58:48 2015
@@ -44,7 +44,7 @@
   
 
   
-  
+  
   
   
   
@@ -706,7 +706,7 @@
   filesId="files.annotations-api"
   manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
 
-
+
 
 
-
+
 http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletContext.java?rev=1707713&r1=1707712&r2=1707713&view=diff
==
--- tomcat/trunk/java/javax/servlet/ServletContext.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletContext.java Fri Oct  9 12:58:48 2015
@@ -90,19 +90,19 @@ public interface ServletContext {
 
 /**
  * Returns the major version of the Java Servlet API that this servlet
- * container supports. All implementations that comply with Version 3.1 
must
- * have this method return the integer 3.
+ * container supports. All implementations that comply with Version 4.0 
must
+ * have this method return the integer 4.
  *
- * @return 3
+ * @return 4
  */
 public int getMajorVersion();
 
 /**
  * Returns the minor version of the Servlet API that this servlet container
- * supports. All implementations that comply with Version 3.1 must have 
this
- * method return the integer 1.
+ * supports. All implementations that comply with Version 4.0 must have 
this
+ * method return the integer 0.
  *
- * @return 1
+ * @return 0
  */
 public int getMinorVersion();
 

Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1707713&r1=1707712&r2=1707713&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Fri Oct  
9 12:58:48 2015
@@ -67,7 +67,7 @@ public class CoyoteAdapter implements Ad
 
 // -- Constants
 
-private static final String POWERED_BY = "Servlet/3.1 JSP/2.3 " +
+private static final String POWERED_BY = "Servlet/4.0 JSP/2.3 " +
 "(" + ServerInfo.getServerInfo() + " Java/" +
 System.getProperty("java.vm.vendor") + "/" +
 System.getProperty("java.runtime.version") + ")";

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1707713&r1=1707712&r2=1707713&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Fri Oct  
9 12:58:48 2015
@@ -324,25 +32

buildbot failure in ASF Buildbot on tomcat-trunk

[buildbot]

The Buildbot has detected a new failure on builder tomcat-trunk while building 
ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/tomcat-trunk/builds/409

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

Buildslave for this Build: silvanus_ubuntu

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

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




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

svn commit: r1707719 - /tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java

[markt]

Author: markt
Date: Fri Oct  9 13:16:28 2015
New Revision: 1707719

URL: http://svn.apache.org/viewvc?rev=1707719&view=rev
Log:
Javadoc improvements.
Use inherited Javadoc since it has more information.
Remove some excessive blank lines.

Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1707719&r1=1707718&r2=1707719&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Fri Oct  
9 13:16:28 2015
@@ -381,25 +381,12 @@ public class ApplicationContext
 }
 
 
-/**
- * Return the real path for a given virtual path, if possible; otherwise
- * return null.
- *
- * @param path The path to the desired resource
- */
 @Override
 public String getRealPath(String path) {
 return context.getRealPath(path);
 }
 
 
-/**
- * Return a RequestDispatcher instance that acts as a
- * wrapper for the resource at the given path.  The path must begin
- * with a "/" and is interpreted as relative to the current context root.
- *
- * @param path The path to the desired resource.
- */
 @Override
 public RequestDispatcher getRequestDispatcher(String path) {
 
@@ -484,17 +471,6 @@ public class ApplicationContext
 }
 
 
-
-/**
- * Return the URL to the resource that is mapped to a specified path.
- * The path must begin with a "/" and is interpreted as relative to the
- * current context root.
- *
- * @param path The path to the desired resource
- *
- * @exception MalformedURLException if the path is not given
- *  in the correct form
- */
 @Override
 public URL getResource(String path) throws MalformedURLException {
 
@@ -514,14 +490,6 @@ public class ApplicationContext
 }
 
 
-/**
- * Return the requested resource as an InputStream.  The
- * path must be specified according to the rules described under
- * getResource.  If no such resource can be identified,
- * return null.
- *
- * @param path The path to the desired resource.
- */
 @Override
 public InputStream getResourceAsStream(String path) {
 
@@ -561,14 +529,6 @@ public class ApplicationContext
 }
 
 
-/**
- * Return a Set containing the resource paths of resources member of the
- * specified collection. Each path will be a String starting with
- * a "/" character. Paths representing directories will end with a "/"
- * character.
- *
- * @param path Collection path
- */
 @Override
 public Set getResourcePaths(String path) {
 
@@ -590,43 +550,25 @@ public class ApplicationContext
 }
 
 
-/**
- * Return the name and version of the servlet container.
- */
 @Override
 public String getServerInfo() {
-
-return (ServerInfo.getServerInfo());
-
+return ServerInfo.getServerInfo();
 }
 
 
-/**
- * @deprecated As of Java Servlet API 2.1, with no direct replacement.
- */
 @Override
 @Deprecated
 public Servlet getServlet(String name) {
-
-return (null);
-
+return null;
 }
 
 
-/**
- * Return the display name of this web application.
- */
 @Override
 public String getServletContextName() {
-
-return (context.getDisplayName());
-
+return context.getDisplayName();
 }
 
 
-/**
- * @deprecated As of Java Servlet API 2.1, with no direct replacement.
- */
 @Override
 @Deprecated
 public Enumeration getServletNames() {
@@ -634,9 +576,6 @@ public class ApplicationContext
 }
 
 
-/**
- * @deprecated As of Java Servlet API 2.1, with no direct replacement.
- */
 @Override
 @Deprecated
 public Enumeration getServlets() {
@@ -644,56 +583,25 @@ public class ApplicationContext
 }
 
 
-/**
- * Writes the specified message to a servlet log file.
- *
- * @param message Message to be written
- */
 @Override
 public void log(String message) {
-
 context.getLogger().info(message);
-
 }
 
 
-/**
- * Writes the specified exception and message to a servlet log file.
- *
- * @param exception Exception to be reported
- * @param message Message to be written
- *
- * @deprecated As of Java Servlet API 2.1, use
- *  log(String, Throwable) instead
- */
 @Override
 @Deprecated
 public void log(Exception exception, String message) {
-
 context.getLogger().error(message, exception);
-
 }
 
 
-/**
- * Writes the specified message and exception to a servlet log file.
- *
- * @param message Message to be written
-  

svn commit: r1707720 - in /tomcat/trunk/java: javax/servlet/ServletContext.java org/apache/catalina/core/ApplicationContext.java

[markt]

Author: markt
Date: Fri Oct  9 13:21:53 2015
New Revision: 1707720

URL: http://svn.apache.org/viewvc?rev=1707720&view=rev
Log:
Javadoc improvements.
Use inherited Javadoc since it generally has more information. Fill in gaps 
using implementation Javadoc where available.

Modified:
tomcat/trunk/java/javax/servlet/ServletContext.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java

Modified: tomcat/trunk/java/javax/servlet/ServletContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletContext.java?rev=1707720&r1=1707719&r2=1707720&view=diff
==
--- tomcat/trunk/java/javax/servlet/ServletContext.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletContext.java Fri Oct  9 13:21:53 2015
@@ -668,10 +668,13 @@ public interface ServletContext {
 public Map 
getServletRegistrations();
 
 /**
- * TODO SERVLET3 - Add comments
- * @param filterName TODO
- * @param className  TODO
- * @return TODO
+/**
+ * Add filter to context.
+ * @param   filterName  Name of filter to add
+ * @param   className Name of filter class
+ * @return  null if the filter has already been fully defined,
+ *  else a {@link javax.servlet.FilterRegistration.Dynamic} object
+ *  that can be used to further configure the filter
  * @throws UnsupportedOperationExceptionIf called from a
  *{@link 
ServletContextListener#contextInitialized(ServletContextEvent)}
  *method of a {@link ServletContextListener} that was not defined in a
@@ -683,14 +686,15 @@ public interface ServletContext {
  * If the context has already been initialised
  * @since Servlet 3.0
  */
-public FilterRegistration.Dynamic addFilter(String filterName,
-String className);
+public FilterRegistration.Dynamic addFilter(String filterName, String 
className);
 
 /**
- * TODO SERVLET3 - Add comments
- * @param filterName TODO
- * @param filter TODO
- * @return TODO
+ * Add filter to context.
+ * @param   filterName  Name of filter to add
+ * @param   filter  Filter to add
+ * @return  null if the filter has already been fully defined,
+ *  else a {@link javax.servlet.FilterRegistration.Dynamic} object
+ *  that can be used to further configure the filter
  * @throws UnsupportedOperationExceptionIf called from a
  *{@link 
ServletContextListener#contextInitialized(ServletContextEvent)}
  *method of a {@link ServletContextListener} that was not defined in a
@@ -705,10 +709,12 @@ public interface ServletContext {
 public FilterRegistration.Dynamic addFilter(String filterName, Filter 
filter);
 
 /**
- * TODO SERVLET3 - Add comments
- * @param filterName  TODO
- * @param filterClass TODO
- * @return TODO
+ * Add filter to context.
+ * @param   filterName  Name of filter to add
+ * @param   filterClass Class of filter to add
+ * @return  null if the filter has already been fully defined,
+ *  else a {@link javax.servlet.FilterRegistration.Dynamic} object
+ *  that can be used to further configure the filter
  * @throws UnsupportedOperationExceptionIf called from a
  *{@link 
ServletContextListener#contextInitialized(ServletContextEvent)}
  *method of a {@link ServletContextListener} that was not defined in a
@@ -738,8 +744,7 @@ public interface ServletContext {
  * @throws ServletException TODO
  * @since Servlet 3.
  */
-public  T createFilter(Class c)
-throws ServletException;
+public  T createFilter(Class c) throws 
ServletException;
 
 /**
  * TODO SERVLET3 - Add comments

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1707720&r1=1707719&r2=1707720&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Fri Oct  
9 13:21:53 2015
@@ -715,71 +715,25 @@ public class ApplicationContext
 }
 
 
-/**
- * Add filter to context.
- * @param   filterName  Name of filter to add
- * @param   filterClass Name of filter class
- * @return  null if the filter has already been fully defined,
- *  else a {@link javax.servlet.FilterRegistration.Dynamic} object
- *  that can be used to further configure the filter
- * @throws IllegalStateException if the context has already been 
initialised
- * @throws UnsupportedOperationException - if this context was passed to 
the
- * {@link 
ServletContextListener#contextInitialized(javax.servle

svn commit: r1707724 - in /tomcat/trunk/java: javax/servlet/ServletContext.java org/apache/catalina/core/ApplicationContext.java

[markt]

Author: markt
Date: Fri Oct  9 13:31:39 2015
New Revision: 1707724

URL: http://svn.apache.org/viewvc?rev=1707724&view=rev
Log:
Javadoc improvements.
Use inherited Javadoc since it generally has more information. Fill in gaps 
using implementation Javadoc where available.

Modified:
tomcat/trunk/java/javax/servlet/ServletContext.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java

Modified: tomcat/trunk/java/javax/servlet/ServletContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletContext.java?rev=1707724&r1=1707723&r2=1707724&view=diff
==
--- tomcat/trunk/java/javax/servlet/ServletContext.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletContext.java Fri Oct  9 13:31:39 2015
@@ -573,8 +573,7 @@ public interface ServletContext {
  *use this method.
  * @since Servlet 3.0
  */
-public ServletRegistration.Dynamic addServlet(String servletName,
-String className);
+public ServletRegistration.Dynamic addServlet(String servletName, String 
className);
 
 /**
  * Register a servlet instance for use in this ServletContext.
@@ -592,14 +591,15 @@ public interface ServletContext {
  *use this method.
  * @since Servlet 3.0
  */
-public ServletRegistration.Dynamic addServlet(String servletName,
-Servlet servlet);
+public ServletRegistration.Dynamic addServlet(String servletName, Servlet 
servlet);
 
 /**
- * TODO SERVLET3 - Add comments
- * @param servletName  TODO
- * @param servletClass TODO
- * @return TODO
+ * Add servlet to context.
+ * @param   servletName  Name of servlet to add
+ * @param   servletClass Class of servlet to add
+ * @return  null if the servlet has already been fully 
defined,
+ *  else a {@link javax.servlet.ServletRegistration.Dynamic} object
+ *  that can be used to further configure the servlet
  * @throws IllegalStateException
  * If the context has already been initialised
  * @throws UnsupportedOperationExceptionIf called from a
@@ -668,7 +668,6 @@ public interface ServletContext {
 public Map 
getServletRegistrations();
 
 /**
-/**
  * Add filter to context.
  * @param   filterName  Name of filter to add
  * @param   className Name of filter class
@@ -788,8 +787,9 @@ public interface ServletContext {
 public SessionCookieConfig getSessionCookieConfig();
 
 /**
- * TODO SERVLET3 - Add comments
- * @param sessionTrackingModes TODO
+ * Configures the available session tracking modes for this web 
application.
+ * @param sessionTrackingModes The session tracking modes to use for this
+ *web application
  * @throws IllegalArgumentException
  * If sessionTrackingModes specifies
  * {@link SessionTrackingMode#SSL} in combination with any 
other
@@ -809,8 +809,15 @@ public interface ServletContext {
 Set sessionTrackingModes);
 
 /**
- * TODO SERVLET3 - Add comments
- * @return TODO
+ * Obtains the default session tracking modes for this web application.
+ * By default {@link SessionTrackingMode#URL} is always supported, {@link
+ * SessionTrackingMode#COOKIE} is supported unless the cookies
+ * attribute has been set to false for the context and {@link
+ * SessionTrackingMode#SSL} is supported if at least one of the connectors
+ * used by this context has the attribute secure set to
+ * true.
+ * @return The set of default session tracking modes for this web
+ * application
  * @throws UnsupportedOperationExceptionIf called from a
  *{@link 
ServletContextListener#contextInitialized(ServletContextEvent)}
  *method of a {@link ServletContextListener} that was not defined in a
@@ -823,8 +830,10 @@ public interface ServletContext {
 public Set getDefaultSessionTrackingModes();
 
 /**
- * TODO SERVLET3 - Add comments
- * @return TODO
+ * Obtains the currently enabled session tracking modes for this web
+ * application.
+ * @return The value supplied via {@link #setSessionTrackingModes(Set)} if
+ * one was previously set, else return the defaults
  * @throws UnsupportedOperationExceptionIf called from a
  *{@link 
ServletContextListener#contextInitialized(ServletContextEvent)}
  *method of a {@link ServletContextListener} that was not defined in a

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1707724&r1=1707723&r2=1707724&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java 
(original)
+++ tomcat/trunk/

svn commit: r1707726 - in /tomcat/trunk/java/javax/servlet: ./ http/

[markt]

Author: markt
Date: Fri Oct  9 13:38:24 2015
New Revision: 1707726

URL: http://svn.apache.org/viewvc?rev=1707726&view=rev
Log:
Servlet 4.0
Use of @Deprecated

Modified:
tomcat/trunk/java/javax/servlet/ServletContext.java
tomcat/trunk/java/javax/servlet/ServletRequest.java
tomcat/trunk/java/javax/servlet/ServletRequestWrapper.java
tomcat/trunk/java/javax/servlet/SingleThreadModel.java
tomcat/trunk/java/javax/servlet/UnavailableException.java
tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java
tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java
tomcat/trunk/java/javax/servlet/http/HttpServletResponse.java
tomcat/trunk/java/javax/servlet/http/HttpServletResponseWrapper.java
tomcat/trunk/java/javax/servlet/http/HttpSession.java
tomcat/trunk/java/javax/servlet/http/HttpSessionContext.java
tomcat/trunk/java/javax/servlet/http/HttpUtils.java

Modified: tomcat/trunk/java/javax/servlet/ServletContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletContext.java?rev=1707726&r1=1707725&r2=1707726&view=diff
==
--- tomcat/trunk/java/javax/servlet/ServletContext.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletContext.java Fri Oct  9 13:38:24 2015
@@ -308,8 +308,7 @@ public interface ServletContext {
  *
  * @deprecated As of Java Servlet API 2.1, with no direct replacement.
  */
-@SuppressWarnings("dep-ann")
-// Spec API does not use @Deprecated
+@Deprecated
 public Servlet getServlet(String name) throws ServletException;
 
 /**
@@ -323,8 +322,7 @@ public interface ServletContext {
  *
  * @deprecated As of Java Servlet API 2.0, with no replacement.
  */
-@SuppressWarnings("dep-ann")
-// Spec API does not use @Deprecated
+@Deprecated
 public Enumeration getServlets();
 
 /**
@@ -339,8 +337,7 @@ public interface ServletContext {
  *
  * @deprecated As of Java Servlet API 2.1, with no replacement.
  */
-@SuppressWarnings("dep-ann")
-// Spec API does not use @Deprecated
+@Deprecated
 public Enumeration getServletNames();
 
 /**
@@ -365,8 +362,7 @@ public interface ServletContext {
  * stack trace and an explanatory error message to the servlet
  * log file.
  */
-@SuppressWarnings("dep-ann")
-// Spec API does not use @Deprecated
+@Deprecated
 public void log(Exception exception, String msg);
 
 /**

Modified: tomcat/trunk/java/javax/servlet/ServletRequest.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletRequest.java?rev=1707726&r1=1707725&r2=1707726&view=diff
==
--- tomcat/trunk/java/javax/servlet/ServletRequest.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletRequest.java Fri Oct  9 13:38:24 2015
@@ -401,8 +401,7 @@ public interface ServletRequest {
  * @deprecated As of Version 2.1 of the Java Servlet API, use
  * {@link ServletContext#getRealPath} instead.
  */
-@SuppressWarnings("dep-ann")
-// Spec API does not use @Deprecated
+@Deprecated
 public String getRealPath(String path);
 
 /**

Modified: tomcat/trunk/java/javax/servlet/ServletRequestWrapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletRequestWrapper.java?rev=1707726&r1=1707725&r2=1707726&view=diff
==
--- tomcat/trunk/java/javax/servlet/ServletRequestWrapper.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletRequestWrapper.java Fri Oct  9 
13:38:24 2015
@@ -298,8 +298,7 @@ public class ServletRequestWrapper imple
  * @deprecated As of Version 3.0 of the Java Servlet API
  */
 @Override
-@SuppressWarnings("dep-ann")
-// Spec API does not use @Deprecated
+@Deprecated
 public String getRealPath(String path) {
 return this.request.getRealPath(path);
 }

Modified: tomcat/trunk/java/javax/servlet/SingleThreadModel.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/SingleThreadModel.java?rev=1707726&r1=1707725&r2=1707726&view=diff
==
--- tomcat/trunk/java/javax/servlet/SingleThreadModel.java (original)
+++ tomcat/trunk/java/javax/servlet/SingleThreadModel.java Fri Oct  9 13:38:24 
2015
@@ -37,8 +37,7 @@ package javax.servlet;
  *
  * @deprecated As of Java Servlet API 2.4, with no direct replacement.
  */
-@SuppressWarnings("dep-ann")
-// Spec API does not use @Deprecated
+@Deprecated
 public interface SingleThreadModel {
 // No methods
 }

Modified: tomcat/trunk/java/javax/servlet/UnavailableException.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/UnavailableException.java?rev=1707726&r1=170772

svn commit: r1707727 - in /tomcat/trunk/java/javax/servlet: ./ http/

[markt]

Author: markt
Date: Fri Oct  9 13:50:54 2015
New Revision: 1707727

URL: http://svn.apache.org/viewvc?rev=1707727&view=rev
Log:
Servlet 4.0
Default methods for listeners

Modified:
tomcat/trunk/java/javax/servlet/ServletContextAttributeListener.java
tomcat/trunk/java/javax/servlet/ServletContextListener.java
tomcat/trunk/java/javax/servlet/ServletRequestAttributeListener.java
tomcat/trunk/java/javax/servlet/ServletRequestListener.java
tomcat/trunk/java/javax/servlet/http/HttpSessionActivationListener.java
tomcat/trunk/java/javax/servlet/http/HttpSessionAttributeListener.java
tomcat/trunk/java/javax/servlet/http/HttpSessionBindingListener.java
tomcat/trunk/java/javax/servlet/http/HttpSessionListener.java

Modified: tomcat/trunk/java/javax/servlet/ServletContextAttributeListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletContextAttributeListener.java?rev=1707727&r1=1707726&r2=1707727&view=diff
==
--- tomcat/trunk/java/javax/servlet/ServletContextAttributeListener.java 
(original)
+++ tomcat/trunk/java/javax/servlet/ServletContextAttributeListener.java Fri 
Oct  9 13:50:54 2015
@@ -32,21 +32,27 @@ public interface ServletContextAttribute
 /**
  * Notification that a new attribute was added to the servlet context.
  * Called after the attribute is added.
+ * The default implementation is a NO-OP.
  * @param scae Information about the new attribute
  */
-public void attributeAdded(ServletContextAttributeEvent scae);
+public default void attributeAdded(ServletContextAttributeEvent scae) {
+}
 
 /**
  * Notification that an existing attribute has been removed from the 
servlet
  * context. Called after the attribute is removed.
+ * The default implementation is a NO-OP.
  * @param scae Information about the removed attribute
  */
-public void attributeRemoved(ServletContextAttributeEvent scae);
+public default void attributeRemoved(ServletContextAttributeEvent scae) {
+}
 
 /**
  * Notification that an attribute on the servlet context has been replaced.
  * Called after the attribute is replaced.
+ * The default implementation is a NO-OP.
  * @param scae Information about the replaced attribute
  */
-public void attributeReplaced(ServletContextAttributeEvent scae);
+public default void attributeReplaced(ServletContextAttributeEvent scae) {
+}
 }

Modified: tomcat/trunk/java/javax/servlet/ServletContextListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletContextListener.java?rev=1707727&r1=1707726&r2=1707727&view=diff
==
--- tomcat/trunk/java/javax/servlet/ServletContextListener.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletContextListener.java Fri Oct  9 
13:50:54 2015
@@ -34,15 +34,19 @@ public interface ServletContextListener
  ** Notification that the web application initialization process is 
starting.
  * All ServletContextListeners are notified of context initialization 
before
  * any filter or servlet in the web application is initialized.
+ * The default implementation is a NO-OP.
  * @param sce Information about the ServletContext that was initialized
  */
-public void contextInitialized(ServletContextEvent sce);
+public default void contextInitialized(ServletContextEvent sce) {
+}
 
 /**
  ** Notification that the servlet context is about to be shut down. All
  * servlets and filters have been destroy()ed before any
  * ServletContextListeners are notified of context destruction.
+ * The default implementation is a NO-OP.
  * @param sce Information about the ServletContext that was destroyed
  */
-public void contextDestroyed(ServletContextEvent sce);
+public default void contextDestroyed(ServletContextEvent sce) {
+}
 }

Modified: tomcat/trunk/java/javax/servlet/ServletRequestAttributeListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletRequestAttributeListener.java?rev=1707727&r1=1707726&r2=1707727&view=diff
==
--- tomcat/trunk/java/javax/servlet/ServletRequestAttributeListener.java 
(original)
+++ tomcat/trunk/java/javax/servlet/ServletRequestAttributeListener.java Fri 
Oct  9 13:50:54 2015
@@ -34,22 +34,28 @@ public interface ServletRequestAttribute
 /**
  * Notification that a new attribute was added to the
  * servlet request. Called after the attribute is added.
+ * The default implementation is a NO-OP.
  * @param srae Information about the new request attribute
  */
-public void attributeAdded(ServletRequestAttributeEvent srae);
+public default void attributeAdded(ServletRequestAttributeEvent srae) {
+}
 

svn commit: r1707728 - in /tomcat/trunk: java/org/apache/catalina/valves/ java/org/apache/tomcat/websocket/server/ test/org/apache/catalina/core/ test/org/apache/catalina/startup/ test/org/apache/jasp

[markt]

Author: markt
Date: Fri Oct  9 13:51:12 2015
New Revision: 1707728

URL: http://svn.apache.org/viewvc?rev=1707728&view=rev
Log:
Take advantage of new default methods

Modified:
tomcat/trunk/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsSessionListener.java
tomcat/trunk/test/org/apache/catalina/core/TestNamingContextListener.java
tomcat/trunk/test/org/apache/catalina/startup/TestListener.java
tomcat/trunk/test/org/apache/jasper/compiler/TestELInterpreterFactory.java

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

Modified: 
tomcat/trunk/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java?rev=1707728&r1=1707727&r2=1707728&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java 
Fri Oct  9 13:51:12 2015
@@ -206,12 +206,6 @@ public class CrawlerSessionManagerValve
 
 
 @Override
-public void valueBound(HttpSessionBindingEvent event) {
-// NOOP
-}
-
-
-@Override
 public void valueUnbound(HttpSessionBindingEvent event) {
 String clientIp = sessionIdClientIp.remove(event.getSession().getId());
 if (clientIp != null) {

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsSessionListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsSessionListener.java?rev=1707728&r1=1707727&r2=1707728&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsSessionListener.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsSessionListener.java 
Fri Oct  9 13:51:12 2015
@@ -30,12 +30,6 @@ public class WsSessionListener implement
 
 
 @Override
-public void sessionCreated(HttpSessionEvent se) {
-// NO-OP
-}
-
-
-@Override
 public void sessionDestroyed(HttpSessionEvent se) {
 wsServerContainer.closeAuthenticatedSession(se.getSession().getId());
 }

Modified: 
tomcat/trunk/test/org/apache/catalina/core/TestNamingContextListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestNamingContextListener.java?rev=1707728&r1=1707727&r2=1707728&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/core/TestNamingContextListener.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestNamingContextListener.java 
Fri Oct  9 13:51:12 2015
@@ -71,11 +71,6 @@ public class TestNamingContextListener e
 public static final class Bug49132Listener implements 
ServletContextListener {
 
 @Override
-public void contextDestroyed(ServletContextEvent sce) {
-// NOOP
-}
-
-@Override
 public void contextInitialized(ServletContextEvent sce) {
 javax.naming.Context initCtx;
 try {
@@ -151,11 +146,6 @@ public class TestNamingContextListener e
 ServletContextListener {
 
 @Override
-public void contextDestroyed(ServletContextEvent sce) {
-// NOOP
-}
-
-@Override
 public void contextInitialized(ServletContextEvent sce) {
 javax.naming.Context initCtx;
 try {

Modified: tomcat/trunk/test/org/apache/catalina/startup/TestListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestListener.java?rev=1707728&r1=1707727&r2=1707728&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/startup/TestListener.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TestListener.java Fri Oct  9 
13:51:12 2015
@@ -88,11 +88,6 @@ public class TestListener extends Tomcat
 public void contextInitialized(ServletContextEvent sce) {
 initialized = true;
 }
-
-@Override
-public void contextDestroyed(ServletContextEvent sce) {
-// NOOP
-}
 }
 
 public static class SCL2 implements ServletContextListener {
@@ -102,11 +97,6 @@ public class TestListener extends Tomcat
 ServletContext sc = sce.getServletContext();
 sc.addListener(SCL3.class.getName());
 }
-
-@Override
-public void contextDestroyed(ServletContextEvent sce) {
-// NOOP
-}
 }
 
 public static class SCL3 implements ServletContextListener {
@@ -117,10 +107,5 @@ public class TestListener extends Tomcat
 public void contextInitialized(Serv

Re: [VOTE] Release Apache Tomcat 8.0.28

[Jeanfrancois Arcand]

On 2015-10-07 3:13 PM, Mark Thomas wrote:

The proposed Apache Tomcat 8.0.28 release is now available for voting.

The main changes since 8.0.27 are:

- Allow file based configuration resources (e.g. key stores) to be
   configured using URLs

- Restore code signing to the Windows installer an uninstaller

There is a smaller that usual collection of bug fixes, new features and
performance improvements. For full details, see the changelog:
http://svn.us.apache.org/repos/asf/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.28/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1052/
The svn tag is:
http://svn.apache.org/repos/asf/tomcat/tc8.0.x/tags/TOMCAT_8_0_28/

The proposed 8.0.28 release is:
[ ] Broken - do not release
[X] Stable - go ahead and release as 8.0.28

-- Jeanfrancois




-
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: r1707769 - in /tomcat/trunk/java/javax/servlet: GenericFilter.java HttpFilter.java

[markt]

Author: markt
Date: Fri Oct  9 16:51:26 2015
New Revision: 1707769

URL: http://svn.apache.org/viewvc?rev=1707769&view=rev
Log:
Servlet 4.0
Add GenericFilter and HttpFilter (not checked with javap yet)

Added:
tomcat/trunk/java/javax/servlet/GenericFilter.java   (with props)
tomcat/trunk/java/javax/servlet/HttpFilter.java   (with props)

Added: tomcat/trunk/java/javax/servlet/GenericFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/GenericFilter.java?rev=1707769&view=auto
==
--- tomcat/trunk/java/javax/servlet/GenericFilter.java (added)
+++ tomcat/trunk/java/javax/servlet/GenericFilter.java Fri Oct  9 16:51:26 2015
@@ -0,0 +1,81 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package javax.servlet;
+
+import java.io.Serializable;
+import java.util.Enumeration;
+
+public abstract class GenericFilter implements Filter, FilterConfig, 
Serializable {
+
+private static final long serialVersionUID = 1L;
+
+private volatile FilterConfig filterConfig;
+
+
+@Override
+public String getFilterName() {
+return getFilterConfig().getFilterName();
+}
+
+
+@Override
+public ServletContext getServletContext() {
+return getFilterConfig().getServletContext();
+}
+
+
+@Override
+public String getInitParameter(String name) {
+return getFilterConfig().getInitParameter(name);
+}
+
+
+@Override
+public Enumeration getInitParameterNames() {
+return getFilterConfig().getInitParameterNames();
+}
+
+
+@Override
+public void init(FilterConfig filterConfig) throws ServletException {
+this.filterConfig  = filterConfig;
+init();
+}
+
+
+/**
+ * Obtain the FilterConfig used to initialise this Filter instance.
+ *
+ * @return The config previously passed to the {@link #init(FilterConfig)}
+ * method
+ */
+public FilterConfig getFilterConfig() {
+return filterConfig;
+}
+
+
+/**
+ * Convenience method for sub-classes to save them having to call
+ * super.init(config). This is a NO-OP by default.
+ *
+ * @throws ServletException If an exception occurs that interrupts the
+ * Filter's normal operation
+ */
+public void init() throws ServletException {
+// NO-OP
+}
+}

Propchange: tomcat/trunk/java/javax/servlet/GenericFilter.java
--
svn:eol-style = native

Added: tomcat/trunk/java/javax/servlet/HttpFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/HttpFilter.java?rev=1707769&view=auto
==
--- tomcat/trunk/java/javax/servlet/HttpFilter.java (added)
+++ tomcat/trunk/java/javax/servlet/HttpFilter.java Fri Oct  9 16:51:26 2015
@@ -0,0 +1,91 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package javax.servlet;
+
+import java.io.IOException;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public abstract class HttpFilter extends GenericFilter {
+
+private static final long serialVersionUID = 1L;
+
+/**
+ * {@inheritDoc}
+ *
+ * This implementation tests the request and response to see if they are
+ * instances of {@link HttpServletRequest} and {@link H

svn commit: r1707770 - /tomcat/trunk/java/javax/servlet/GenericFilter.java

[markt]

Author: markt
Date: Fri Oct  9 16:53:55 2015
New Revision: 1707770

URL: http://svn.apache.org/viewvc?rev=1707770&view=rev
Log:
Add a NO-OP destroy method

Modified:
tomcat/trunk/java/javax/servlet/GenericFilter.java

Modified: tomcat/trunk/java/javax/servlet/GenericFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/GenericFilter.java?rev=1707770&r1=1707769&r2=1707770&view=diff
==
--- tomcat/trunk/java/javax/servlet/GenericFilter.java (original)
+++ tomcat/trunk/java/javax/servlet/GenericFilter.java Fri Oct  9 16:53:55 2015
@@ -78,4 +78,15 @@ public abstract class GenericFilter impl
 public void init() throws ServletException {
 // NO-OP
 }
+
+
+/**
+ * {@inheritDoc}
+ *
+ * Default NO-OP implementation.
+ */
+@Override
+public void destroy() {
+// NO-OP
+}
 }



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

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

[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.
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: 41 mins 22 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-20151009-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.relaxTiming=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151009.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151009-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-20151009/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/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/out

svn commit: r1707797 - in /tomcat/trunk/java/org/apache: catalina/filters/WebdavFixFilter.java tomcat/websocket/server/WsFilter.java

[markt]

Author: markt
Date: Fri Oct  9 19:15:25 2015
New Revision: 1707797

URL: http://svn.apache.org/viewvc?rev=1707797&view=rev
Log:
Take advantage of GenericFilter

Modified:
tomcat/trunk/java/org/apache/catalina/filters/WebdavFixFilter.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFilter.java

Modified: tomcat/trunk/java/org/apache/catalina/filters/WebdavFixFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/WebdavFixFilter.java?rev=1707797&r1=1707796&r2=1707797&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/WebdavFixFilter.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/filters/WebdavFixFilter.java Fri Oct  
9 19:15:25 2015
@@ -18,9 +18,8 @@ package org.apache.catalina.filters;
 
 import java.io.IOException;
 
-import javax.servlet.Filter;
 import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
+import javax.servlet.GenericFilter;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
@@ -57,7 +56,9 @@ import javax.servlet.http.HttpServletRes
  *   Unknown issue means it doesn't work
  * 
  */
-public class WebdavFixFilter implements Filter {
+public class WebdavFixFilter extends GenericFilter {
+
+private static final long serialVersionUID = 1L;
 
 private static final String LOG_MESSAGE_PREAMBLE =
 "WebdavFixFilter: Detected client problem: ";
@@ -73,16 +74,6 @@ public class WebdavFixFilter implements
 private static final String UA_MINIDIR_5_2_3790 =
 "Microsoft-WebDAV-MiniRedir/5.2.3790";
 
-@Override
-public void init(FilterConfig filterConfig) throws ServletException {
-// NOOP
-}
-
-@Override
-public void destroy() {
-// NOOP
-}
-
 /**
  * Check for the broken MS WebDAV client and if detected issue a re-direct
  * that hopefully will cause the non-broken client to be used.
@@ -110,12 +101,11 @@ public class WebdavFixFilter implements
 } else if (ua.startsWith(UA_MINIDIR_5_2_3790)) {
 // XP 64-bit SP2
 if (!"".equals(httpRequest.getContextPath())) {
-log(request,
-"XP-x64-SP2 clients only work with the root context");
+log("XP-x64-SP2 clients only work with the root context");
 }
 // Namespace issue maybe
 // see http://greenbytes.de/tech/webdav/webdav-redirector-list.html
-log(request, "XP-x64-SP2 is known not to work with WebDAV 
Servlet");
+log("XP-x64-SP2 is known not to work with WebDAV Servlet");
 
 chain.doFilter(request, response);
 } else {
@@ -141,9 +131,9 @@ public class WebdavFixFilter implements
 return location.toString();
 }
 
-private void log(ServletRequest request, String msg) {
+private void log(String msg) {
 StringBuilder builder = new StringBuilder(LOG_MESSAGE_PREAMBLE);
 builder.append(msg);
-request.getServletContext().log(builder.toString());
+getServletContext().log(builder.toString());
 }
 }

Modified: tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFilter.java?rev=1707797&r1=1707796&r2=1707797&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFilter.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFilter.java Fri Oct  
9 19:15:25 2015
@@ -18,9 +18,8 @@ package org.apache.tomcat.websocket.serv
 
 import java.io.IOException;
 
-import javax.servlet.Filter;
 import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
+import javax.servlet.GenericFilter;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
@@ -30,14 +29,16 @@ import javax.servlet.http.HttpServletRes
 /**
  * Handles the initial HTTP connection for WebSocket connections.
  */
-public class WsFilter implements Filter {
+public class WsFilter extends GenericFilter {
+
+private static final long serialVersionUID = 1L;
 
 private WsServerContainer sc;
 
 
 @Override
-public void init(FilterConfig filterConfig) throws ServletException {
-sc = (WsServerContainer) filterConfig.getServletContext().getAttribute(
+public void init() throws ServletException {
+sc = (WsServerContainer) getServletContext().getAttribute(
 Constants.SERVER_CONTAINER_SERVLET_CONTEXT_ATTRIBUTE);
 }
 
@@ -77,12 +78,4 @@ public class WsFilter implements Filter
 UpgradeUtil.doUpgrade(sc, req, resp, mappingResult.getConfig(),
 mappingResult.getPathParams());
 }
-
-
-@Override
-public void destroy() {
-// NO-OP
-  

svn commit: r1707798 - in /tomcat/trunk: java/org/apache/catalina/filters/RequestDumperFilter.java java/org/apache/catalina/ssi/SSIFilter.java webapps/examples/WEB-INF/classes/filters/ExampleFilter.ja

[markt]

Author: markt
Date: Fri Oct  9 19:24:31 2015
New Revision: 1707798

URL: http://svn.apache.org/viewvc?rev=1707798&view=rev
Log:
Take advantage of GenericFilter

Modified:
tomcat/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIFilter.java
tomcat/trunk/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java

Modified: tomcat/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java?rev=1707798&r1=1707797&r2=1707798&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java Fri 
Oct  9 19:24:31 2015
@@ -21,9 +21,8 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Enumeration;
 
-import javax.servlet.Filter;
 import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
+import javax.servlet.GenericFilter;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
@@ -48,7 +47,9 @@ import org.apache.juli.logging.LogFactor
  *
  * @author Craig R. McClanahan
  */
-public class RequestDumperFilter implements Filter {
+public class RequestDumperFilter extends GenericFilter {
+
+private static final long serialVersionUID = 1L;
 
 private static final String NON_HTTP_REQ_MSG =
 "Not available. Non-http request.";
@@ -264,16 +265,6 @@ public class RequestDumperFilter impleme
 return ts.dateString;
 }
 
-@Override
-public void init(FilterConfig filterConfig) throws ServletException {
-// NOOP
-}
-
-@Override
-public void destroy() {
-// NOOP
-}
-
 private static final class Timestamp {
 private final Date date = new Date(0);
 private final SimpleDateFormat format =

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=1707798&r1=1707797&r2=1707798&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSIFilter.java Fri Oct  9 
19:24:31 2015
@@ -28,9 +28,8 @@ import java.io.Reader;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.servlet.Filter;
 import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
+import javax.servlet.GenericFilter;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
@@ -45,8 +44,8 @@ import org.apache.catalina.Globals;
  * @author David Becker
  * @see org.apache.catalina.ssi.SSIServlet
  */
-public class SSIFilter implements Filter {
-protected FilterConfig config = null;
+public class SSIFilter extends GenericFilter {
+private static final long serialVersionUID = 1L;
 /** Debug level for this servlet. */
 protected int debug = 0;
 /** Expiration time in seconds for the doc. */
@@ -62,37 +61,27 @@ public class SSIFilter implements Filter
 protected boolean allowExec = false;
 
 
-//- Public methods.
-/**
- * Initialize this servlet.
- *
- * @exception ServletException
- *if an error occurs
- */
 @Override
-public void init(FilterConfig config) throws ServletException {
-this.config = config;
-
-if (config.getInitParameter("debug") != null) {
-debug = Integer.parseInt(config.getInitParameter("debug"));
+public void init() throws ServletException {
+if (getInitParameter("debug") != null) {
+debug = Integer.parseInt(getInitParameter("debug"));
 }
 
-if (config.getInitParameter("contentType") != null) {
-contentTypeRegEx = 
Pattern.compile(config.getInitParameter("contentType"));
+if (getInitParameter("contentType") != null) {
+contentTypeRegEx = 
Pattern.compile(getInitParameter("contentType"));
 } else {
 contentTypeRegEx = shtmlRegEx;
 }
 
-isVirtualWebappRelative =
-
Boolean.parseBoolean(config.getInitParameter("isVirtualWebappRelative"));
+isVirtualWebappRelative = 
Boolean.parseBoolean(getInitParameter("isVirtualWebappRelative"));
 
-if (config.getInitParameter("expires") != null)
-expires = Long.valueOf(config.getInitParameter("expires"));
+if (getInitParameter("expires") != null)
+expires = Long.valueOf(getInitParameter("expires"));
 
-allowExec = Boolean.parseBoolean(config.getInitParameter("allowExec"));
+allowExec = Boolean.parseBoolean(getInitParameter("allowExec"));

svn commit: r1707801 - in /tomcat/trunk: test/org/apache/catalina/core/TestStandardContext.java test/org/apache/catalina/startup/ParamFilter.java webapps/examples/WEB-INF/classes/compressionFilters/Co

[markt]

Author: markt
Date: Fri Oct  9 19:34:08 2015
New Revision: 1707801

URL: http://svn.apache.org/viewvc?rev=1707801&view=rev
Log:
Take advantage of GenericFilter

Modified:
tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java
tomcat/trunk/test/org/apache/catalina/startup/ParamFilter.java

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

Modified: tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java?rev=1707801&r1=1707800&r2=1707801&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java Fri Oct 
 9 19:34:08 2015
@@ -23,9 +23,8 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.servlet.Filter;
 import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
+import javax.servlet.GenericFilter;
 import javax.servlet.HttpConstraintElement;
 import javax.servlet.HttpMethodConstraintElement;
 import javax.servlet.MultipartConfigElement;
@@ -161,12 +160,9 @@ public class TestStandardContext extends
 }
 }
 
-public static final class Bug46243Filter implements Filter {
+public static final class Bug46243Filter extends GenericFilter {
 
-@Override
-public void destroy() {
-// NOOP
-}
+private static final long serialVersionUID = 1L;
 
 @Override
 public void doFilter(ServletRequest request, ServletResponse response,
@@ -177,14 +173,12 @@ public class TestStandardContext extends
 }
 
 @Override
-public void init(FilterConfig filterConfig) throws ServletException {
-boolean fail = 
filterConfig.getInitParameter("fail").equals("true");
+public void init() throws ServletException {
+boolean fail = getInitParameter("fail").equals("true");
 if (fail) {
-throw new ServletException("Init fail (test)",
-new ClassNotFoundException());
+throw new ServletException("Init fail (test)", new 
ClassNotFoundException());
 }
 }
-
 }
 
 @Test
@@ -336,12 +330,9 @@ public class TestStandardContext extends
 }
 
 
-public static final class Bug49922Filter implements Filter {
+public static final class Bug49922Filter extends GenericFilter {
 
-@Override
-public void destroy() {
-// NOOP
-}
+private static final long serialVersionUID = 1L;
 
 @Override
 public void doFilter(ServletRequest request, ServletResponse response,
@@ -350,11 +341,6 @@ public class TestStandardContext extends
 response.getWriter().print("Filter");
 chain.doFilter(request, response);
 }
-
-@Override
-public void init(FilterConfig filterConfig) throws ServletException {
-// NOOP
-}
 }
 
 public static final class Bug49922ForwardServlet extends HttpServlet {

Modified: tomcat/trunk/test/org/apache/catalina/startup/ParamFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/ParamFilter.java?rev=1707801&r1=1707800&r2=1707801&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/startup/ParamFilter.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/ParamFilter.java Fri Oct  9 
19:34:08 2015
@@ -20,9 +20,8 @@ import java.io.IOException;
 import java.io.PrintWriter;
 
 import javax.servlet.DispatcherType;
-import javax.servlet.Filter;
 import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
+import javax.servlet.GenericFilter;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
@@ -33,27 +32,18 @@ import javax.servlet.annotation.WebInitP
  * Test Mock to check Filter Annotations
  * @author Peter Rossbach
  */
-@WebFilter(value = "/param", filterName = "paramFilter", dispatcherTypes = {
-DispatcherType.ERROR, DispatcherType.ASYNC }, initParams = { 
@WebInitParam(name = "message", value = "Servlet says: ") })
-public class ParamFilter implements Filter {
+@WebFilter(value = "/param", filterName = "paramFilter",
+dispatcherTypes = { DispatcherType.ERROR, DispatcherType.ASYNC },
+initParams = { @WebInitParam(name = "message", value = "Servlet says: 
") })
+public class ParamFilter extends GenericFilter {
 
-private FilterConfig _filterConfig;
-
-@Override
-public void init(FilterConfig filterConfig) throws ServletException {
-_filterConfig = filterConfig;
-}
+private static final long serialVersionUID = 1L;
 
 @Override
 public

svn commit: r1707804 - in /tomcat/trunk: java/org/apache/catalina/filters/CorsFilter.java java/org/apache/catalina/filters/RemoteIpFilter.java test/org/apache/catalina/startup/DuplicateMappingParamFil

[markt]

Author: markt
Date: Fri Oct  9 19:53:51 2015
New Revision: 1707804

URL: http://svn.apache.org/viewvc?rev=1707804&view=rev
Log:
Take advantage of GenericFilter

Modified:
tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java
tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java

tomcat/trunk/test/org/apache/catalina/startup/DuplicateMappingParamFilter.java

Modified: tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java?rev=1707804&r1=1707803&r2=1707804&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java Fri Oct  9 
19:53:51 2015
@@ -27,9 +27,8 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Set;
 
-import javax.servlet.Filter;
 import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
+import javax.servlet.GenericFilter;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
@@ -42,8 +41,8 @@ import org.apache.tomcat.util.res.String
 
 /**
  * 
- * A {@link Filter} that enable client-side cross-origin requests by
- * implementing W3C's CORS (Cross-Origin Resource
+ * A {@link javax.servlet.Filter} that enable client-side cross-origin requests
+ * by implementing W3C's CORS (Cross-Origin Resource
  * Sharing) specification for resources. Each {@link HttpServletRequest}
  * request is inspected as per specification, and appropriate response headers
  * are added to {@link HttpServletResponse}.
@@ -76,8 +75,9 @@ import org.apache.tomcat.util.res.String
  * @see http://www.w3.org/TR/cors/";>CORS specification
  *
  */
-public final class CorsFilter implements Filter {
+public final class CorsFilter extends GenericFilter {
 
+private static final long serialVersionUID = 1L;
 private static final Log log = LogFactory.getLog(CorsFilter.class);
 private static final StringManager sm = 
StringManager.getManager(CorsFilter.class);
 
@@ -86,7 +86,7 @@ public final class CorsFilter implements
  * A {@link Collection} of origins consisting of zero or more origins that
  * are allowed access to the resource.
  */
-private final Collection allowedOrigins;
+private final Collection allowedOrigins = new HashSet<>();
 
 /**
  * Determines if any origin is allowed to make request.
@@ -97,20 +97,20 @@ public final class CorsFilter implements
  * A {@link Collection} of methods consisting of zero or more methods that
  * are supported by the resource.
  */
-private final Collection allowedHttpMethods;
+private final Collection allowedHttpMethods = new HashSet<>();
 
 /**
  * A {@link Collection} of headers consisting of zero or more header field
  * names that are supported by the resource.
  */
-private final Collection allowedHttpHeaders;
+private final Collection allowedHttpHeaders = new HashSet<>();
 
 /**
  * A {@link Collection} of exposed headers consisting of zero or more 
header
  * field names of headers other than the simple response headers that the
  * resource might use and can be exposed.
  */
-private final Collection exposedHeaders;
+private final Collection exposedHeaders = new HashSet<>();
 
 /**
  * A supports credentials flag that indicates whether the resource supports
@@ -131,14 +131,6 @@ public final class CorsFilter implements
 private boolean decorateRequest;
 
 
-public CorsFilter() {
-this.allowedOrigins = new HashSet<>();
-this.allowedHttpMethods = new HashSet<>();
-this.allowedHttpHeaders = new HashSet<>();
-this.exposedHeaders = new HashSet<>();
-}
-
-
 @Override
 public void doFilter(final ServletRequest servletRequest,
 final ServletResponse servletResponse, final FilterChain 
filterChain)
@@ -185,34 +177,25 @@ public final class CorsFilter implements
 
 
 @Override
-public void init(final FilterConfig filterConfig) throws ServletException {
+public void init() throws ServletException {
 // Initialize defaults
 parseAndStore(DEFAULT_ALLOWED_ORIGINS, DEFAULT_ALLOWED_HTTP_METHODS,
 DEFAULT_ALLOWED_HTTP_HEADERS, DEFAULT_EXPOSED_HEADERS,
 DEFAULT_SUPPORTS_CREDENTIALS, DEFAULT_PREFLIGHT_MAXAGE,
 DEFAULT_DECORATE_REQUEST);
 
-if (filterConfig != null) {
-String configAllowedOrigins = filterConfig
-.getInitParameter(PARAM_CORS_ALLOWED_ORIGINS);
-String configAllowedHttpMethods = filterConfig
-.getInitParameter(PARAM_CORS_ALLOWED_METHODS);
-String configAllowedHttpHeaders = filterConfig
-.getInitParameter(PARAM_CORS_ALLOWED_HEADERS);
-

[Bug 58486] JreMemoryLeakPreventionListener: initialize two further JRE classes

[bugzilla]

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

Luke Woodward  changed:

   What|Removed |Added

 OS||All

--- Comment #1 from Luke Woodward  ---
The servlet in my previous comment demonstrates a leak with the 'abort'
exception in the class
com.sun.org.apache.xml.internal.serialize.DOMSerializerImpl.  If you replace
the lines

document.createElement("test");
DOMImplementationLS implementation =
(DOMImplementationLS)document.getImplementation();
implementation.createLSSerializer().writeToString(document);

with

document.normalizeDocument();

then this causes a leak with
com.sun.org.apache.xerces.internal.dom.DOMNormalizer.abort instead.

-- 
You are receiving this mail because:
You are the assignee for the bug.

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

svn commit: r1707821 - in /tomcat/trunk/java/javax/servlet: Filter.java GenericFilter.java HttpFilter.java ServletRegistration.java http/HttpFilter.java

[markt]

Author: markt
Date: Fri Oct  9 21:51:37 2015
New Revision: 1707821

URL: http://svn.apache.org/viewvc?rev=1707821&view=rev
Log:
Move HttpFilter to the correct package.
Re-order some methods to simplify checking against the RI using javap.

Added:
tomcat/trunk/java/javax/servlet/http/HttpFilter.java
  - copied, changed from r1707817, 
tomcat/trunk/java/javax/servlet/HttpFilter.java
Removed:
tomcat/trunk/java/javax/servlet/HttpFilter.java
Modified:
tomcat/trunk/java/javax/servlet/Filter.java
tomcat/trunk/java/javax/servlet/GenericFilter.java
tomcat/trunk/java/javax/servlet/ServletRegistration.java

Modified: tomcat/trunk/java/javax/servlet/Filter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/Filter.java?rev=1707821&r1=1707820&r2=1707821&view=diff
==
--- tomcat/trunk/java/javax/servlet/Filter.java (original)
+++ tomcat/trunk/java/javax/servlet/Filter.java Fri Oct  9 21:51:37 2015
@@ -58,13 +58,14 @@ public interface Filter {
  * Does not return within a time period defined by the web
  * container
  * 
+ * The default implementation is a NO-OP.
  *
  * @param filterConfig The configuration information associated with the
  * filter instance being initialised
  *
  * @throws ServletException if the initialisation fails
  */
-public void init(FilterConfig filterConfig) throws ServletException;
+public default void init(FilterConfig filterConfig) throws 
ServletException {}
 
 /**
  * The doFilter method of the Filter is called by the 
container
@@ -112,7 +113,8 @@ public interface Filter {
  * that are being held (for example, memory, file handles, threads) and 
make
  * sure that any persistent state is synchronized with the filter's current
  * state in memory.
+ *
+ * The default implementation is a NO-OP.
  */
-public void destroy();
-
+public default void destroy() {}
 }

Modified: tomcat/trunk/java/javax/servlet/GenericFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/GenericFilter.java?rev=1707821&r1=1707820&r2=1707821&view=diff
==
--- tomcat/trunk/java/javax/servlet/GenericFilter.java (original)
+++ tomcat/trunk/java/javax/servlet/GenericFilter.java Fri Oct  9 21:51:37 2015
@@ -16,6 +16,7 @@
  */
 package javax.servlet;
 
+import java.io.IOException;
 import java.io.Serializable;
 import java.util.Enumeration;
 
@@ -26,15 +27,14 @@ public abstract class GenericFilter impl
 private volatile FilterConfig filterConfig;
 
 
+/**
+ * {@inheritDoc}
+ *
+ * Default NO-OP implementation.
+ */
 @Override
-public String getFilterName() {
-return getFilterConfig().getFilterName();
-}
-
-
-@Override
-public ServletContext getServletContext() {
-return getFilterConfig().getServletContext();
+public void destroy() {
+// NO-OP
 }
 
 
@@ -50,13 +50,6 @@ public abstract class GenericFilter impl
 }
 
 
-@Override
-public void init(FilterConfig filterConfig) throws ServletException {
-this.filterConfig  = filterConfig;
-init();
-}
-
-
 /**
  * Obtain the FilterConfig used to initialise this Filter instance.
  *
@@ -68,6 +61,19 @@ public abstract class GenericFilter impl
 }
 
 
+@Override
+public ServletContext getServletContext() {
+return getFilterConfig().getServletContext();
+}
+
+
+@Override
+public void init(FilterConfig filterConfig) throws ServletException {
+this.filterConfig  = filterConfig;
+init();
+}
+
+
 /**
  * Convenience method for sub-classes to save them having to call
  * super.init(config). This is a NO-OP by default.
@@ -80,13 +86,13 @@ public abstract class GenericFilter impl
 }
 
 
-/**
- * {@inheritDoc}
- *
- * Default NO-OP implementation.
- */
 @Override
-public void destroy() {
-// NO-OP
+public abstract void doFilter(ServletRequest request, ServletResponse 
response,
+FilterChain chain) throws IOException, ServletException;
+
+
+@Override
+public String getFilterName() {
+return getFilterConfig().getFilterName();
 }
 }

Modified: tomcat/trunk/java/javax/servlet/ServletRegistration.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletRegistration.java?rev=1707821&r1=1707820&r2=1707821&view=diff
==
--- tomcat/trunk/java/javax/servlet/ServletRegistration.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletRegistration.java Fri Oct  9 
21:51:37 2015
@@ -42,8 +42,8 @@ public interface ServletRegistration ext
 public static interface Dynamic
 extends ServletRegistration, Registration.Dynamic {

svn commit: r1707823 - /tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java

[markt]

Author: markt
Date: Fri Oct  9 22:16:27 2015
New Revision: 1707823

URL: http://svn.apache.org/viewvc?rev=1707823&view=rev
Log:
This seems to be OK but Eclipse doesn't like it and the error it flags up is 
distracting.

Modified:
tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java

Modified: tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java?rev=1707823&r1=1707822&r2=1707823&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java Fri Oct  9 
22:16:27 2015
@@ -215,7 +215,7 @@ import org.apache.juli.logging.LogFactor
  * 
  *
  * 
- * {@code
+ * 
  * 
  *ExpiresDefault
  * [plus] { }*
@@ -225,7 +225,7 @@ import org.apache.juli.logging.LogFactor
  *ExpiresByType type/encoding
  * [plus] { }*
  * 
- * }
+ * 
  * 
  * 
  * where {@code } is one of:



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

svn commit: r1707824 - /tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java

[markt]

Author: markt
Date: Fri Oct  9 22:19:18 2015
New Revision: 1707824

URL: http://svn.apache.org/viewvc?rev=1707824&view=rev
Log:
Revert (obviously wrong) previous commit

Modified:
tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java

Modified: tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java?rev=1707824&r1=1707823&r2=1707824&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java Fri Oct  9 
22:19:18 2015
@@ -215,7 +215,7 @@ import org.apache.juli.logging.LogFactor
  * 
  *
  * 
- * 
+ * {@code
  * 
  *ExpiresDefault
  * [plus] { }*
@@ -225,7 +225,7 @@ import org.apache.juli.logging.LogFactor
  *ExpiresByType type/encoding
  * [plus] { }*
  * 
- * 
+ * }
  * 
  * 
  * where {@code } is one of:



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

svn commit: r1707825 - /tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java

[markt]

Author: markt
Date: Fri Oct  9 22:19:57 2015
New Revision: 1707825

URL: http://svn.apache.org/viewvc?rev=1707825&view=rev
Log:
Better way to stop Eclipse moaning.

Modified:
tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java

Modified: tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java?rev=1707825&r1=1707824&r2=1707825&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java Fri Oct  9 
22:19:57 2015
@@ -426,6 +426,7 @@ import org.apache.juli.logging.LogFactor
  * FINE: Request "/docs/config/manager.html" with response status "200" 
content-type "text/html", no expiration configured
  * 
  */
+@SuppressWarnings("javadoc")
 public class ExpiresFilter extends FilterBase {
 
 /**



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

svn commit: r1707827 - in /tomcat/trunk: java/javax/servlet/http/ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache/catalina/filters/ test/org/apache/catalina/filters/

[markt]

Author: markt
Date: Fri Oct  9 22:42:51 2015
New Revision: 1707827

URL: http://svn.apache.org/viewvc?rev=1707827&view=rev
Log:
Servlet 4.0
Add some PushBuilder plumbing. Doesn't do anything yet.

Added:
tomcat/trunk/java/javax/servlet/http/PushBuilder.java   (with props)
Modified:
tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
tomcat/trunk/test/org/apache/catalina/filters/TesterHttpServletRequest.java

Modified: tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java?rev=1707827&r1=1707826&r2=1707827&view=diff
==
--- tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java (original)
+++ tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java Fri Oct  9 
22:42:51 2015
@@ -215,6 +215,21 @@ public interface HttpServletRequest exte
 public String getPathTranslated();
 
 /**
+ * Obtain a builder for generating push requests. {@link PushBuilder}
+ * documents how this request will be used as the basis for a push request.
+ * Each call to this method will return a new instance, independent of any
+ * previous instance obtained.
+ *
+ * @return A builder than can be used to generate push requests based on
+ * this request.
+ *
+ * @since Servlet 4.0
+ */
+public default PushBuilder getPushBuilder() {
+return null;
+}
+
+/**
  * Returns the portion of the request URI that indicates the context of the
  * request. The context path always comes first in a request URI. The path
  * starts with a "/" character but does not end with a "/" character. For

Added: tomcat/trunk/java/javax/servlet/http/PushBuilder.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/PushBuilder.java?rev=1707827&view=auto
==
--- tomcat/trunk/java/javax/servlet/http/PushBuilder.java (added)
+++ tomcat/trunk/java/javax/servlet/http/PushBuilder.java Fri Oct  9 22:42:51 
2015
@@ -0,0 +1,26 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License.  You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package javax.servlet.http;
+
+/**
+ * Builds a push request based on the {@link HttpServletRequest} from which 
this
+ * builder was obtained.
+ *
+ * @since Servlet 4.0
+ */
+public interface PushBuilder {
+}

Propchange: tomcat/trunk/java/javax/servlet/http/PushBuilder.java
--
svn:eol-style = native

Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1707827&r1=1707826&r2=1707827&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Fri Oct  9 
22:42:51 2015
@@ -16,7 +16,6 @@
  */
 package org.apache.catalina.connector;
 
-
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
@@ -64,6 +63,7 @@ import javax.servlet.http.HttpServletRes
 import javax.servlet.http.HttpSession;
 import javax.servlet.http.HttpUpgradeHandler;
 import javax.servlet.http.Part;
+import javax.servlet.http.PushBuilder;
 
 import org.apache.catalina.Context;
 import org.apache.catalina.Globals;
@@ -74,6 +74,7 @@ import org.apache.catalina.Session;
 import org.apache.catalina.TomcatPrincipal;
 import org.apache.catalina.Wrapper;
 import org.apache.catalina.core.ApplicationPart;
+import org.apache.catalina.core.ApplicationPushBuilder;
 import org.apache.catalina.core.ApplicationSessionCookieConfig;
 import org.apache.catalina.core.AsyncContextImpl;
 import org.apache.catalina.mapper.MappingData;
@@ -105,15 +106,13 @@ import org.ap

svn commit: r1707829 - /tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java

[markt]

Author: markt
Date: Fri Oct  9 22:43:41 2015
New Revision: 1707829

URL: http://svn.apache.org/viewvc?rev=1707829&view=rev
Log:
Servlet 4.0
Missed a new class in previous commit

Added:
tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java   
(with props)

Added: tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java?rev=1707829&view=auto
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java 
(added)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java Fri 
Oct  9 22:43:41 2015
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.catalina.core;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.PushBuilder;
+
+public class ApplicationPushBuilder implements PushBuilder {
+
+private final HttpServletRequest baseRequest;
+
+public ApplicationPushBuilder(HttpServletRequest request) {
+baseRequest = request;
+}
+}

Propchange: 
tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java
--
svn:eol-style = native



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

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

[Bill Barker]

To whom it may engage...

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

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


Full details are available at:

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

That said, some information snippets are provided here.

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



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

[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.
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: 41 mins 53 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-20151010-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.relaxTiming=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151010.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151010-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-20151010/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/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api