svn commit: r1662651 - /tomcat/maven-plugin/trunk/pom.xml

[olamy]

Author: olamy
Date: Fri Feb 27 09:54:28 2015
New Revision: 1662651

URL: http://svn.apache.org/r1662651
Log:
use last tomcat 7.0.x version

Modified:
tomcat/maven-plugin/trunk/pom.xml

Modified: tomcat/maven-plugin/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1662651&r1=1662650&r2=1662651&view=diff
==
--- tomcat/maven-plugin/trunk/pom.xml (original)
+++ tomcat/maven-plugin/trunk/pom.xml Fri Feb 27 09:54:28 2015
@@ -73,7 +73,7 @@
 2001
 
 2008
-7.0.57
+7.0.59
 
 
 



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

svn commit: r1662653 - /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml

[olamy]

Author: olamy
Date: Fri Feb 27 09:59:32 2015
New Revision: 1662653

URL: http://svn.apache.org/r1662653
Log:
use last tomcat 6.0.43

Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml

Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml?rev=1662653&r1=1662652&r2=1662653&view=diff
==
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml Fri Feb 27 09:59:32 
2015
@@ -33,7 +33,7 @@
   
 
   
-6.0.39
+6.0.43
 ${basedir}/target/
 
${basedir}/src/test/simple-war-project-1.0-SNAPSHOT.war
 ${basedir}/src/test/keystore



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

Early Access builds for JDK 9 b51 are available on java.net

[Rory O'Donnell]

Hi Mark/Mladen,

Early Access build for JDK 9 b51  
available on java.net, summary of  changes are listed here 



I'd also like to use this opportunity to point you to JEP 238: 
Multi-Version JAR Files [0],

which is currently a Candidate JEP for JDK 9.

It's goal is to extend the JAR file format to allow multiple, JDK 
release-specific versions of class
files to coexist in a single file. An additional goal is to backport the 
run-time changes to
JDK 8u60, thereby enabling JDK 8 to consume multi-version JARs. For a 
detailed discussion,

please see the corresponding thread on the core-libs-dev mailing list. [1]

Please keep in mind that a JEP in the Candidate state is merely an idea 
worthy of consideration
by JDK Release Projects and related efforts; there is no commitment that 
it will be delivered in

any particular release.

Comments, questions, and suggestions are welcome on the corelibs-dev 
mailing list. (If you
haven’t already subscribed to that list then please do so first, 
otherwise your message will be

discarded as spam.)

Rgds,Rory

[0] http://openjdk.java.net/jeps/238
[1] 
http://mail.openjdk.java.net/pipermail/core-libs-dev/2015-February/031461.html 



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

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

[Bill Barker]

To whom it may engage...

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

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


Full details are available at:

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

That said, some information snippets are provided here.

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



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2.html
Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2 (Type: Build)
Work ended in a state of : Failed
Elapsed: 29 mins 2 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.2-SNAPSHOT.jar
 -Dtest.reports=output/logs-NIO2 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150227-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150227.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150227-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-1.0.2/dest-20150227/bin
 /openssl -Dexecute.test.apr=false -Dexecute.test.bio=false 
-Dexecute.test.nio2=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-8.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/bu
 
ild/lib/tomcat-spdy.jar:/srv/g

svn commit: r1662662 - in /tomcat/site/trunk: docs/index.html docs/oldnews-2014.html xdocs/index.xml xdocs/oldnews-2014.xml

[kkolinko]

Author: kkolinko
Date: Fri Feb 27 11:38:13 2015
New Revision: 1662662

URL: http://svn.apache.org/r1662662
Log:
Announcement for Standard Taglib 1.2.3.

I do not like the CVE link (goes to announce@a.o mail archive) and CHANGES link 
(goes to SVN), as I noted in a FIXME comment in index.xml.  Any better ideas?

Modified:
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/oldnews-2014.html
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/oldnews-2014.xml

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1662662&r1=1662661&r2=1662662&view=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Fri Feb 27 11:38:13 2015
@@ -224,6 +224,36 @@ project logo are trademarks of the Apach
 
 
 
+
+2015-02-20 Apache Standard Taglib 1.2.3 
Released
+
+
+
+
+The Apache Tomcat Project is proud to announce the release of version 1.2.3 of 
+the Standard Taglib. This tag library provides Apache's implementation 
+of the JSTL 1.2 specification.
+
+
+
+Version 1.2.3 is a security and bug fix release. It fixes a few bugs found
+in Standard Taglib 1.2.1 and provides protection against
+http://mail-archives.apache.org/mod_mbox/www-announce/201502.mbox/%3C82207A16-6348-4DEE-877E-F7B87292576A%40apache.org%3E";>CVE-2015-0254
+vulnerability (XXE and RCE via XSL extension in JSTL XML tags).
+
+
+
+Please see the Standard Taglib site for more 
details. 
+
+
+
+
+Download |
+http://svn.apache.org/repos/asf/tomcat/taglibs/standard/trunk/CHANGES.txt";>Changes
+
+
+
+
 
 2015-02-20 Tomcat 8.0.20 Released
 
@@ -368,27 +398,6 @@ This version fixes few bugs found in pre
 
 
 
-
-
-2014-01-02 Apache Standard Taglib 1.2.1 
Released
-
-
-
-The Apache Tomcat Project is proud to announce the release of version 1.2.1 of 
-the Standard Taglib. This is the first official release of Apache's 
implementation 
-of the JSTL 1.2 specification. 
-
-
-
-Please see the Standard Taglib site for more 
details. 
-
-
-
-
-Download
-
-
-
 
 
 2013-11-11 Tomcat Maven Plugin 2.2 
Released

Modified: tomcat/site/trunk/docs/oldnews-2014.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2014.html?rev=1662662&r1=1662661&r2=1662662&view=diff
==
--- tomcat/site/trunk/docs/oldnews-2014.html (original)
+++ tomcat/site/trunk/docs/oldnews-2014.html Fri Feb 27 11:38:13 2015
@@ -1047,6 +1047,27 @@ Full details of these changes, and all t
 
 
 
+
+2014-01-02 Apache Standard Taglib 1.2.1 
Released
+
+
+
+The Apache Tomcat Project is proud to announce the release of version 1.2.1 of 
+the Standard Taglib. This is the first official release of Apache's 
implementation 
+of the JSTL 1.2 specification. 
+
+
+
+Please see the Standard Taglib site for more 
details. 
+
+
+
+
+Download
+
+
+
+
 
 
 

Modified: tomcat/site/trunk/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/index.xml?rev=1662662&r1=1662661&r2=1662662&view=diff
==
--- tomcat/site/trunk/xdocs/index.xml (original)
+++ tomcat/site/trunk/xdocs/index.xml Fri Feb 27 11:38:13 2015
@@ -37,6 +37,37 @@ project logo are trademarks of the Apach
 
 
 
+
+
+
+The Apache Tomcat Project is proud to announce the release of version 1.2.3 of 
+the Standard Taglib. This tag library provides Apache's implementation 
+of the JSTL 1.2 specification.
+
+
+Version 1.2.3 is a security and bug fix release. It fixes a few bugs found
+in Standard Taglib 1.2.1 and provides protection against
+http://mail-archives.apache.org/mod_mbox/www-announce/201502.mbox/%3C82207A16-6348-4DEE-877E-F7B87292576A%40apache.org%3E";>CVE-2015-0254
+vulnerability (XXE and RCE via XSL extension in JSTL XML tags).
+
+
+Please see the Standard Taglib site for more 
details. 
+
+
+Download |
+http://svn.apache.org/repos/asf/tomcat/taglibs/standard/trunk/CHANGES.txt";>Changes
+
+
+
 
 
 The Apache Tomcat Project is proud to announce the release of version 8.0.20
@@ -133,20 +164,6 @@ This version fixes few bugs found in pre
 
 
 
-
-
-The Apache Tomcat Project is proud to announce the release of version 1.2.1 of 
-the Standard Taglib. This is the first official release of Apache's 
implementation 
-of the JSTL 1.2 specification. 
-
-
-Please see the Standard Taglib site for more 
details. 
-
-
-Download
-
-
-
 
 
 The Apache Tomcat team is pleased to announce the release of Tomcat Maven 
Plugin 2.2.

Modified: tomcat/site/trunk/xdocs/oldnews-2014.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/oldnews-2014.xml?rev=1662662&r1=1662661&r2=1662662&view=diff
==
--- tomcat/site/trunk/xdocs/oldnews-2014.xml (original)
+++ tomcat/site/trunk/xdocs/oldnews-2014.xml Fri Feb 27 11:38:13 2015

Re: Stabilizing the trunk (9.0.x) build

[Mark Thomas]

Another update. I think I am getting close to being able to commit these
changes[1].

The current status is:
- NIO appears to pass on Windows, OSX and Linux
- APR appears to pass on OSX and Linux
- APR unknown on Windows
- NIO2 appears to pass on OSX and Linux
- NIO2 hanging on Windows

I say "appears to pass" since with timing issues one can never be sure.

There is also an issue with APR on Linux that I can reproduce (with some
code changes) that triggers a crash every couple of runs. I'm not sure
if it is possible to trigger the error with the current code. I plan to
look at this some more once the unit tests are passing.

Mark


[1] https://github.com/markt-asf/tomcat/tree/markt-trunk

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

Re: Stabilizing the trunk (9.0.x) build

[Christopher Schultz]

Mark,

On 2/27/15 7:00 AM, Mark Thomas wrote:
> Another update. I think I am getting close to being able to commit these
> changes[1].
> 
> The current status is:
> - NIO appears to pass on Windows, OSX and Linux
> - APR appears to pass on OSX and Linux
> - APR unknown on Windows
> - NIO2 appears to pass on OSX and Linux
> - NIO2 hanging on Windows
> 
> I say "appears to pass" since with timing issues one can never be sure.
> 
> There is also an issue with APR on Linux that I can reproduce (with some
> code changes) that triggers a crash every couple of runs.

Next time is happens, can you give me the backtrace and register details
(basically, the top of the Java hs_* file)?

From my perspective, it should not be possible to crash tcnative if we
can help it -- even if the Java code is all kinds of wrong. Throwing
exceptions is fine, but taking-down the JVM is obnoxious :)

> I'm not sure if it is possible to trigger the error with the current
> code. I plan to look at this some more once the unit tests are
> passing.

-chris



signature.asc
Description: OpenPGP digital signature

[Bug 57643] New: jasper ant task fails when there is a space in uriroot

[bugzilla]

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

Bug ID: 57643
   Summary: jasper ant task fails when there is a space in uriroot
   Product: Tomcat 7
   Version: 7.0.59
  Hardware: All
OS: All
Status: NEW
  Severity: normal
  Priority: P2
 Component: Jasper
  Assignee: dev@tomcat.apache.org
  Reporter: qu...@yanceymail.com

Created attachment 32525
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=32525&action=edit
zip file containing a simple web app and ant build file to compile the jsps

When invoking the jasper ant task, it will fail if there is a space in the path
specified by the uriroot attribute. Possibly a side effect from 57316.

See attached example.

Extract the attached zip file, then extract both the 7.0.57 and 7.0.59 versions
of tomcat into the "jasper compile test" directory. I used the 64-bit Windows
zip. Run ant.

output:
PS C:\work\jasper compile test> ant
Buildfile: C:\work\jasper compile test\build.xml

jsp_compile_both:

jsp_compile:
 [echo] * C:\work\jasper compile
test/apache-tomcat-7.0.57 *
   [delete] Deleting directory C:\work\jasper compile test\tmp
  [jasper2] Feb 27, 2015 8:29:14 AM
org.apache.jasper.compiler.TldLocationsCache tldScanJar
  [jasper2] INFO: At least one JAR was scanned for TLDs yet contained no TLDs.
Enable debug logging for this logger for a complete list of JARs that were
scanned but no TLDs were found in them. Skipping unneeded JARs during scanning
can improve startup time and JSP compilation time.
  [jasper2] Feb 27, 2015 8:29:14 AM org.apache.jasper.JspC processFile
  [jasper2] INFO: Built File: \index.jsp
   [delete] Deleting directory C:\work\jasper compile test\tmp
 [echo] * Complete *

jsp_compile:
 [echo] * C:\work\jasper compile
test/apache-tomcat-7.0.59 *
  [jasper2] Feb 27, 2015 8:29:14 AM
org.apache.jasper.compiler.TldLocationsCache tldScanJar
  [jasper2] INFO: At least one JAR was scanned for TLDs yet contained no TLDs.
Enable debug logging for this logger for a complete list of JARs that were
scanned but no TLDs were found in them. Skipping unneeded JARs during scanning
can improve startup time and JSP compilation time.

BUILD FAILED
C:\work\jasper compile test\build.xml:11: The following error occurred while
executing this line:
C:\work\jasper compile test\build.xml:36: org.apache.jasper.JasperException:
The absolute uri: http://java.sun.com/jsp/jstl/core cannot be resolved in
either web.xml or the jar files deployed with this application
at
org.apache.jasper.compiler.DefaultErrorHandler.jspError(DefaultErrorHandler.java:56)
at
org.apache.jasper.compiler.ErrorDispatcher.dispatch(ErrorDispatcher.java:445)
at
org.apache.jasper.compiler.ErrorDispatcher.jspError(ErrorDispatcher.java:117)
at
org.apache.jasper.compiler.TagLibraryInfoImpl.generateTLDLocation(TagLibraryInfoImpl.java:325)
at
org.apache.jasper.compiler.TagLibraryInfoImpl.(TagLibraryInfoImpl.java:154)
at
org.apache.jasper.compiler.Parser.parseTaglibDirective(Parser.java:410)
at org.apache.jasper.compiler.Parser.parseDirective(Parser.java:475)
at org.apache.jasper.compiler.Parser.parseElements(Parser.java:1410)
at org.apache.jasper.compiler.Parser.parse(Parser.java:138)
at
org.apache.jasper.compiler.ParserController.doParse(ParserController.java:242)
at
org.apache.jasper.compiler.ParserController.parse(ParserController.java:102)
at org.apache.jasper.compiler.Compiler.generateJava(Compiler.java:199)
at org.apache.jasper.compiler.Compiler.compile(Compiler.java:374)
at org.apache.jasper.JspC.processFile(JspC.java:1213)
at org.apache.jasper.JspC.execute(JspC.java:1364)
at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:291)
at sun.reflect.GeneratedMethodAccessor4.invoke(Unknown Source)
at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:606)
at
org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:106)
at org.apache.tools.ant.Task.perform(Task.java:348)
at org.apache.tools.ant.Target.execute(Target.java:392)
at org.apache.tools.ant.Target.performTasks(Target.java:413)
at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1399)
at
org.apache.tools.ant.helper.SingleCheckExecutor.executeTargets(SingleCheckExecutor.java:38)
at org.apache.tools.ant.Project.executeTargets(Project.java:1251)
at org.apache.tools.ant.taskdefs.Ant.execute(Ant.java:442)
at
org.apache.tools.ant.taskdefs.CallTarget.execute(CallTarget.java:105)
at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:291)
 

svn commit: r1662694 - in /tomcat/trunk/java/org/apache: coyote/http11/ coyote/http11/upgrade/ tomcat/websocket/server/

[markt]

Author: markt
Date: Fri Feb 27 15:00:17 2015
New Revision: 1662694

URL: http://svn.apache.org/r1662694
Log:
Checkpoint - switch WebSocket over to new UpgradeProcessorInternal

Added:

tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorInternal.java
   (with props)
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java

tomcat/trunk/java/org/apache/coyote/http11/upgrade/InternalHttpUpgradeHandler.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java

tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java

tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java

tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java

Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1662694&r1=1662693&r2=1662694&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Fri 
Feb 27 15:00:17 2015
@@ -23,7 +23,9 @@ import javax.servlet.http.HttpUpgradeHan
 
 import org.apache.coyote.AbstractProtocol;
 import org.apache.coyote.Processor;
+import org.apache.coyote.http11.upgrade.InternalHttpUpgradeHandler;
 import org.apache.coyote.http11.upgrade.UpgradeProcessorExternal;
+import org.apache.coyote.http11.upgrade.UpgradeProcessorInternal;
 import org.apache.tomcat.util.net.AbstractEndpoint;
 import org.apache.tomcat.util.net.SocketWrapperBase;
 
@@ -283,7 +285,12 @@ public abstract class AbstractHttp11Prot
 SocketWrapperBase socket, ByteBuffer leftoverInput,
 HttpUpgradeHandler httpUpgradeHandler)
 throws IOException {
-return new UpgradeProcessorExternal(socket, leftoverInput, 
httpUpgradeHandler);
+if (httpUpgradeHandler instanceof InternalHttpUpgradeHandler) {
+return new UpgradeProcessorInternal(socket, leftoverInput,
+(InternalHttpUpgradeHandler) httpUpgradeHandler);
+} else {
+return new UpgradeProcessorExternal(socket, leftoverInput, 
httpUpgradeHandler);
+}
 }
 }
 }

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/InternalHttpUpgradeHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/InternalHttpUpgradeHandler.java?rev=1662694&r1=1662693&r2=1662694&view=diff
==
--- 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/InternalHttpUpgradeHandler.java
 (original)
+++ 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/InternalHttpUpgradeHandler.java
 Fri Feb 27 15:00:17 2015
@@ -20,6 +20,7 @@ import javax.servlet.http.HttpUpgradeHan
 
 import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
 import org.apache.tomcat.util.net.SocketStatus;
+import org.apache.tomcat.util.net.SocketWrapperBase;
 
 
 /**
@@ -34,4 +35,6 @@ import org.apache.tomcat.util.net.Socket
 public interface InternalHttpUpgradeHandler extends HttpUpgradeHandler {
 
 SocketState upgradeDispatch(SocketStatus status);
+
+void setSocketWrapper(SocketWrapperBase wrapper);
 }
\ No newline at end of file

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java?rev=1662694&r1=1662693&r2=1662694&view=diff
==
--- 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java 
(original)
+++ 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java 
Fri Feb 27 15:00:17 2015
@@ -21,6 +21,7 @@ import java.nio.ByteBuffer;
 import java.util.concurrent.Executor;
 
 import javax.servlet.http.HttpUpgradeHandler;
+import javax.servlet.http.WebConnection;
 
 import org.apache.coyote.Processor;
 import org.apache.coyote.Request;
@@ -29,7 +30,7 @@ import org.apache.tomcat.util.net.SSLSup
 import org.apache.tomcat.util.net.SocketStatus;
 import org.apache.tomcat.util.net.SocketWrapperBase;
 
-public abstract class UpgradeProcessorBase implements Processor {
+public abstract class UpgradeProcessorBase implements Processor, WebConnection 
{
 
 public UpgradeProcessorBase(SocketWrapperBase wrapper, ByteBuffer 
leftOverInput) {
 wrapper.unRead(leftOverInput);

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/u

svn commit: r1662692 - in /tomcat/trunk/java/org/apache/coyote/http11: AbstractHttp11Protocol.java upgrade/UpgradeProcessor.java upgrade/UpgradeProcessorBase.java upgrade/UpgradeProcessorExternal.java

[markt]

Author: markt
Date: Fri Feb 27 15:00:04 2015
New Revision: 1662692

URL: http://svn.apache.org/r1662692
Log:
Start moving towards separate internal (uses I/O layer directly) and
external (uses Servlet[Input|Output]Stream]) implementations of
UpgradeProcessor

Added:

tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java   
(with props)

tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java
   (contents, props changed)
  - copied, changed from r1662614, 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java
Removed:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java

Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1662692&r1=1662691&r2=1662692&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Fri 
Feb 27 15:00:04 2015
@@ -23,7 +23,7 @@ import javax.servlet.http.HttpUpgradeHan
 
 import org.apache.coyote.AbstractProtocol;
 import org.apache.coyote.Processor;
-import org.apache.coyote.http11.upgrade.UpgradeProcessor;
+import org.apache.coyote.http11.upgrade.UpgradeProcessorExternal;
 import org.apache.tomcat.util.net.AbstractEndpoint;
 import org.apache.tomcat.util.net.SocketWrapperBase;
 
@@ -283,7 +283,7 @@ public abstract class AbstractHttp11Prot
 SocketWrapperBase socket, ByteBuffer leftoverInput,
 HttpUpgradeHandler httpUpgradeHandler)
 throws IOException {
-return new UpgradeProcessor(socket, leftoverInput, 
httpUpgradeHandler);
+return new UpgradeProcessorExternal(socket, leftoverInput, 
httpUpgradeHandler);
 }
 }
 }

Added: 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java?rev=1662692&view=auto
==
--- 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java 
(added)
+++ 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java 
Fri Feb 27 15:00:04 2015
@@ -0,0 +1,22 @@
+/*
+ *  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.coyote.http11.upgrade;
+
+import org.apache.coyote.Processor;
+
+public abstract class UpgradeProcessorBase implements Processor {
+}

Propchange: 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java
--
svn:eol-style = native

Copied: 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java
 (from r1662614, 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java)
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java?p2=tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java&p1=tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java&r1=1662614&r2=1662692&rev=1662692&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java 
(original)
+++ 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java
 Fri Feb 27 15:00:04 2015
@@ -25,7 +25,6 @@ import javax.servlet.ServletOutputStream
 import javax.servlet.http.HttpUpgradeHandler;
 import javax.servlet.http.WebConnection;
 
-import org.apache.coyote.Processor;
 import org.apache.coyote.Request;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
@@ -35,19 +34,19 @@ import org.apache.tomcat.util.net.Socket
 import org.apache.tomcat.util.net.SocketWrapperBase;
 import org.apache.tomcat.util.res.St

svn commit: r1662693 - in /tomcat/trunk/java/org/apache: coyote/http11/upgrade/ tomcat/websocket/server/

[markt]

Author: markt
Date: Fri Feb 27 15:00:10 2015
New Revision: 1662693

URL: http://svn.apache.org/r1662693
Log:
Add an InternalHttpUpgradeHandler. Not currently used.

Modified:

tomcat/trunk/java/org/apache/coyote/http11/upgrade/InternalHttpUpgradeHandler.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java

tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java

tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/InternalHttpUpgradeHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/InternalHttpUpgradeHandler.java?rev=1662693&r1=1662692&r2=1662693&view=diff
==
--- 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/InternalHttpUpgradeHandler.java
 (original)
+++ 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/InternalHttpUpgradeHandler.java
 Fri Feb 27 15:00:10 2015
@@ -18,6 +18,9 @@ package org.apache.coyote.http11.upgrade
 
 import javax.servlet.http.HttpUpgradeHandler;
 
+import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
+import org.apache.tomcat.util.net.SocketStatus;
+
 
 /**
  * Currently just a marker interface to enable Tomcat to identify
@@ -29,4 +32,6 @@ import javax.servlet.http.HttpUpgradeHan
  * Servlet API.
  */
 public interface InternalHttpUpgradeHandler extends HttpUpgradeHandler {
+
+SocketState upgradeDispatch(SocketStatus status);
 }
\ No newline at end of file

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java?rev=1662693&r1=1662692&r2=1662693&view=diff
==
--- 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java 
(original)
+++ 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java 
Fri Feb 27 15:00:10 2015
@@ -16,7 +16,104 @@
  */
 package org.apache.coyote.http11.upgrade;
 
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.concurrent.Executor;
+
+import javax.servlet.http.HttpUpgradeHandler;
+
 import org.apache.coyote.Processor;
+import org.apache.coyote.Request;
+import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
+import org.apache.tomcat.util.net.SSLSupport;
+import org.apache.tomcat.util.net.SocketStatus;
+import org.apache.tomcat.util.net.SocketWrapperBase;
 
 public abstract class UpgradeProcessorBase implements Processor {
+
+public UpgradeProcessorBase(SocketWrapperBase wrapper, ByteBuffer 
leftOverInput) {
+wrapper.unRead(leftOverInput);
+}
+
+
+// --- Implemented Processor 
methods
+
+@Override
+public final boolean isUpgrade() {
+return true;
+}
+
+
+@Override
+public final void recycle() {
+// Currently a NO-OP as upgrade processors are not recycled.
+}
+
+
+//  Processor methods that are NO-OP for 
upgrade
+
+@Override
+public HttpUpgradeHandler getHttpUpgradeHandler() {
+return null;
+}
+
+
+@Override
+public final Executor getExecutor() {
+return null;
+}
+
+
+@Override
+public final SocketState process(SocketWrapperBase socketWrapper) 
throws IOException {
+return null;
+}
+
+
+@Override
+public final SocketState asyncDispatch(SocketStatus status) {
+return null;
+}
+
+
+@Override
+public void errorDispatch() {
+// NO-OP
+}
+
+
+@Override
+public final SocketState asyncPostProcess() {
+return null;
+}
+
+
+@Override
+public final boolean isAsync() {
+return false;
+}
+
+
+@Override
+public final Request getRequest() {
+return null;
+}
+
+
+@Override
+public String getClientCertProvider() {
+return null;
+}
+
+
+@Override
+public final void setSslSupport(SSLSupport sslSupport) {
+// NOOP
+}
+
+
+@Override
+public ByteBuffer getLeftoverInput() {
+return null;
+}
 }

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java?rev=1662693&r1=1662692&r2=1662693&view=diff
==
--- 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java
 (original)
+++ 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java
 Fri Feb 27 15:00:10 2015
@@ -18,18 +18,15 @@ package org.apache.coyote.http11.upgrade
 
 import java.io.IOException;
 import java.nio

svn commit: r1662695 - in /tomcat/trunk/java/org/apache: coyote/http11/upgrade/ tomcat/websocket/server/

[markt]

Author: markt
Date: Fri Feb 27 15:00:23 2015
New Revision: 1662695

URL: http://svn.apache.org/r1662695
Log:
Unit tests pass. Still stack traces in test logs to resolve.

Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java

tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java

tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorInternal.java

tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java?rev=1662695&r1=1662694&r2=1662695&view=diff
==
--- 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java 
(original)
+++ 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java 
Fri Feb 27 15:00:23 2015
@@ -32,6 +32,8 @@ import org.apache.tomcat.util.net.Socket
 
 public abstract class UpgradeProcessorBase implements Processor, WebConnection 
{
 
+protected static final int INFINITE_TIMEOUT = -1;
+
 public UpgradeProcessorBase(SocketWrapperBase wrapper, ByteBuffer 
leftOverInput) {
 wrapper.unRead(leftOverInput);
 }

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java?rev=1662695&r1=1662694&r2=1662695&view=diff
==
--- 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java
 (original)
+++ 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java
 Fri Feb 27 15:00:23 2015
@@ -32,8 +32,6 @@ import org.apache.tomcat.util.res.String
 
 public class UpgradeProcessorExternal extends UpgradeProcessorBase {
 
-private static final int INFINITE_TIMEOUT = -1;
-
 private static final Log log = 
LogFactory.getLog(UpgradeProcessorExternal.class);
 private static final StringManager sm = 
StringManager.getManager(UpgradeProcessorExternal.class);
 

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorInternal.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorInternal.java?rev=1662695&r1=1662694&r2=1662695&view=diff
==
--- 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorInternal.java
 (original)
+++ 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorInternal.java
 Fri Feb 27 15:00:23 2015
@@ -34,7 +34,14 @@ public class UpgradeProcessorInternal ex
 InternalHttpUpgradeHandler internalHttpUpgradeHandler) {
 super(wrapper, leftOverInput);
 this.internalHttpUpgradeHandler = internalHttpUpgradeHandler;
+/*
+ * Leave timeouts in the hands of the upgraded protocol.
+ */
+wrapper.setReadTimeout(INFINITE_TIMEOUT);
+wrapper.setWriteTimeout(INFINITE_TIMEOUT);
+
 internalHttpUpgradeHandler.setSocketWrapper(wrapper);
+wrapper.setInternalUpgrade(true);
 }
 
 

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java?rev=1662695&r1=1662694&r2=1662695&view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
 (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
 Fri Feb 27 15:00:23 2015
@@ -83,13 +83,9 @@ public class WsRemoteEndpointImplServer
 
 public void onWritePossible(boolean useDispatch) {
 ByteBuffer[] buffers = this.buffers;
-if (buffers == null) {
-// Servlet 3.1 will call the write listener once even if nothing
-// was written
-return;
-}
 boolean complete = false;
 try {
+socketWrapper.flush(false);
 // If this is false there will be a call back when it is true
 while (socketWrapper.isReadyForWrite()) {
 complete = true;



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

svn commit: r1662696 - /tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java

[markt]

Author: markt
Date: Fri Feb 27 15:00:28 2015
New Revision: 1662696

URL: http://svn.apache.org/r1662696
Log:
Resolve stack trace on session close.

Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java

Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java?rev=1662696&r1=1662695&r2=1662696&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java Fri Feb 27 
15:00:28 2015
@@ -505,7 +505,9 @@ public class WsSession implements Sessio
 log.warn(sm.getString("wsSession.flushFailOnClose"), e);
 fireEndpointOnError(e);
 }
-sendCloseMessage(closeReason);
+if (state == State.OPEN) {
+sendCloseMessage(closeReason);
+}
 fireEndpointOnClose(closeReason);
 state = State.CLOSED;
 



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

svn commit: r1662697 - /tomcat/trunk/java/javax/websocket/SendResult.java

[markt]

Author: markt
Date: Fri Feb 27 15:00:32 2015
New Revision: 1662697

URL: http://svn.apache.org/r1662697
Log:
Make fields final

Modified:
tomcat/trunk/java/javax/websocket/SendResult.java

Modified: tomcat/trunk/java/javax/websocket/SendResult.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/websocket/SendResult.java?rev=1662697&r1=1662696&r2=1662697&view=diff
==
--- tomcat/trunk/java/javax/websocket/SendResult.java (original)
+++ tomcat/trunk/java/javax/websocket/SendResult.java Fri Feb 27 15:00:32 2015
@@ -17,16 +17,16 @@
 package javax.websocket;
 
 public final class SendResult {
-private Throwable exception;
-private boolean ok = true;
+private final Throwable exception;
+private final boolean ok;
 
 public SendResult(Throwable exception) {
 this.exception = exception;
-this.ok = false;
+this.ok = (exception == null);
 }
 
 public SendResult() {
-// NO-OP
+this (null);
 }
 
 public Throwable getException() {



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

svn commit: r1662698 - in /tomcat/trunk: java/org/apache/tomcat/websocket/ java/org/apache/tomcat/websocket/server/ test/org/apache/tomcat/websocket/

[markt]

Author: markt
Date: Fri Feb 27 15:00:39 2015
New Revision: 1662698

URL: http://svn.apache.org/r1662698
Log:
Switch to using blocking writes directly

Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/MessagePart.java
tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java

tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplClient.java

tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java

Modified: tomcat/trunk/java/org/apache/tomcat/websocket/MessagePart.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/MessagePart.java?rev=1662698&r1=1662697&r2=1662698&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/MessagePart.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/MessagePart.java Fri Feb 27 
15:00:39 2015
@@ -27,15 +27,18 @@ class MessagePart {
 private final ByteBuffer payload;
 private final SendHandler intermediateHandler;
 private volatile SendHandler endHandler;
+private final long blockingWriteTimeoutExpiry;
 
 public MessagePart( boolean fin, int rsv, byte opCode, ByteBuffer payload,
-SendHandler intermediateHandler, SendHandler endHandler) {
+SendHandler intermediateHandler, SendHandler endHandler,
+long blockingWriteTimeoutExpiry) {
 this.fin = fin;
 this.rsv = rsv;
 this.opCode = opCode;
 this.payload = payload;
 this.intermediateHandler = intermediateHandler;
 this.endHandler = endHandler;
+this.blockingWriteTimeoutExpiry = blockingWriteTimeoutExpiry;
 }
 
 
@@ -71,6 +74,10 @@ class MessagePart {
 public void setEndHandler(SendHandler endHandler) {
 this.endHandler = endHandler;
 }
+
+public long getBlockingWriteTimeoutExpiry() {
+return blockingWriteTimeoutExpiry;
+}
 }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java?rev=1662698&r1=1662697&r2=1662698&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java Fri 
Feb 27 15:00:39 2015
@@ -362,13 +362,14 @@ public class PerMessageDeflate implement
 boolean fin = uncompressedPart.isFin();
 boolean full = compressedPayload.limit() == 
compressedPayload.capacity();
 boolean needsInput = deflater.needsInput();
+long blockingWriteTimeoutExpiry = 
uncompressedPart.getBlockingWriteTimeoutExpiry();
 
 if (fin && !full && needsInput) {
 // End of compressed message. Drop EOM bytes and 
output.
 compressedPayload.limit(compressedPayload.limit() - 
EOM_BYTES.length);
 compressedPart = new MessagePart(true, 
getRsv(uncompressedPart),
 opCode, compressedPayload, 
uncompressedIntermediateHandler,
-uncompressedIntermediateHandler);
+uncompressedIntermediateHandler, 
blockingWriteTimeoutExpiry);
 deflateRequired = false;
 startNewMessage();
 } else if (full && !needsInput) {
@@ -376,13 +377,13 @@ public class PerMessageDeflate implement
 // Output and start new compressed part.
 compressedPart = new MessagePart(false, 
getRsv(uncompressedPart),
 opCode, compressedPayload, 
uncompressedIntermediateHandler,
-uncompressedIntermediateHandler);
+uncompressedIntermediateHandler, 
blockingWriteTimeoutExpiry);
 } else if (!fin && full && needsInput) {
 // Write buffer full and input message not fully read.
 // Output and get more data.
 compressedPart = new MessagePart(false, 
getRsv(uncompressedPart),
 opCode, compressedPayload, 
uncompressedIntermediateHandler,
-uncompressedIntermediateHandler);
+uncompressedIntermediateHandler, 
blockingWriteTimeoutExpiry);
 deflateRequired = false;
 } else if (fin && full && needsInput) {
 // Write buffer full. Input fully read. Deflater may be
@@ -398,7 +399,8 @@ pu

svn commit: r1662702 - /tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java

[markt]

Author: markt
Date: Fri Feb 27 15:01:01 2015
New Revision: 1662702

URL: http://svn.apache.org/r1662702
Log:
Refactor with a view to using a common method for text and binary
blocking messages.

Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java?rev=1662702&r1=1662701&r2=1662702&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java 
Fri Feb 27 15:01:01 2015
@@ -275,7 +275,12 @@ public abstract class WsRemoteEndpointIm
 } else {
 timeoutExpiry = System.currentTimeMillis() + timeout;
 }
+sendMessageBlock(opCode, payload, last, timeoutExpiry);
+}
 
+
+private void sendMessageBlock(byte opCode, ByteBuffer payload, boolean 
last,
+long timeoutExpiry) throws IOException {
 wsSession.updateLastActive();
 
 BlockingSendHandler bsh = new BlockingSendHandler();
@@ -292,6 +297,7 @@ public abstract class WsRemoteEndpointIm
 return;
 }
 
+long timeout = timeoutExpiry - System.currentTimeMillis();
 synchronized (messagePartLock) {
 try {
 if (!messagePartInProgress.tryAcquire(timeout, 
TimeUnit.MILLISECONDS)) {



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

svn commit: r1662703 - /tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java

[markt]

Author: markt
Date: Fri Feb 27 15:01:06 2015
New Revision: 1662703

URL: http://svn.apache.org/r1662703
Log:
Refactor blocking text messages to use blocking writes rather than the
TextMessageSendHandler

Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java?rev=1662703&r1=1662702&r2=1662703&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java 
Fri Feb 27 15:01:06 2015
@@ -31,7 +31,6 @@ import java.util.concurrent.ExecutionExc
 import java.util.concurrent.Future;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import javax.websocket.DeploymentException;
@@ -242,40 +241,38 @@ public abstract class WsRemoteEndpointIm
 
 
 void sendMessageBlock(CharBuffer part, boolean last) throws IOException {
-try {
-// Get the timeout before we send the message. The message may
-// trigger a session close and depending on timing the client
-// session may close before we can read the timeout.
-long timeout = getBlockingSendTimeout();
-FutureToSendHandler f2sh = new FutureToSendHandler(wsSession);
-TextMessageSendHandler tmsh = new TextMessageSendHandler(f2sh, 
part,
-last, encoder, encoderBuffer, this);
-tmsh.write();
-if (timeout == -1) {
-f2sh.get();
-} else {
-f2sh.get(timeout, TimeUnit.MILLISECONDS);
+long timeoutExpiry = getTimeoutExpiry();
+boolean isDone = false;
+while (!isDone) {
+encoderBuffer.clear();
+CoderResult cr = encoder.encode(part, encoderBuffer, true);
+if (cr.isError()) {
+throw new IllegalArgumentException(cr.toString());
 }
-} catch (InterruptedException | ExecutionException |
-TimeoutException e) {
-throw new IOException(e);
+isDone = !cr.isOverflow();
+encoderBuffer.flip();
+sendMessageBlock(Constants.OPCODE_TEXT, encoderBuffer, last && 
isDone, timeoutExpiry);
 }
+stateMachine.complete(last);
 }
 
 
 void sendMessageBlock(byte opCode, ByteBuffer payload, boolean last)
 throws IOException {
+sendMessageBlock(opCode, payload, last, getTimeoutExpiry());
+}
+
+
+private long getTimeoutExpiry() {
 // Get the timeout before we send the message. The message may
 // trigger a session close and depending on timing the client
 // session may close before we can read the timeout.
 long timeout = getBlockingSendTimeout();
-long timeoutExpiry;
 if (timeout < 0) {
-timeoutExpiry = Long.MAX_VALUE;
+return Long.MAX_VALUE;
 } else {
-timeoutExpiry = System.currentTimeMillis() + timeout;
+return System.currentTimeMillis() + timeout;
 }
-sendMessageBlock(opCode, payload, last, timeoutExpiry);
 }
 
 
@@ -863,7 +860,7 @@ public abstract class WsRemoteEndpointIm
 if (payloadLeft > outputSpace) {
 // Restore the original limit
 payload.limit(payloadLimit);
-// Still more headers to write, need to flush
+// Still more data to write, need to flush
 outputBuffer.flip();
 endpoint.doWrite(this, blockingWriteTimeoutExpiry, 
outputBuffer);
 return;
@@ -872,12 +869,12 @@ public abstract class WsRemoteEndpointIm
 if (flushRequired) {
 outputBuffer.flip();
 if (outputBuffer.remaining() == 0) {
-handler.onResult(new SendResult());
+handler.onResult(SENDRESULT_OK);
 } else {
 endpoint.doWrite(this, blockingWriteTimeoutExpiry, 
outputBuffer);
 }
 } else {
-handler.onResult(new SendResult());
+handler.onResult(SENDRESULT_OK);
 }
 }
 



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

svn commit: r1662706 - /tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java

[markt]

Author: markt
Date: Fri Feb 27 15:01:20 2015
New Revision: 1662706

URL: http://svn.apache.org/r1662706
Log:
Fix infinite loop observed while running unit tests when write is called
with no data on the input side and wrapping also produces no data.
This is the non-timeout version of the fix that was previously applied
to get(long,TimeUnit)

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

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java?rev=1662706&r1=1662705&r2=1662706&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java Fri Feb 
27 15:01:20 2015
@@ -646,8 +646,7 @@ public class SecureNio2Channel extends N
 writePending = false;
 throw new ExecutionException(t);
 }
-integer.get();
-if (written == 0) {
+if (integer.get().intValue() > 0 && written == 0) {
 wrap();
 return get();
 } else {



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

svn commit: r1662707 - /tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java

[markt]

Author: markt
Date: Fri Feb 27 15:01:25 2015
New Revision: 1662707

URL: http://svn.apache.org/r1662707
Log:
Writes are not guaranteed to empty the buffer

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

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java?rev=1662707&r1=1662706&r2=1662707&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java Fri Feb 
27 15:01:25 2015
@@ -671,17 +671,18 @@ public class SecureNio2Channel extends N
 }
 }
 protected void wrap() {
-//The data buffer should be empty, we can reuse the entire buffer.
-netOutBuffer.clear();
 try {
-SSLEngineResult result = sslEngine.wrap(src, netOutBuffer);
-written = result.bytesConsumed();
-netOutBuffer.flip();
-if (result.getStatus() == Status.OK) {
-if (result.getHandshakeStatus() == 
HandshakeStatus.NEED_TASK)
-tasks();
-} else {
-t = new 
IOException(sm.getString("channel.nio.ssl.wrapFail", result.getStatus()));
+if (!netOutBuffer.hasRemaining()) {
+netOutBuffer.clear();
+SSLEngineResult result = sslEngine.wrap(src, netOutBuffer);
+written = result.bytesConsumed();
+netOutBuffer.flip();
+if (result.getStatus() == Status.OK) {
+if (result.getHandshakeStatus() == 
HandshakeStatus.NEED_TASK)
+tasks();
+} else {
+t = new 
IOException(sm.getString("channel.nio.ssl.wrapFail", result.getStatus()));
+}
 }
 integer = sc.write(netOutBuffer);
 } catch (SSLException e) {



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

Re: Stabilizing the trunk (9.0.x) build

[Mark Thomas]

On 27/02/2015 14:42, Christopher Schultz wrote:
> Mark,
> 
> On 2/27/15 7:00 AM, Mark Thomas wrote:
>> Another update. I think I am getting close to being able to commit these
>> changes[1].
>>
>> The current status is:
>> - NIO appears to pass on Windows, OSX and Linux
>> - APR appears to pass on OSX and Linux
>> - APR unknown on Windows
>> - NIO2 appears to pass on OSX and Linux
>> - NIO2 hanging on Windows
>>
>> I say "appears to pass" since with timing issues one can never be sure.

Cracked it (I think). Unit tests pass for all three connectors on all
three platforms.

>> There is also an issue with APR on Linux that I can reproduce (with some
>> code changes) that triggers a crash every couple of runs.
> 
> Next time is happens, can you give me the backtrace and register details
> (basically, the top of the Java hs_* file)?
> 
> From my perspective, it should not be possible to crash tcnative if we
> can help it -- even if the Java code is all kinds of wrong. Throwing
> exceptions is fine, but taking-down the JVM is obnoxious :)

I should be able to do this fairly easily. I'll open BZ item with the
info you requested when I have it.

Mark


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

svn commit: r1662700 - in /tomcat/trunk/java/org/apache/tomcat/websocket: WsRemoteEndpointImplBase.java WsSession.java

[markt]

Author: markt
Date: Fri Feb 27 15:00:52 2015
New Revision: 1662700

URL: http://svn.apache.org/r1662700
Log:
Rename now blocking happens in-line

Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java?rev=1662700&r1=1662699&r2=1662700&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java 
Fri Feb 27 15:00:52 2015
@@ -123,7 +123,7 @@ public abstract class WsRemoteEndpointIm
 
 @Override
 public void flushBatch() throws IOException {
-startMessageBlock(Constants.INTERNAL_OPCODE_FLUSH, null, true);
+sendMessageBlock(Constants.INTERNAL_OPCODE_FLUSH, null, true);
 }
 
 
@@ -132,7 +132,7 @@ public abstract class WsRemoteEndpointIm
 throw new 
IllegalArgumentException(sm.getString("wsRemoteEndpoint.nullData"));
 }
 stateMachine.binaryStart();
-startMessageBlock(Constants.OPCODE_BINARY, data, true);
+sendMessageBlock(Constants.OPCODE_BINARY, data, true);
 stateMachine.complete(true);
 }
 
@@ -163,7 +163,7 @@ public abstract class WsRemoteEndpointIm
 throw new 
IllegalArgumentException(sm.getString("wsRemoteEndpoint.nullData"));
 }
 stateMachine.binaryPartialStart();
-startMessageBlock(Constants.OPCODE_BINARY, partialByte, last);
+sendMessageBlock(Constants.OPCODE_BINARY, partialByte, last);
 stateMachine.complete(last);
 }
 
@@ -174,7 +174,7 @@ public abstract class WsRemoteEndpointIm
 if (applicationData.remaining() > 125) {
 throw new 
IllegalArgumentException(sm.getString("wsRemoteEndpoint.tooMuchData"));
 }
-startMessageBlock(Constants.OPCODE_PING, applicationData, true);
+sendMessageBlock(Constants.OPCODE_PING, applicationData, true);
 }
 
 
@@ -184,7 +184,7 @@ public abstract class WsRemoteEndpointIm
 if (applicationData.remaining() > 125) {
 throw new 
IllegalArgumentException(sm.getString("wsRemoteEndpoint.tooMuchData"));
 }
-startMessageBlock(Constants.OPCODE_PONG, applicationData, true);
+sendMessageBlock(Constants.OPCODE_PONG, applicationData, true);
 }
 
 
@@ -263,7 +263,7 @@ public abstract class WsRemoteEndpointIm
 }
 
 
-void startMessageBlock(byte opCode, ByteBuffer payload, boolean last)
+void sendMessageBlock(byte opCode, ByteBuffer payload, boolean last)
 throws IOException {
 // Get the timeout before we send the message. The message may
 // trigger a session close and depending on timing the client
@@ -1000,7 +1000,7 @@ public abstract class WsRemoteEndpointIm
 private void doWrite(boolean last) throws IOException {
 if (!Constants.STREAMS_DROP_EMPTY_MESSAGES || used) {
 buffer.flip();
-endpoint.startMessageBlock(Constants.OPCODE_BINARY, buffer, 
last);
+endpoint.sendMessageBlock(Constants.OPCODE_BINARY, buffer, 
last);
 }
 endpoint.stateMachine.complete(last);
 buffer.clear();

Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java?rev=1662700&r1=1662699&r2=1662700&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java Fri Feb 27 
15:00:52 2015
@@ -567,7 +567,7 @@ public class WsSession implements Sessio
 }
 msg.flip();
 try {
-wsRemoteEndpoint.startMessageBlock(
+wsRemoteEndpoint.sendMessageBlock(
 Constants.OPCODE_CLOSE, msg, true);
 } catch (IOException ioe) {
 // Failed to send close message. Close the socket and let the 
caller



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

svn commit: r1662711 - /tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java

[markt]

Author: markt
Date: Fri Feb 27 15:01:43 2015
New Revision: 1662711

URL: http://svn.apache.org/r1662711
Log:
Ensure write timeouts when using SSL propogate up the stack.

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

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1662711&r1=1662710&r2=1662711&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Fri Feb 27 
15:01:43 2015
@@ -2629,16 +2629,18 @@ public class AprEndpoint extends Abstrac
 // APR + SSL requires that exactly the same parameters 
are
 // passed when re-attempting the write
 }
-int sslWritten = Socket.sendb(getSocket().longValue(), 
sslOutputBuffer,
+thisTime = Socket.sendb(getSocket().longValue(), 
sslOutputBuffer,
 sslOutputBuffer.position(), 
sslOutputBuffer.limit());
-if (sslWritten > 0) {
-sslOutputBuffer.position(
-sslOutputBuffer.position() + sslWritten);
+if (thisTime > 0) {
+sslOutputBuffer.position(sslOutputBuffer.position() + 
thisTime);
 }
 } else {
 socketBufferHandler.configureWriteBufferForRead();
 thisTime = Socket.sendb(getSocket().longValue(), 
socketWriteBuffer,
 socketWriteBuffer.position(), 
socketWriteBuffer.remaining());
+if (thisTime > 0) {
+
socketWriteBuffer.position(socketWriteBuffer.position() + thisTime);
+}
 }
 if (Status.APR_STATUS_IS_EAGAIN(-thisTime)) {
 thisTime = 0;
@@ -2652,7 +2654,6 @@ public class AprEndpoint extends Abstrac
 throw new 
IOException(sm.getString("socket.apr.write.error",
 Integer.valueOf(-thisTime), getSocket(), this));
 }
-socketWriteBuffer.position(socketWriteBuffer.position() + 
thisTime);
 } while ((thisTime > 0 || getBlockingStatus()) && 
socketWriteBuffer.hasRemaining());
 
 // If there is data left in the buffer the socket will be 
registered for



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

svn commit: r1662705 - /tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java

[markt]

Author: markt
Date: Fri Feb 27 15:01:15 2015
New Revision: 1662705

URL: http://svn.apache.org/r1662705
Log:
Sync no longer necessary without current read/writes (I think)
With the sync there is a deadlock so it has to go.

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

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1662705&r1=1662704&r2=1662705&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Fri Feb 27 
15:01:15 2015
@@ -743,7 +743,7 @@ public class Nio2Endpoint extends Abstra
 
 private final CompletionHandler 
writeCompletionHandler;
 private final CompletionHandler 
gatheringWriteCompletionHandler;
-private final Semaphore writePending = new Semaphore(1); // Guarded by 
writeCompletionHandler
+private final Semaphore writePending = new Semaphore(1);
 private boolean writeInterest = false; // Guarded by 
writeCompletionHandler
 private boolean writeNotify = false;
 
@@ -1192,12 +1192,10 @@ public class Nio2Endpoint extends Abstra
 // Before doing a blocking flush, make sure that any pending non
 // blocking write has completed.
 try {
-synchronized(writeCompletionHandler) {
-if (writePending.tryAcquire(getNio2WriteTimeout(), 
TimeUnit.MILLISECONDS)) {
-writePending.release();
-} else {
-throw new SocketTimeoutException();
-}
+if (writePending.tryAcquire(getNio2WriteTimeout(), 
TimeUnit.MILLISECONDS)) {
+writePending.release();
+} else {
+throw new SocketTimeoutException();
 }
 } catch (InterruptedException e) {
 // Ignore



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

svn commit: r1662704 - /tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java

[markt]

Author: markt
Date: Fri Feb 27 15:01:11 2015
New Revision: 1662704

URL: http://svn.apache.org/r1662704
Log:
OutputBufferSendHandler expect position to be updated after a write

Modified:

tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java?rev=1662704&r1=1662703&r2=1662704&view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
 (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
 Fri Feb 27 15:01:11 2015
@@ -94,6 +94,7 @@ public class WsRemoteEndpointImplServer
 try {
 socketWrapper.write(true, buffer.array(), 
buffer.arrayOffset(),
 buffer.limit());
+buffer.position(buffer.limit());
 timeout = blockingWriteTimeoutExpiry - 
System.currentTimeMillis();
 if (timeout < 0) {
 // TODO i18n



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

svn commit: r1662701 - /tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java

[markt]

Author: markt
Date: Fri Feb 27 15:00:57 2015
New Revision: 1662701

URL: http://svn.apache.org/r1662701
Log:
Rename for consistency

Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java?rev=1662701&r1=1662700&r2=1662701&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java 
Fri Feb 27 15:00:57 2015
@@ -193,7 +193,7 @@ public abstract class WsRemoteEndpointIm
 throw new 
IllegalArgumentException(sm.getString("wsRemoteEndpoint.nullData"));
 }
 stateMachine.textStart();
-sendPartialString(CharBuffer.wrap(text), true);
+sendMessageBlock(CharBuffer.wrap(text), true);
 }
 
 
@@ -225,7 +225,7 @@ public abstract class WsRemoteEndpointIm
 throw new 
IllegalArgumentException(sm.getString("wsRemoteEndpoint.nullData"));
 }
 stateMachine.textPartialStart();
-sendPartialString(CharBuffer.wrap(fragment), isLast);
+sendMessageBlock(CharBuffer.wrap(fragment), isLast);
 }
 
 
@@ -241,7 +241,7 @@ public abstract class WsRemoteEndpointIm
 }
 
 
-void sendPartialString(CharBuffer part, boolean last) throws IOException {
+void sendMessageBlock(CharBuffer part, boolean last) throws IOException {
 try {
 // Get the timeout before we send the message. The message may
 // trigger a session close and depending on timing the client
@@ -1077,7 +1077,7 @@ public abstract class WsRemoteEndpointIm
 private void doWrite(boolean last) throws IOException {
 if (!Constants.STREAMS_DROP_EMPTY_MESSAGES || used) {
 buffer.flip();
-endpoint.sendPartialString(buffer, last);
+endpoint.sendMessageBlock(buffer, last);
 buffer.clear();
 } else {
 endpoint.stateMachine.complete(last);



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

svn commit: r1662699 - in /tomcat/trunk/java/org/apache: coyote/http11/ coyote/http11/upgrade/ tomcat/util/net/

[markt]

Author: markt
Date: Fri Feb 27 15:00:45 2015
New Revision: 1662699

URL: http://svn.apache.org/r1662699
Log:
Remove support for concurrent read/write.
This breaks blocking text messages

Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java

tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java

tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorInternal.java
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java

Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1662699&r1=1662698&r2=1662699&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Fri 
Feb 27 15:00:45 2015
@@ -289,7 +289,7 @@ public abstract class AbstractHttp11Prot
 return new UpgradeProcessorInternal(socket, leftoverInput,
 (InternalHttpUpgradeHandler) httpUpgradeHandler);
 } else {
-return new UpgradeProcessorExternal(socket, leftoverInput, 
httpUpgradeHandler);
+return new UpgradeProcessorExternal(socket, leftoverInput);
 }
 }
 }

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java?rev=1662699&r1=1662698&r2=1662699&view=diff
==
--- 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java
 (original)
+++ 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java
 Fri Feb 27 15:00:45 2015
@@ -21,7 +21,6 @@ import java.nio.ByteBuffer;
 
 import javax.servlet.ServletInputStream;
 import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpUpgradeHandler;
 
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
@@ -39,8 +38,7 @@ public class UpgradeProcessorExternal ex
 private final UpgradeServletOutputStream upgradeServletOutputStream;
 
 
-public UpgradeProcessorExternal(SocketWrapperBase wrapper, ByteBuffer 
leftOverInput,
-HttpUpgradeHandler httpUpgradeHandler) {
+public UpgradeProcessorExternal(SocketWrapperBase wrapper, ByteBuffer 
leftOverInput) {
 super(wrapper, leftOverInput);
 this.upgradeServletInputStream = new 
UpgradeServletInputStream(wrapper);
 this.upgradeServletOutputStream = new 
UpgradeServletOutputStream(wrapper);
@@ -51,10 +49,6 @@ public class UpgradeProcessorExternal ex
  */
 wrapper.setReadTimeout(INFINITE_TIMEOUT);
 wrapper.setWriteTimeout(INFINITE_TIMEOUT);
-
-if (httpUpgradeHandler instanceof InternalHttpUpgradeHandler) {
-wrapper.setInternalUpgrade(true);
-}
 }
 
 

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorInternal.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorInternal.java?rev=1662699&r1=1662698&r2=1662699&view=diff
==
--- 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorInternal.java
 (original)
+++ 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorInternal.java
 Fri Feb 27 15:00:45 2015
@@ -41,7 +41,6 @@ public class UpgradeProcessorInternal ex
 wrapper.setWriteTimeout(INFINITE_TIMEOUT);
 
 internalHttpUpgradeHandler.setSocketWrapper(wrapper);
-wrapper.setInternalUpgrade(true);
 }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1662699&r1=1662698&r2=1662699&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Fri Feb 27 
15:00:45 2015
@@ -2326,40 +2326,28 @@ public class AprEndpoint extends Abstrac
 
 @Override
 public void run() {
-// Upgraded connections using an internal upgrade handler are
-// allowed concurrent read/writes
-if (socket.isInternalUpgrade() && SocketStatus.OPEN_WRITE == 
status) {
-synchronized (socket.getWriteThreadLock()) {
-

svn commit: r1662708 - /tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java

[markt]

Author: markt
Date: Fri Feb 27 15:01:29 2015
New Revision: 1662708

URL: http://svn.apache.org/r1662708
Log:
Remove check that is unnecessary now concurrent read/write has been
removed.

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

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1662708&r1=1662707&r2=1662708&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Fri Feb 27 
15:01:29 2015
@@ -2328,7 +2328,7 @@ public class AprEndpoint extends Abstrac
 public void run() {
 synchronized (socket) {
 // Process the request from this socket
-if (socket.getSocket() == null || 
!connections.containsKey(socket)) {
+if (socket.getSocket() == null) {
 // Closed in another thread
 return;
 }



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

svn commit: r1662710 - /tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java

[markt]

Author: markt
Date: Fri Feb 27 15:01:39 2015
New Revision: 1662710

URL: http://svn.apache.org/r1662710
Log:
Align APR with NIO & NIO2.
Fixes all unit test faiures except tests that use SSL

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

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1662710&r1=1662709&r2=1662710&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Fri Feb 27 
15:01:39 2015
@@ -2357,8 +2357,6 @@ public class AprEndpoint extends Abstrac
 
 private final ByteBuffer sslOutputBuffer;
 
-private volatile ByteBuffer returnedInput;
-private volatile boolean eagain = false;
 private volatile boolean closed = false;
 
 // This field should only be used by Poller#run()
@@ -2388,7 +2386,53 @@ public class AprEndpoint extends Abstrac
 
 
 @Override
-public int read(boolean block, byte[] b, int off, int len) throws 
IOException {
+public int read(boolean block, byte[] b, int off, int len)
+throws IOException {
+
+socketBufferHandler.configureReadBufferForRead();
+ByteBuffer readBuffer = socketBufferHandler.getReadBuffer();
+int remaining = readBuffer.remaining();
+
+// Is there enough data in the read buffer to satisfy this request?
+if (remaining >= len) {
+readBuffer.get(b, off, len);
+return len;
+}
+
+// Copy what data there is in the read buffer to the byte array
+if (remaining > 0) {
+readBuffer.get(b, off, remaining);
+return remaining;
+/*
+ * Since more bytes may have arrived since the buffer was last
+ * filled, it is an option at this point to perform a
+ * non-blocking read. However correctly handling the case if
+ * that read returns end of stream adds complexity. Therefore,
+ * at the moment, the preference is for simplicity.
+ */
+}
+
+// Fill the read buffer as best we can.
+int nRead = fillReadBuffer(block);
+
+// Full as much of the remaining byte array as possible with the
+// data that was just read
+if (nRead > 0) {
+socketBufferHandler.configureReadBufferForRead();
+if (nRead > len) {
+readBuffer.get(b, off, len);
+return len;
+} else {
+readBuffer.get(b, off, nRead);
+return nRead;
+}
+} else {
+return nRead;
+}
+}
+
+
+private int fillReadBuffer(boolean block) throws IOException {
 
 // TODO: Restore a socket level input buffer to align with NIO and
 //   NIO2.
@@ -2396,16 +2440,8 @@ public class AprEndpoint extends Abstrac
 throw new IOException(sm.getString("socket.apr.closed", 
getSocket()));
 }
 
-if (returnedInput != null) {
-if (returnedInput.remaining() < len) {
-len = returnedInput.remaining();
-}
-returnedInput.get(b, off, len);
-if (returnedInput.remaining() == 0) {
-returnedInput = null;
-}
-return len;
-}
+socketBufferHandler.configureReadBufferForWrite();
+ByteBuffer socketReadBuffer = socketBufferHandler.getReadBuffer();
 
 Lock readLock = getBlockingStatusReadLock();
 WriteLock writeLock = getBlockingStatusWriteLock();
@@ -2418,7 +2454,8 @@ public class AprEndpoint extends Abstrac
 if (block) {
 Socket.timeoutSet(getSocket().longValue(), 
getReadTimeout() * 1000);
 }
-result = Socket.recv(getSocket().longValue(), b, off, len);
+result = Socket.recvb(getSocket().longValue(),
+socketReadBuffer, socketReadBuffer.position(), 
socketReadBuffer.remaining());
 readDone = true;
 }
 } finally {
@@ -2439,7 +2476,8 @@ public class AprEndpoint extends Abstrac
 readLock.lock();
 try {
 writeLock.unlock();
-result = Socket.recv(getSocket().longValue(), b, off, 
len);
+result = Socket.recvb(getSocket().longValue(),
+socketReadBuffer, socketReadBuffer.position(),

svn commit: r1662709 - /tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java

[markt]

Author: markt
Date: Fri Feb 27 15:01:34 2015
New Revision: 1662709

URL: http://svn.apache.org/r1662709
Log:
Remove unnecessary whitespace

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

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1662709&r1=1662708&r2=1662709&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Fri Feb 27 
15:01:34 2015
@@ -1395,7 +1395,6 @@ public class NioEndpoint extends Abstrac
 
 fillReadBuffer(false);
 
-
 boolean isReady = socketBufferHandler.getReadBuffer().position() > 
0;
 return isReady;
 }



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

svn commit: r1662714 - /tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java

[markt]

Author: markt
Date: Fri Feb 27 15:01:53 2015
New Revision: 1662714

URL: http://svn.apache.org/r1662714
Log:
Ensure test cleans up after itself.
Without the clean-up it may trigger failures in other tests

Modified:

tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java

Modified: 
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java?rev=1662714&r1=1662713&r2=1662714&view=diff
==
--- 
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java 
(original)
+++ 
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java 
Fri Feb 27 15:01:53 2015
@@ -29,7 +29,6 @@ import javax.websocket.WebSocketContaine
 
 import org.junit.Assert;
 import org.junit.Test;
-
 import org.apache.catalina.Context;
 import org.apache.catalina.servlets.DefaultServlet;
 import org.apache.catalina.startup.Tomcat;
@@ -147,5 +146,23 @@ public class TestWebSocketFrameClientSSL
 if (openConnectionCount != 0) {
 Assert.fail("There are [" + openConnectionCount + "] connections 
still open");
 }
+
+// Close the client session.
+wsSession.close();
+
+// Make sure the background process has stopped (else in some test
+// environments it will continue to run and break other tests that 
check
+// it has stopped.
+count = 0;
+while (count < 50) {
+if (BackgroundProcessManager.getInstance().getProcessCount() == 0) 
{
+break;
+}
+Thread.sleep(100);
+count++;
+}
+
+Assert.assertEquals(0, 
BackgroundProcessManager.getInstance().getProcessCount());
+
 }
 }



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

svn commit: r1662715 - /tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java

[markt]

Author: markt
Date: Fri Feb 27 15:01:57 2015
New Revision: 1662715

URL: http://svn.apache.org/r1662715
Log:
Fix imports

Modified:

tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java

Modified: 
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java?rev=1662715&r1=1662714&r2=1662715&view=diff
==
--- 
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java 
(original)
+++ 
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java 
Fri Feb 27 15:01:57 2015
@@ -29,6 +29,7 @@ import javax.websocket.WebSocketContaine
 
 import org.junit.Assert;
 import org.junit.Test;
+
 import org.apache.catalina.Context;
 import org.apache.catalina.servlets.DefaultServlet;
 import org.apache.catalina.startup.Tomcat;



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

svn commit: r1662716 - /tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java

[markt]

Author: markt
Date: Fri Feb 27 15:02:02 2015
New Revision: 1662716

URL: http://svn.apache.org/r1662716
Log:
Fix possible double socket close

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

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1662716&r1=1662715&r2=1662716&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Fri Feb 27 
15:02:02 2015
@@ -1581,6 +1581,7 @@ public class AprEndpoint extends Abstrac
 }
 removeFromPoller(socket);
 destroySocket(socket);
+closeList.remove(socket);
 socket = timeouts.check(date);
 }
 



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

svn commit: r1662713 - /tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java

[markt]

Author: markt
Date: Fri Feb 27 15:01:48 2015
New Revision: 1662713

URL: http://svn.apache.org/r1662713
Log:
Remove an implemented TODO

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

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1662713&r1=1662712&r2=1662713&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Fri Feb 27 
15:01:48 2015
@@ -2433,9 +2433,6 @@ public class AprEndpoint extends Abstrac
 
 
 private int fillReadBuffer(boolean block) throws IOException {
-
-// TODO: Restore a socket level input buffer to align with NIO and
-//   NIO2.
 if (closed) {
 throw new IOException(sm.getString("socket.apr.closed", 
getSocket()));
 }



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

svn commit: r1662718 - in /tomcat/trunk/java/org/apache/coyote/http11: AbstractHttp11Protocol.java upgrade/UpgradeProcessorBase.java upgrade/UpgradeProcessorExternal.java upgrade/UpgradeProcessorInter

[markt]

Author: markt
Date: Fri Feb 27 15:02:12 2015
New Revision: 1662718

URL: http://svn.apache.org/r1662718
Log:
Fix NPE

Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java

tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java

tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorInternal.java

Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1662718&r1=1662717&r2=1662718&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Fri 
Feb 27 15:02:12 2015
@@ -289,7 +289,7 @@ public abstract class AbstractHttp11Prot
 return new UpgradeProcessorInternal(socket, leftoverInput,
 (InternalHttpUpgradeHandler) httpUpgradeHandler);
 } else {
-return new UpgradeProcessorExternal(socket, leftoverInput);
+return new UpgradeProcessorExternal(socket, leftoverInput, 
httpUpgradeHandler);
 }
 }
 }

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java?rev=1662718&r1=1662717&r2=1662718&view=diff
==
--- 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java 
(original)
+++ 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java 
Fri Feb 27 15:02:12 2015
@@ -34,7 +34,11 @@ public abstract class UpgradeProcessorBa
 
 protected static final int INFINITE_TIMEOUT = -1;
 
-public UpgradeProcessorBase(SocketWrapperBase wrapper, ByteBuffer 
leftOverInput) {
+private final HttpUpgradeHandler httpUpgradeHandler;
+
+public UpgradeProcessorBase(SocketWrapperBase wrapper, ByteBuffer 
leftOverInput,
+HttpUpgradeHandler httpUpgradeHandler) {
+this.httpUpgradeHandler = httpUpgradeHandler;
 wrapper.unRead(leftOverInput);
 }
 
@@ -48,19 +52,19 @@ public abstract class UpgradeProcessorBa
 
 
 @Override
-public final void recycle() {
-// Currently a NO-OP as upgrade processors are not recycled.
+public HttpUpgradeHandler getHttpUpgradeHandler() {
+return httpUpgradeHandler;
 }
 
 
-//  Processor methods that are NO-OP for 
upgrade
-
 @Override
-public HttpUpgradeHandler getHttpUpgradeHandler() {
-return null;
+public final void recycle() {
+// Currently a NO-OP as upgrade processors are not recycled.
 }
 
 
+//  Processor methods that are NO-OP for 
upgrade
+
 @Override
 public final Executor getExecutor() {
 return null;

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java?rev=1662718&r1=1662717&r2=1662718&view=diff
==
--- 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java
 (original)
+++ 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java
 Fri Feb 27 15:02:12 2015
@@ -21,6 +21,7 @@ import java.nio.ByteBuffer;
 
 import javax.servlet.ServletInputStream;
 import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpUpgradeHandler;
 
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
@@ -38,8 +39,9 @@ public class UpgradeProcessorExternal ex
 private final UpgradeServletOutputStream upgradeServletOutputStream;
 
 
-public UpgradeProcessorExternal(SocketWrapperBase wrapper, ByteBuffer 
leftOverInput) {
-super(wrapper, leftOverInput);
+public UpgradeProcessorExternal(SocketWrapperBase wrapper, ByteBuffer 
leftOverInput,
+HttpUpgradeHandler httpUpgradeHandler) {
+super(wrapper, leftOverInput, httpUpgradeHandler);
 this.upgradeServletInputStream = new 
UpgradeServletInputStream(wrapper);
 this.upgradeServletOutputStream = new 
UpgradeServletOutputStream(wrapper);
 

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorInternal.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorInternal.java?rev=1662718&r1=1662717&r2=1662718&view=diff
==
--- 
tomcat/trunk/java/org/apach

svn commit: r1662720 - /tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java

[markt]

Author: markt
Date: Fri Feb 27 15:02:22 2015
New Revision: 1662720

URL: http://svn.apache.org/r1662720
Log:
Blocking send of object needs to use blocking sends
(rather than non-blcoking)

Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java?rev=1662720&r1=1662719&r2=1662720&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java 
Fri Feb 27 15:02:22 2015
@@ -27,7 +27,6 @@ import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Queue;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
@@ -554,24 +553,49 @@ public abstract class WsRemoteEndpointIm
 }
 
 
+@SuppressWarnings({"unchecked", "rawtypes"})
 public void sendObject(Object obj) throws IOException, EncodeException {
-Future f = sendObjectByFuture(obj);
-try {
-f.get();
-} catch (InterruptedException e) {
-throw new IOException(e);
-} catch (ExecutionException e) {
-Throwable cause = e.getCause();
-if (cause instanceof IOException) {
-throw (IOException) cause;
-} else if (cause instanceof EncodeException) {
-throw (EncodeException) cause;
-} else {
-throw new IOException(e);
+if (obj == null) {
+throw new 
IllegalArgumentException(sm.getString("wsRemoteEndpoint.nullData"));
+}
+/*
+ * Note that the implementation will convert primitives and their 
object
+ * equivalents by default but that users are free to specify their own
+ * encoders and decoders for this if they wish.
+ */
+Encoder encoder = findEncoder(obj);
+if (encoder == null && Util.isPrimitive(obj.getClass())) {
+String msg = obj.toString();
+sendString(msg);
+return;
+}
+if (encoder == null && byte[].class.isAssignableFrom(obj.getClass())) {
+ByteBuffer msg = ByteBuffer.wrap((byte[]) obj);
+sendBytes(msg);
+return;
+}
+
+if (encoder instanceof Encoder.Text) {
+String msg = ((Encoder.Text) encoder).encode(obj);
+sendString(msg);
+} else if (encoder instanceof Encoder.TextStream) {
+try (Writer w = getSendWriter()) {
+((Encoder.TextStream) encoder).encode(obj, w);
 }
+} else if (encoder instanceof Encoder.Binary) {
+ByteBuffer msg = ((Encoder.Binary) encoder).encode(obj);
+sendBytes(msg);
+} else if (encoder instanceof Encoder.BinaryStream) {
+try (OutputStream os = getSendStream()) {
+((Encoder.BinaryStream) encoder).encode(obj, os);
+}
+} else {
+throw new EncodeException(obj, sm.getString(
+"wsRemoteEndpoint.noEncoder", obj.getClass()));
 }
 }
 
+
 public Future sendObjectByFuture(Object obj) {
 FutureToSendHandler f2sh = new FutureToSendHandler(wsSession);
 sendObjectByCompletion(obj, f2sh);



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

svn commit: r1662717 - /tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java

[markt]

Author: markt
Date: Fri Feb 27 15:02:07 2015
New Revision: 1662717

URL: http://svn.apache.org/r1662717
Log:
No need to force write processing onto a separate thread

Modified:

tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java?rev=1662717&r1=1662716&r2=1662717&view=diff
==
--- 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java
 (original)
+++ 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java
 Fri Feb 27 15:02:07 2015
@@ -21,9 +21,11 @@ import java.io.IOException;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.WriteListener;
 
+import org.apache.coyote.ContainerThreadMarker;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 import org.apache.tomcat.util.ExceptionUtils;
+import org.apache.tomcat.util.net.DispatchType;
 import org.apache.tomcat.util.net.SocketWrapperBase;
 import org.apache.tomcat.util.res.StringManager;
 
@@ -111,15 +113,12 @@ public class UpgradeServletOutputStream
 // Container is responsible for first call to onWritePossible().
 synchronized (registeredLock) {
 registered = true;
-// Need to get writes onto a separate thread as long as WebSocket
-// uses Servlet non-blocking I/O as onOpen can throw an error which
-// closes the WebSocket connection. That uses a blocking write 
which
-// means onwWritePossible needs to be on a separate thread to clear
-// the latch used in the blocking write. If
-// socketWrapper.addDispatch() was used the current thread would
-// block on the write and would not process the dispatch until the
-// latch timed out triggering more errors.
-socketWrapper.registerWriteInterest();
+// Container is responsible for first call to onDataAvailable().
+if (ContainerThreadMarker.isContainerThread()) {
+socketWrapper.addDispatch(DispatchType.NON_BLOCKING_WRITE);
+} else {
+socketWrapper.registerWriteInterest();
+}
 }
 
 this.listener = listener;



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

svn commit: r1662719 - /tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java

[markt]

Author: markt
Date: Fri Feb 27 15:02:17 2015
New Revision: 1662719

URL: http://svn.apache.org/r1662719
Log:
Stop tests hanging if they fail.

Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java

Modified: 
tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java?rev=1662719&r1=1662718&r2=1662719&view=diff
==
--- 
tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java 
(original)
+++ 
tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java 
Fri Feb 27 15:02:17 2015
@@ -97,8 +97,8 @@ public class TestEncodingDecoding extend
 client.received.size() > 0) {
 break;
 }
-Thread.sleep(100);
 i++;
+Thread.sleep(100);
 }
 
 // Check messages were received
@@ -147,6 +147,7 @@ public class TestEncodingDecoding extend
 if (server.received.size() > 0 && client.received.size() > 0) {
 break;
 }
+i++;
 Thread.sleep(100);
 }
 
@@ -207,6 +208,7 @@ public class TestEncodingDecoding extend
 if (server.received.size() > 0 && client.received.size() > 0) {
 break;
 }
+i++;
 Thread.sleep(100);
 }
 
@@ -252,6 +254,7 @@ public class TestEncodingDecoding extend
 if (server.received.size() > 0 && client.received.size() > 0) {
 break;
 }
+i++;
 Thread.sleep(100);
 }
 
@@ -299,6 +302,7 @@ public class TestEncodingDecoding extend
 if (server.received.size() > 0 && client.received.size() > 0) {
 break;
 }
+i++;
 Thread.sleep(100);
 }
 



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

Re: Stabilizing the trunk (9.0.x) build

[Rémy Maucherat]

2015-02-27 13:00 GMT+01:00 Mark Thomas :

> Another update. I think I am getting close to being able to commit these
> changes[1].
>
> The current status is:
> - NIO appears to pass on Windows, OSX and Linux
> - APR appears to pass on OSX and Linux
> - APR unknown on Windows
> - NIO2 appears to pass on OSX and Linux
> - NIO2 hanging on Windows
>
> The testsuite passes for me, on Windows (with non connector or websocket
related fails) and Linux (NIO2). Do I need a really slow thing like the CI
system to run into issues ?

It's not related, but there's a glitch with some testsuites and CI systems:
the websocket client needs a lot of entropy if each test is run in a
separate JVM (this does not happen with the Tomcat testsuite).

Rémy

svn commit: r1662721 - in /tomcat/trunk/java/org/apache/tomcat/util/net: AprEndpoint.java Nio2Endpoint.java NioEndpoint.java SocketWrapperBase.java

[markt]

Author: markt
Date: Fri Feb 27 15:18:22 2015
New Revision: 1662721

URL: http://svn.apache.org/r1662721
Log:
Pull up common code

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1662721&r1=1662720&r2=1662721&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Fri Feb 27 
15:18:22 2015
@@ -2542,16 +2542,6 @@ public class AprEndpoint extends Abstrac
 }
 
 
-
-@Override
-public void unRead(ByteBuffer returnedInput) {
-if (returnedInput != null) {
-socketBufferHandler.configureReadBufferForWrite();
-socketBufferHandler.getReadBuffer().put(returnedInput);
-}
-}
-
-
 @Override
 public void close() {
 closed = true;

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1662721&r1=1662720&r2=1662721&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Fri Feb 27 
15:18:22 2015
@@ -1065,15 +1065,6 @@ public class Nio2Endpoint extends Abstra
 
 
 @Override
-public void unRead(ByteBuffer returnedInput) {
-if (returnedInput != null) {
-socketBufferHandler.configureReadBufferForWrite();
-socketBufferHandler.getReadBuffer().put(returnedInput);
-}
-}
-
-
-@Override
 public void close() throws IOException {
 Nio2Channel socket = getSocket();
 if (socket != null) {

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1662721&r1=1662720&r2=1662721&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Fri Feb 27 
15:18:22 2015
@@ -1448,15 +1448,6 @@ public class NioEndpoint extends Abstrac
 
 
 @Override
-public void unRead(ByteBuffer returnedInput) {
-if (returnedInput != null) {
-socketBufferHandler.configureReadBufferForWrite();
-socketBufferHandler.getReadBuffer().put(returnedInput);
-}
-}
-
-
-@Override
 public void close() throws IOException {
 NioChannel socket = getSocket();
 if (socket != null) {

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java?rev=1662721&r1=1662720&r2=1662721&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java Fri Feb 
27 15:18:22 2015
@@ -375,9 +375,16 @@ public abstract class SocketWrapperBase<
  * completes, the HTTP handler may read it. This method provides a way for
  * that data to be returned so it can be processed by the correct 
component.
  *
- * @param input The input to return to the input buffer.
+ * @param returnedInput The input to return to the input buffer.
  */
-public abstract void unRead(ByteBuffer input);
+public void unRead(ByteBuffer returnedInput) {
+if (returnedInput != null) {
+socketBufferHandler.configureReadBufferForWrite();
+socketBufferHandler.getReadBuffer().put(returnedInput);
+}
+}
+
+
 public abstract void close() throws IOException;
 
 



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

svn commit: r1662731 - /tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java

[remm]

Author: remm
Date: Fri Feb 27 15:53:48 2015
New Revision: 1662731

URL: http://svn.apache.org/r1662731
Log:
Restore NPE check as I got a NPE on:
org.apache.tomcat.websocket.server.WsRemoteEndpointImplServer.onWritePossible(WsRemoteEndpointImplServer.java:125)

Modified:

tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java?rev=1662731&r1=1662730&r2=1662731&view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
 (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
 Fri Feb 27 15:53:48 2015
@@ -116,6 +116,11 @@ public class WsRemoteEndpointImplServer
 
 public void onWritePossible(boolean useDispatch) {
 ByteBuffer[] buffers = this.buffers;
+if (buffers == null) {
+// Servlet 3.1 will call the write listener once even if nothing
+// was written
+return;
+}
 boolean complete = false;
 try {
 socketWrapper.flush(false);



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

Taglibs sub-site

[Jeremy Boynes]

On Feb 27, 2015, at 3:38 AM, kkoli...@apache.org wrote:
> 
> Author: kkolinko
> Date: Fri Feb 27 11:38:13 2015
> New Revision: 1662662
> 
> URL: http://svn.apache.org/r1662662
> Log:
> Announcement for Standard Taglib 1.2.3.
> 
> I do not like the CVE link (goes to announce@a.o mail archive) and CHANGES 
> link (goes to SVN), as I noted in a FIXME comment in index.xml.  Any better 
> ideas?

We could add a security-taglibs page to the main site and link from the 
security.html page.

I find the frankensite, as Henri called it, a pain in general. I’m thinking 
about merging it in with the main Tomcat site source and give it an overhaul 
(including moving away from using Maven to build it).

It integrates Taglibs more with the main Tomcat project structure. Does anyone 
have any concern about that?

Cheers
Jeremy



signature.asc
Description: Message signed with OpenPGP using GPGMail

[Bug 57644] New: Update examples to use newer version of taglibs

[bugzilla]

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

Bug ID: 57644
   Summary: Update examples to use newer version of taglibs
   Product: Tomcat 9
   Version: unspecified
  Hardware: All
OS: All
Status: NEW
  Severity: normal
  Priority: P2
 Component: Jasper
  Assignee: dev@tomcat.apache.org
  Reporter: jboy...@apache.org

The JSP example use an old version of JSTL and should be updated to 1.2.3

-- 
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: r1662734 - /tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java

[remm]

Author: remm
Date: Fri Feb 27 16:04:58 2015
New Revision: 1662734

URL: http://svn.apache.org/r1662734
Log:
Use SocketTimeoutException for the "IO" timeout.

Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java?rev=1662734&r1=1662733&r2=1662734&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java 
Fri Feb 27 16:04:58 2015
@@ -19,6 +19,7 @@ package org.apache.tomcat.websocket;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.Writer;
+import java.net.SocketTimeoutException;
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
 import java.nio.charset.CharsetEncoder;
@@ -297,8 +298,7 @@ public abstract class WsRemoteEndpointIm
 synchronized (messagePartLock) {
 try {
 if (!messagePartInProgress.tryAcquire(timeout, 
TimeUnit.MILLISECONDS)) {
-// TODO i18n
-throw new IOException();
+throw new SocketTimeoutException();
 }
 } catch (InterruptedException e) {
 // TODO i18n



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

svn commit: r1662736 - in /tomcat/trunk/webapps/examples/WEB-INF/lib: jstl.jar standard.jar taglibs-standard-impl-1.2.3.jar taglibs-standard-spec-1.2.3.jar

[jboynes]

Author: jboynes
Date: Fri Feb 27 16:26:21 2015
New Revision: 1662736

URL: http://svn.apache.org/r1662736
Log:
Replace old taglibs library with Apache Standard Taglib 1.2.3

Added:
tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-impl-1.2.3.jar
tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-spec-1.2.3.jar
Removed:
tomcat/trunk/webapps/examples/WEB-INF/lib/jstl.jar
tomcat/trunk/webapps/examples/WEB-INF/lib/standard.jar

Added: tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-impl-1.2.3.jar
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-impl-1.2.3.jar?rev=1662736&view=auto
==
Binary files 
tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-impl-1.2.3.jar 
(added) and 
tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-impl-1.2.3.jar Fri 
Feb 27 16:26:21 2015 differ

Added: tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-spec-1.2.3.jar
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-spec-1.2.3.jar?rev=1662736&view=auto
==
Binary files 
tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-spec-1.2.3.jar 
(added) and 
tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-spec-1.2.3.jar Fri 
Feb 27 16:26:21 2015 differ



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

[Bug 57644] Update examples to use newer version of taglibs

[bugzilla]

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

--- Comment #1 from Jeremy Boynes  ---
Fixed in trunk by http://svn.apache.org/viewvc?view=revision&revision=1662736

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

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

Re: Taglibs sub-site

[Mark Thomas]

On 27/02/2015 15:57, Jeremy Boynes wrote:
> On Feb 27, 2015, at 3:38 AM, kkoli...@apache.org wrote:
>>
>> Author: kkolinko
>> Date: Fri Feb 27 11:38:13 2015
>> New Revision: 1662662
>>
>> URL: http://svn.apache.org/r1662662
>> Log:
>> Announcement for Standard Taglib 1.2.3.
>>
>> I do not like the CVE link (goes to announce@a.o mail archive) and CHANGES 
>> link (goes to SVN), as I noted in a FIXME comment in index.xml.  Any better 
>> ideas?
> 
> We could add a security-taglibs page to the main site and link from the 
> security.html page.
> 
> I find the frankensite, as Henri called it, a pain in general. I’m thinking 
> about merging it in with the main Tomcat site source and give it an overhaul 
> (including moving away from using Maven to build it).
> 
> It integrates Taglibs more with the main Tomcat project structure. Does 
> anyone have any concern about that?

No objections here.

Mark


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

svn commit: r1662748 - /tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java

[remm]

Author: remm
Date: Fri Feb 27 16:51:20 2015
New Revision: 1662748

URL: http://svn.apache.org/r1662748
Log:
Drop use of a complex recycling structure which saved allocation of a very 
simple object at the likely cost of significant syncing. Will revert if it is 
believed it actually had some sort of beneficial impact (given my experience 
with the NIO2 connector which doesn't use the object caches by default, I would 
say no).

Modified:

tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java?rev=1662748&r1=1662747&r2=1662748&view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
 (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
 Fri Feb 27 16:51:20 2015
@@ -20,8 +20,6 @@ import java.io.EOFException;
 import java.io.IOException;
 import java.net.SocketTimeoutException;
 import java.nio.ByteBuffer;
-import java.util.Queue;
-import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.ExecutorService;
 
 import javax.websocket.SendHandler;
@@ -45,9 +43,6 @@ public class WsRemoteEndpointImplServer
 private static final Log log =
 LogFactory.getLog(WsHttpUpgradeHandler.class);
 
-private static final Queue onResultRunnables =
-new ConcurrentLinkedQueue<>();
-
 private final SocketWrapperBase socketWrapper;
 private final WsWriteTimeout wsWriteTimeout;
 private final ExecutorService executorService;
@@ -234,11 +229,7 @@ public class WsRemoteEndpointImplServer
 buffers = null;
 if (sh != null) {
 if (useDispatch) {
-OnResultRunnable r = onResultRunnables.poll();
-if (r == null) {
-r = new OnResultRunnable(onResultRunnables);
-}
-r.init(sh, t);
+OnResultRunnable r = new OnResultRunnable(sh, t);
 if (executorService == null || executorService.isShutdown()) {
 // Can't use the executor so call the runnable directly.
 // This may not be strictly specification compliant in all
@@ -264,16 +255,10 @@ public class WsRemoteEndpointImplServer
 
 private static class OnResultRunnable implements Runnable {
 
-private final Queue queue;
-
-private volatile SendHandler sh;
-private volatile Throwable t;
-
-private OnResultRunnable(Queue queue) {
-this.queue = queue;
-}
+private final SendHandler sh;
+private final Throwable t;
 
-private void init(SendHandler sh, Throwable t) {
+private OnResultRunnable(SendHandler sh, Throwable t) {
 this.sh = sh;
 this.t = t;
 }
@@ -285,12 +270,6 @@ public class WsRemoteEndpointImplServer
 } else {
 sh.onResult(new SendResult(t));
 }
-t = null;
-sh = null;
-// Return the Runnable to the queue when it has been finished with
-// Note if this method takes an age to finish there shouldn't be 
any
-// thread safety issues as the fields are cleared above.
-queue.add(this);
 }
 }
 }



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

svn commit: r1662747 - in /tomcat/tc8.0.x/trunk: ./ webapps/examples/WEB-INF/lib/jstl.jar webapps/examples/WEB-INF/lib/standard.jar webapps/examples/WEB-INF/lib/taglibs-standard-impl-1.2.3.jar webapps

[jboynes]

Author: jboynes
Date: Fri Feb 27 16:50:07 2015
New Revision: 1662747

URL: http://svn.apache.org/r1662747
Log:
Backport r1662736 to fix #57644
Update examples to use Apache Taglibs 1.2.3

Added:

tomcat/tc8.0.x/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-impl-1.2.3.jar
  - copied unchanged from r1662736, 
tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-impl-1.2.3.jar

tomcat/tc8.0.x/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-spec-1.2.3.jar
  - copied unchanged from r1662736, 
tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-spec-1.2.3.jar
Removed:
tomcat/tc8.0.x/trunk/webapps/examples/WEB-INF/lib/jstl.jar
tomcat/tc8.0.x/trunk/webapps/examples/WEB-INF/lib/standard.jar
Modified:
tomcat/tc8.0.x/trunk/   (props changed)

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 27 16:50:07 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
 
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-16

svn commit: r1662749 - in /tomcat/tc7.0.x/trunk: ./ conf/ webapps/examples/WEB-INF/lib/

[jboynes]

Author: jboynes
Date: Fri Feb 27 17:02:52 2015
New Revision: 1662749

URL: http://svn.apache.org/r1662749
Log:
Backport r1662736 to fix #57644
Update examples to use Apache Taglibs 1.2.3
Exclude taglibs-standard-spec API jar from TLD scanning

Added:

tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-impl-1.2.3.jar
  - copied unchanged from r1662736, 
tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-impl-1.2.3.jar

tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-spec-1.2.3.jar
  - copied unchanged from r1662736, 
tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-spec-1.2.3.jar
Removed:
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/lib/jstl.jar
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/lib/standard.jar
Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/conf/catalina.properties

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 27 17:02:52 2015
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1647030,1647043,1648816,1651420-1651422,1651844,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1655109,1655112,1655114-1655115,1655117,1655120,1655445,1655467,1656300,1657049,1657356,1657360,1657370,1657460,1657908,1658208,1658737,1658801-1658803,1658811,1658834,1659045,1659190-1659191,1659266,1659294,1659308,1659383,1659386,1659429,1659472,1659507,1659517,1659522,1659563,1659807
 
,1659816,1659835-1659864,1659968,1660953,1660970,1662178,1662537,1662549,1662551,1662627,1662632
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
 
,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342
 
498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349

[Bug 57644] Update examples to use newer version of taglibs

[bugzilla]

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

Jeremy Boynes  changed:

   What|Removed |Added

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

--- Comment #2 from Jeremy Boynes  ---
The change has been back-ported and will be included in 8.0.21 and 7.0.60

-- 
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: r1662753 - /tomcat/tc6.0.x/trunk/STATUS.txt

[jboynes]

Author: jboynes
Date: Fri Feb 27 17:12:08 2015
New Revision: 1662753

URL: http://svn.apache.org/r1662753
Log:
Proposal to backport r1662736

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1662753&r1=1662752&r2=1662753&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Feb 27 17:12:08 2015
@@ -28,7 +28,9 @@ None
 PATCHES PROPOSED TO BACKPORT:
   [ New proposals should be added at the end of the list ]
 
-None
+  1) http://svn.apache.org/r1662736
+ Update examples to use Apache Standard Taglibs 1.2.3
+ +1: jboynes
 
 
 PATCHES/ISSUES THAT ARE STALLED:



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

svn commit: r1662759 - /tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java

[remm]

Author: remm
Date: Fri Feb 27 17:34:53 2015
New Revision: 1662759

URL: http://svn.apache.org/r1662759
Log:
Use SocketTimeoutException for the "IO" timeout (other instances).

Modified:

tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java?rev=1662759&r1=1662758&r2=1662759&view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
 (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
 Fri Feb 27 17:34:53 2015
@@ -80,8 +80,7 @@ public class WsRemoteEndpointImplServer
 for (ByteBuffer buffer : buffers) {
 long timeout = blockingWriteTimeoutExpiry - 
System.currentTimeMillis();
 if (timeout < 0) {
-// TODO i18n
-SendResult sr = new SendResult(new IOException("Blocking 
write timeout"));
+SendResult sr = new SendResult(new 
SocketTimeoutException());
 handler.onResult(sr);
 return;
 }
@@ -92,8 +91,7 @@ public class WsRemoteEndpointImplServer
 buffer.position(buffer.limit());
 timeout = blockingWriteTimeoutExpiry - 
System.currentTimeMillis();
 if (timeout < 0) {
-// TODO i18n
-SendResult sr = new SendResult(new 
IOException("Blocking write timeout"));
+SendResult sr = new SendResult(new 
SocketTimeoutException());
 handler.onResult(sr);
 return;
 }



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

Re: Taglibs sub-site

[Christopher Schultz]

Jeremy,

On 2/27/15 10:57 AM, Jeremy Boynes wrote:
> On Feb 27, 2015, at 3:38 AM, kkoli...@apache.org wrote:
>>
>> Author: kkolinko
>> Date: Fri Feb 27 11:38:13 2015
>> New Revision: 1662662
>>
>> URL: http://svn.apache.org/r1662662
>> Log:
>> Announcement for Standard Taglib 1.2.3.
>>
>> I do not like the CVE link (goes to announce@a.o mail archive) and CHANGES 
>> link (goes to SVN), as I noted in a FIXME comment in index.xml.  Any better 
>> ideas?
> 
> We could add a security-taglibs page to the main site and link from the 
> security.html page.
> 
> I find the frankensite, as Henri called it, a pain in general. I’m thinking 
> about merging it in with the main Tomcat site source and give it an overhaul 
> (including moving away from using Maven to build it).
> 
> It integrates Taglibs more with the main Tomcat project structure. Does 
> anyone have any concern about that?

I'm okay with that in general, but if taglibs is going to die (*is*
it?), then is it worth the effort?

(I got the distinct impression that we were pushing-out a security
release and then ... likely letting taglibs die.)

-chris



signature.asc
Description: OpenPGP digital signature

Re: svn commit: r1662736 - in /tomcat/trunk/webapps/examples/WEB-INF/lib: jstl.jar standard.jar taglibs-standard-impl-1.2.3.jar taglibs-standard-spec-1.2.3.jar

[Konstantin Kolinko]

2015-02-27 19:26 GMT+03:00  :
> Author: jboynes
> Date: Fri Feb 27 16:26:21 2015
> New Revision: 1662736
>
> URL: http://svn.apache.org/r1662736
> Log:
> Replace old taglibs library with Apache Standard Taglib 1.2.3
>
> Added:
> tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-impl-1.2.3.jar
> tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-spec-1.2.3.jar
> Removed:
> tomcat/trunk/webapps/examples/WEB-INF/lib/jstl.jar
> tomcat/trunk/webapps/examples/WEB-INF/lib/standard.jar
>


I guess that taglibs-standard-impl-*.jar has to be added to
"tomcat.util.scan.StandardJarScanFilter.jarsToSkip" setting
in conf/catalina.properties  to exclude it during TLD scanning, as the
jar contains no TLDs.

That setting already has "jstl.jar" but not the new file name.

(The examples app should log a warning when it compiles the first JSP).

Best regards,
Konstantin Kolinko

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

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

[Bill Barker]

To whom it may engage...

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

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


Full details are available at:

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

That said, some information snippets are provided here.

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



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2.html
Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2 (Type: Build)
Work ended in a state of : Failed
Elapsed: 28 mins 36 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar
 -Dtest.reports=output/logs-NIO2 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150227-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150227.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150227-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-1.0.2/dest-20150227/bin
 /openssl -Dexecute.test.apr=false -Dexecute.test.bio=false 
-Dexecute.test.nio2=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-8.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/bu
 
ild/lib/tomcat-spdy.

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

[Bill Barker]

To whom it may engage...

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

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


Full details are available at:

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

That said, some information snippets are provided here.

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



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-apr/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr.html
Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 28 mins 59 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.2-SNAPSHOT.jar
 -Dtest.reports=output/logs-APR 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150227-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20150227/lib 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150227.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150227-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-1.0.2/dest-20150227/bin/openssl
 -Dexecute.test.apr=true -Dexecute.test.bio=false -Dexecute.test.nio2=false 
-Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-8.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-jni.jar:/srv/gump/pub

[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



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: 30 mins 6 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar
 -Dtest.reports=output/logs-NIO 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150227-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150227.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150227-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/dest-20150227/bin/openssl
 
 -Dexecute.test.apr=false -Dexecute.test.nio2=false 
-Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-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/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/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/output/bu
 
ild/lib/tomcat-spdy.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/

[jira] [Updated] (MTOMCAT-255) Getting "Target Unreachable, identifier 'pessoaBean' resolved to null" on tomcat:run but not in tomcat:run-war

[Gilberto C Andrade (JIRA)]

 [ 
https://issues.apache.org/jira/browse/MTOMCAT-255?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Gilberto C Andrade updated MTOMCAT-255:
---
Attachment: MTOMCAT-255.patch

All credit goes to Manuel

> Getting "Target Unreachable, identifier 'pessoaBean' resolved to null" on 
> tomcat:run but not in tomcat:run-war
> --
>
> Key: MTOMCAT-255
> URL: https://issues.apache.org/jira/browse/MTOMCAT-255
> Project: Apache Tomcat Maven Plugin
>  Issue Type: Bug
>  Components: tomcat7
>Affects Versions: 2.2
> Environment: gilberto.andrade@A37710:~$ mvn -version
> Apache Maven 3.0.4 (r1232337; 2012-01-17 05:44:56-0300)
> Maven home: /home/gilberto.andrade/bin/maven
> Java version: 1.7.0_45, vendor: Oracle Corporation
> Java home: /usr/java/jdk1.7.0_45/jre
> Default locale: pt_BR, platform encoding: UTF-8
> OS name: "linux", version: "3.7.10-1.24-desktop", arch: "amd64", family: 
> "unix"
>Reporter: Gilberto C Andrade
>Assignee: Olivier Lamy (*$^¨%`£)
>Priority: Minor
> Fix For: 2.4
>
> Attachments: MTOMCAT-255.patch, MTOMCAT-255.zip
>
>
> Simple JSF 2.2 project with just one manage bean(PessoaMb) and one xhtml page.
> 1 Run mvn clean tomcat7:run 
> 2 hitting  http://localhost:8080/MTOMCAT-255/pessoaView.xhtml
> 3 enter some value on field or click the consultar button
> The same steps works when using tomcat7:run-war.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

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

[Bug 57645] New: getContext("/") returns null

[bugzilla]

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

Bug ID: 57645
   Summary: getContext("/") returns null
   Product: Tomcat 7
   Version: 7.0.59
  Hardware: All
OS: All
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: karl.ol...@gmail.com

The getContext() method incorrectly returns null when requesting the ROOT
context ("/"). The following fix resolves the issue:

public ServletContext getContext(String uri) {

// Validate the format of the specified argument
if ((uri == null) || (!uri.startsWith("/")))
return (null);

Context child = null;
try {
// Look for an exact match
Container host = context.getParent();
child = (Context) host.findChild(uri);
if ( (child == null) && "/".equals(uri) ) { // fix
  child = (Context) host.findChild(""); // fix
}   // fix

The root context was created via:

  Context context = embedded.addWebapp("", "/path/to/webapps/ROOT");

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



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: 28 mins 33 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.2-SNAPSHOT.jar
 -Dtest.reports=output/logs-NIO2 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150227-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150227.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150227-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/dest-20150227/bin/opens
 sl -Dexecute.test.apr=false -Dexecute.test.nio2=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-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/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/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/output/bu
 
ild/lib/tomcat-spdy.jar:/srv/gump/public/workspace/tomcat-trunk/out

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

[Konstantin Kolinko]

2015-02-28 0:41 GMT+03:00 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
>
> (...)
>[concat] Testsuites with failed tests:
>[concat] TEST-org.apache.catalina.core.TestStandardContextAliases.NIO2.txt
>
> BUILD FAILED


Testcase: testDirContextAliases took 2.535 sec
Caused an ERROR
null
java.lang.NullPointerException
at 
org.apache.catalina.core.TestStandardContextAliases.testDirContextAliases(TestStandardContextAliases.java:67)

-
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.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-trunk-test-apr :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:

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

That said, some information snippets are provided here.

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



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: 27 mins 4 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.2-SNAPSHOT.jar
 -Dtest.reports=output/logs-APR 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150227-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20150227/lib 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150227.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150227-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/dest-20150227/bin/openssl 
-Dexecute.test.apr=true -Dexecute.test.nio2=false 
-Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-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/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/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/output/bu
 
ild/lib/

[Bug 57645] getContext("/") returns null

[bugzilla]

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

Christopher Schultz  changed:

   What|Removed |Added

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

--- Comment #1 from Christopher Schultz  ---
I believe this was reported recently as a regression due to the fix for bug
#57190 and fixed in r1661867 (trunk) r1662178 (Tomcat 8) and r1662179 (Tomcat
7).

There was no previous BZ issue for it, so this one is as good as any to
document it.

Changelog for the Tomcat 7 fix:

  
Correct a regression in the fix for 57190 that incorrectly
required the path passed to
ServletContext.getContext(String) to be an exact match to a
path to an existing context. (markt)
  

This fix will be included in Tomcat 7.0.60 and later.

-- 
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: r1662843 - /tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java

[remm]

Author: remm
Date: Fri Feb 27 22:53:00 2015
New Revision: 1662843

URL: http://svn.apache.org/r1662843
Log:
Avoid NPE and fix JAR names.

Modified:
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java

Modified: 
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java?rev=1662843&r1=1662842&r2=1662843&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java 
Fri Feb 27 22:53:00 2015
@@ -63,6 +63,9 @@ public class TestStandardContextAliases
 ByteChunk res = getUrl("http://localhost:"; + getPort() + "/");
 
 String result = res.toString();
+if (result == null) {
+result = "";
+}
 
 assertTrue(result.indexOf("00-PASS") > -1);
 assertTrue(result.indexOf("01-PASS") > -1);
@@ -86,12 +89,12 @@ public class TestStandardContextAliases
 ServletContext context = getServletContext();
 
 // Check resources individually
-URL url = context.getResource("/WEB-INF/lib/jstl.jar");
+URL url = 
context.getResource("/WEB-INF/lib/taglibs-standard-spec-1.2.3.jar");
 if (url != null) {
 resp.getWriter().write("00-PASS\n");
 }
 
-url = context.getResource("/WEB-INF/lib/standard.jar");
+url = 
context.getResource("/WEB-INF/lib/taglibs-standard-impl-1.2.3.jar");
 if (url != null) {
 resp.getWriter().write("01-PASS\n");
 }
@@ -102,10 +105,10 @@ public class TestStandardContextAliases
 return;
 }
 
-if (!libs.contains("/WEB-INF/lib/jstl.jar")) {
+if 
(!libs.contains("/WEB-INF/lib/taglibs-standard-spec-1.2.3.jar")) {
 return;
 }
-if (!libs.contains("/WEB-INF/lib/standard.jar")) {
+if 
(!libs.contains("/WEB-INF/lib/taglibs-standard-impl-1.2.3.jar")) {
 return;
 }
 



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

svn commit: r1662850 - /tomcat/trunk/conf/catalina.properties

[remm]

Author: remm
Date: Fri Feb 27 23:01:00 2015
New Revision: 1662850

URL: http://svn.apache.org/r1662850
Log:
Add the new JSTL API JAR to the skip JARs list.

Modified:
tomcat/trunk/conf/catalina.properties

Modified: tomcat/trunk/conf/catalina.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/conf/catalina.properties?rev=1662850&r1=1662849&r2=1662850&view=diff
==
--- tomcat/trunk/conf/catalina.properties (original)
+++ tomcat/trunk/conf/catalina.properties Fri Feb 27 23:01:00 2015
@@ -121,7 +121,7 @@ commons-beanutils*.jar,commons-codec*.ja
 commons-dbcp*.jar,commons-digester*.jar,commons-fileupload*.jar,\
 
commons-httpclient*.jar,commons-io*.jar,commons-lang*.jar,commons-logging*.jar,\
 commons-math*.jar,commons-pool*.jar,\
-jstl.jar,\
+jstl.jar,taglibs-standard-spec-*.jar,\
 geronimo-spec-jaxrpc*.jar,wsdl4j*.jar,\
 
ant.jar,ant-junit*.jar,aspectj*.jar,jmx.jar,h2*.jar,hibernate*.jar,httpclient*.jar,\
 jmx-tools.jar,jta*.jar,log4j*.jar,mail*.jar,slf4j*.jar,\



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

Re: svn commit: r1662843 - /tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java

[Christopher Schultz]

Rémy,

On 2/27/15 5:53 PM, r...@apache.org wrote:
> Author: remm
> Date: Fri Feb 27 22:53:00 2015
> New Revision: 1662843
> 
> URL: http://svn.apache.org/r1662843
> Log:
> Avoid NPE and fix JAR names.
> 
> Modified:
> tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java
> 
> Modified: 
> tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java
> URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java?rev=1662843&r1=1662842&r2=1662843&view=diff
> ==
> --- 
> tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java 
> (original)
> +++ 
> tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java 
> Fri Feb 27 22:53:00 2015
> @@ -63,6 +63,9 @@ public class TestStandardContextAliases
>  ByteChunk res = getUrl("http://localhost:"; + getPort() + "/");
>  
>  String result = res.toString();
> +if (result == null) {
> +result = "";
> +}

When could result possibly be null?

If ByteChunk.toString returns null, it basically violates the implied
contract of Object.toString.

-chris

>  
>  assertTrue(result.indexOf("00-PASS") > -1);
>  assertTrue(result.indexOf("01-PASS") > -1);
> @@ -86,12 +89,12 @@ public class TestStandardContextAliases
>  ServletContext context = getServletContext();
>  
>  // Check resources individually
> -URL url = context.getResource("/WEB-INF/lib/jstl.jar");
> +URL url = 
> context.getResource("/WEB-INF/lib/taglibs-standard-spec-1.2.3.jar");
>  if (url != null) {
>  resp.getWriter().write("00-PASS\n");
>  }
>  
> -url = context.getResource("/WEB-INF/lib/standard.jar");
> +url = 
> context.getResource("/WEB-INF/lib/taglibs-standard-impl-1.2.3.jar");
>  if (url != null) {
>  resp.getWriter().write("01-PASS\n");
>  }
> @@ -102,10 +105,10 @@ public class TestStandardContextAliases
>  return;
>  }
>  
> -if (!libs.contains("/WEB-INF/lib/jstl.jar")) {
> +if 
> (!libs.contains("/WEB-INF/lib/taglibs-standard-spec-1.2.3.jar")) {
>  return;
>  }
> -if (!libs.contains("/WEB-INF/lib/standard.jar")) {
> +if 
> (!libs.contains("/WEB-INF/lib/taglibs-standard-impl-1.2.3.jar")) {
>  return;
>  }
>  
> 
> 
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 



signature.asc
Description: OpenPGP digital signature

Re: svn commit: r1662736 - in /tomcat/trunk/webapps/examples/WEB-INF/lib: jstl.jar standard.jar taglibs-standard-impl-1.2.3.jar taglibs-standard-spec-1.2.3.jar

[Jeremy Boynes]

On Feb 27, 2015, at 11:19 AM, Konstantin Kolinko  wrote:
> 
> 2015-02-27 19:26 GMT+03:00  :
>> Author: jboynes
>> Date: Fri Feb 27 16:26:21 2015
>> New Revision: 1662736
>> 
>> URL: http://svn.apache.org/r1662736
>> Log:
>> Replace old taglibs library with Apache Standard Taglib 1.2.3
>> 
>> Added:
>>tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-impl-1.2.3.jar
>>tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-spec-1.2.3.jar
>> Removed:
>>tomcat/trunk/webapps/examples/WEB-INF/lib/jstl.jar
>>tomcat/trunk/webapps/examples/WEB-INF/lib/standard.jar
>> 
> 
> 
> I guess that taglibs-standard-impl-*.jar has to be added to
> "tomcat.util.scan.StandardJarScanFilter.jarsToSkip" setting
> in conf/catalina.properties  to exclude it during TLD scanning, as the
> jar contains no TLDs.
> 
> That setting already has "jstl.jar" but not the new file name.
> 
> (The examples app should log a warning when it compiles the first JSP).

This confused me this morning and I was going to look in to it tonight. I did 
not see that warning when running on trunk or tc8 but did on tc7. I expected 
to. Thanks for updating those two branches; I’ll figure out what was going on 
assuming it’s not just that I was under-caffinated.

Thanks
Jeremy



signature.asc
Description: Message signed with OpenPGP using GPGMail

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

[Bill Barker]

To whom it may engage...

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

Project tomcat-tc8.0.x-test-bio has an issue affecting its community 
integration.
This issue affects 1 projects,
 and has been outstanding for 25 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc8.0.x-test-bio :  Tomcat 8.x, a web server implementing the Java 
Servlet 3.1,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-bio/index.html

That said, some information snippets are provided here.

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



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-bio/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-bio.html
Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-bio (Type: Build)
Work ended in a state of : Failed
Elapsed: 27 mins 35 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.2-SNAPSHOT.jar
 -Dtest.reports=output/logs-BIO 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150228-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150228.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150228-native-src.tar.gz
 -Dtest.temp=output/test-tmp-BIO -Dtest.accesslog=true -Dexecute.test.nio=false 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20150228/bin/o
 penssl -Dexecute.test.apr=false -Dexecute.test.bio=true 
-Dexecute.test.nio2=false 
-Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-8.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/bu
 
ild/lib/tomcat-spdy.ja

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

[Bill Barker]

To whom it may engage...

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

Project tomcat-tc8.0.x-test-nio2 has an issue affecting its community 
integration.
This issue affects 1 projects,
 and has been outstanding for 2 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc8.0.x-test-nio2 :  Tomcat 8.x, a web server implementing the 
Java Servlet 3.1,
...


Full details are available at:

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

That said, some information snippets are provided here.

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



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2.html
Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2 (Type: Build)
Work ended in a state of : Failed
Elapsed: 28 mins 51 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar
 -Dtest.reports=output/logs-NIO2 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150228-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150228.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150228-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-1.0.2/dest-20150228/bin
 /openssl -Dexecute.test.apr=false -Dexecute.test.bio=false 
-Dexecute.test.nio2=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-8.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/bu
 
ild/lib/tomc

[Bug 57647] New: TldScanner does not report warning when some jar does not contain a TLD

[bugzilla]

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

Bug ID: 57647
   Summary: TldScanner does not report warning when some jar does
not contain a TLD
   Product: Tomcat 8
   Version: trunk
  Hardware: All
OS: All
Status: NEW
  Severity: normal
  Priority: P2
 Component: Jasper
  Assignee: dev@tomcat.apache.org
  Reporter: jboy...@apache.org

scanFoundNoTLDs does not log the info message about some jar not containing a
TLD when at least one does.

Problem can be seen on tc8 and trunk now that jstl has been replaced with
taglibs-standard-spec which is not in the exclude filter.

-- 
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-tc8.0.x-test-apr (in module tomcat-8.0.x) failed

[Bill Barker]

To whom it may engage...

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

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


Full details are available at:

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

That said, some information snippets are provided here.

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



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-apr/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr.html
Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 27 mins 50 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.2-SNAPSHOT.jar
 -Dtest.reports=output/logs-APR 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150228-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20150228/lib 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150228.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150228-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-1.0.2/dest-20150228/bin/openssl
 -Dexecute.test.apr=true -Dexecute.test.bio=false -Dexecute.test.nio2=false 
-Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-8.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-8.0

Re: svn commit: r1662736 - in /tomcat/trunk/webapps/examples/WEB-INF/lib: jstl.jar standard.jar taglibs-standard-impl-1.2.3.jar taglibs-standard-spec-1.2.3.jar

[Jeremy Boynes]

On Feb 27, 2015, at 6:43 PM, Jeremy Boynes  wrote:
> 
> On Feb 27, 2015, at 11:19 AM, Konstantin Kolinko  
> wrote:
>> 
>> 2015-02-27 19:26 GMT+03:00  :
>>> Author: jboynes
>>> Date: Fri Feb 27 16:26:21 2015
>>> New Revision: 1662736
>>> 
>>> URL: http://svn.apache.org/r1662736
>>> Log:
>>> Replace old taglibs library with Apache Standard Taglib 1.2.3
>>> 
>>> Added:
>>>   tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-impl-1.2.3.jar
>>>   tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-spec-1.2.3.jar
>>> Removed:
>>>   tomcat/trunk/webapps/examples/WEB-INF/lib/jstl.jar
>>>   tomcat/trunk/webapps/examples/WEB-INF/lib/standard.jar
>>> 
>> 
>> 
>> I guess that taglibs-standard-impl-*.jar has to be added to
>> "tomcat.util.scan.StandardJarScanFilter.jarsToSkip" setting
>> in conf/catalina.properties  to exclude it during TLD scanning, as the
>> jar contains no TLDs.
>> 
>> That setting already has "jstl.jar" but not the new file name.
>> 
>> (The examples app should log a warning when it compiles the first JSP).
> 
> This confused me this morning and I was going to look in to it tonight. I did 
> not see that warning when running on trunk or tc8 but did on tc7. I expected 
> to. Thanks for updating those two branches; I’ll figure out what was going on 
> assuming it’s not just that I was under-caffinated.

Nope, the caffine level was adequate. The message is now only emitted if no 
jars contain a TLD whereas it should if at least one does not.

Opened https://bz.apache.org/bugzilla/show_bug.cgi?id=5764
I’ll try to get to it this weekend.

Cheers
Jeremy



signature.asc
Description: Message signed with OpenPGP using GPGMail

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

[Bill Barker]

To whom it may engage...

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

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


Full details are available at:

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

That said, some information snippets are provided here.

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



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-bio/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-bio.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-bio (Type: Build)
Work ended in a state of : Failed
Elapsed: 18 mins 58 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 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150228-native-src.tar.gz
 -Dtest.reports=output/logs-BIO 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150228-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150228.jar
 
-Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar
 -Dexecute.test.nio=false -Dtest.accesslog=true 
-Dcommons-pool.home=/srv/gump/public/wo
 rkspace/commons-pool-1.x 
-Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x 
-Dexecute.test.apr=false -Dexecute.test.bio=true 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20150228.jar
 -Dtest.temp=output/test-tmp-BIO 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-7.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-util.

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

[Bill Barker]

To whom it may engage...

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

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


Full details are available at:

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

That said, some information snippets are provided here.

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



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio.html
Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio (Type: Build)
Work ended in a state of : Failed
Elapsed: 27 mins 56 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.2-SNAPSHOT.jar
 -Dtest.reports=output/logs-NIO 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150228-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150228.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150228-native-src.tar.gz
 -Dtest.temp=output/test-tmp-NIO -Dtest.accesslog=true -Dexecute.test.nio=true 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20150228/bin/op
 enssl -Dexecute.test.apr=false -Dexecute.test.bio=false 
-Dexecute.test.nio2=false 
-Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-8.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/bu
 
ild/lib/tomcat-spdy.jar

[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



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: 27 mins 12 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.2-SNAPSHOT.jar
 -Dtest.reports=output/logs-NIO2 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150228-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150228.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150228-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/dest-20150228/bin/opens
 sl -Dexecute.test.apr=false -Dexecute.test.nio2=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-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/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/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/output/bu
 
ild/lib/tomcat-spdy.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-util.ja

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

[Bill Barker]

To whom it may engage...

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

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


Full details are available at:

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

That said, some information snippets are provided here.

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



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

[Bug 57647] TldScanner does not report warning when some jar does not contain a TLD

[bugzilla]

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

--- Comment #1 from Konstantin Kolinko  ---
FYI: it was added to exclude filter in r1662850

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

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

Re: svn commit: r1662736 - in /tomcat/trunk/webapps/examples/WEB-INF/lib: jstl.jar standard.jar taglibs-standard-impl-1.2.3.jar taglibs-standard-spec-1.2.3.jar

[Konstantin Kolinko]

2015-02-28 6:57 GMT+03:00 Jeremy Boynes :
> On Feb 27, 2015, at 6:43 PM, Jeremy Boynes  wrote:
>>
>> On Feb 27, 2015, at 11:19 AM, Konstantin Kolinko  
>> wrote:
>>>
>>> 2015-02-27 19:26 GMT+03:00  :
 Author: jboynes
 Date: Fri Feb 27 16:26:21 2015
 New Revision: 1662736

 URL: http://svn.apache.org/r1662736
 Log:
 Replace old taglibs library with Apache Standard Taglib 1.2.3

 Added:
   tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-impl-1.2.3.jar
   tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-spec-1.2.3.jar
 Removed:
   tomcat/trunk/webapps/examples/WEB-INF/lib/jstl.jar
   tomcat/trunk/webapps/examples/WEB-INF/lib/standard.jar

>>>
>>>
>>> I guess that taglibs-standard-impl-*.jar has to be added to
>>> "tomcat.util.scan.StandardJarScanFilter.jarsToSkip" setting
>>> in conf/catalina.properties  to exclude it during TLD scanning, as the
>>> jar contains no TLDs.
>>>
>>> That setting already has "jstl.jar" but not the new file name.
>>>
>>> (The examples app should log a warning when it compiles the first JSP).
>>
>> This confused me this morning and I was going to look in to it tonight. I 
>> did not see that warning when running on trunk or tc8 but did on tc7. I 
>> expected to. Thanks for updating those two branches; I’ll figure out what 
>> was going on assuming it’s not just that I was under-caffinated.
>
> Nope, the caffine level was adequate. The message is now only emitted if no 
> jars contain a TLD whereas it should if at least one does not.
>
> Opened https://bz.apache.org/bugzilla/show_bug.cgi?id=57647
> I’ll try to get to it this weekend.


There have been the following fixes by Remy:
http://svn.apache.org/r1662850
http://svn.apache.org/r1662843

Best regards,
Konstantin Kolinko

-
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.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-trunk-test-apr :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:

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

That said, some information snippets are provided here.

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



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: 27 mins 18 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.2-SNAPSHOT.jar
 -Dtest.reports=output/logs-APR 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150228-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20150228/lib 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150228.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150228-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/dest-20150228/bin/openssl 
-Dexecute.test.apr=true -Dexecute.test.nio2=false 
-Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-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/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/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/output/bu
 
ild/lib/tomcat-spdy.jar:/srv/g

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

[Bill Barker]

To whom it may engage...

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

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


Full details are available at:

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

That said, some information snippets are provided here.

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



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-nio/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio (Type: Build)
Work ended in a state of : Failed
Elapsed: 19 mins 23 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 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150228-native-src.tar.gz
 -Dtest.reports=output/logs-NIO 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150228-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150228.jar
 
-Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar
 -Dexecute.test.nio=true -Dtest.accesslog=true 
-Dcommons-pool.home=/srv/gump/public/wor
 kspace/commons-pool-1.x 
-Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x 
-Dexecute.test.apr=false -Dexecute.test.bio=false 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20150228.jar
 -Dtest.temp=output/test-tmp-NIO 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-7.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-util.