svn commit: r1716452 - in /tomcat/site/trunk: ./ docs/ xdocs/

[markt]

Author: markt
Date: Wed Nov 25 16:01:44 2015
New Revision: 1716452

URL: http://svn.apache.org/viewvc?rev=1716452=rev
Log:
Update site (excluding docs) for 8.0.29 release.

Modified:
tomcat/site/trunk/build.properties.default
tomcat/site/trunk/docs/doap_Tomcat.rdf
tomcat/site/trunk/docs/download-80.html
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/migration-8.html
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/xdocs/doap_Tomcat.rdf
tomcat/site/trunk/xdocs/download-80.xml
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/migration-8.xml
tomcat/site/trunk/xdocs/oldnews.xml
tomcat/site/trunk/xdocs/whichversion.xml

Modified: tomcat/site/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/build.properties.default?rev=1716452=1716451=1716452=diff
==
--- tomcat/site/trunk/build.properties.default (original)
+++ tomcat/site/trunk/build.properties.default Wed Nov 25 16:01:44 2015
@@ -38,7 +38,7 @@ tomcat.loc=http://www.apache.org/dist/to
 # - Tomcat versions -
 tomcat60=6.0.43
 tomcat70=7.0.65
-tomcat80=8.0.28
+tomcat80=8.0.29
 tomcat90=9.0.0.M1
 
 # - Download destination -

Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=1716452=1716451=1716452=diff
==
--- tomcat/site/trunk/docs/doap_Tomcat.rdf (original)
+++ tomcat/site/trunk/docs/doap_Tomcat.rdf Wed Nov 25 16:01:44 2015
@@ -60,8 +60,8 @@
 
   
 Latest Stable 8.0.x Release
-2015-10-12
-8.0.28
+2015-11-24
+8.0.29
   
 
 

Modified: tomcat/site/trunk/docs/download-80.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-80.html?rev=1716452=1716451=1716452=diff
==
--- tomcat/site/trunk/docs/download-80.html (original)
+++ tomcat/site/trunk/docs/download-80.html Wed Nov 25 16:01:44 2015
@@ -215,7 +215,7 @@
 Quick Navigation
 
 
-[define v]8.0.28[end]
+[define v]8.0.29[end]
 https://www.apache.org/dist/tomcat/tomcat-8/KEYS;>KEYS |
 [v] |
 Browse |

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1716452=1716451=1716452=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Wed Nov 25 16:01:44 2015
@@ -237,6 +237,50 @@ project logo are trademarks of the Apach
 
 
 
+
+2015-11-24 Tomcat 8.0.29 Released
+
+
+
+The Apache Tomcat Project is proud to announce the release of version 8.0.29
+of Apache Tomcat. Apache Tomcat 8.0.29 includes fixes for issues identified in
+8.0.28 as well as other enhancements and changes. The notable changes since
+8.0.28 include:
+
+
+
+Add an option to control (per context) quoting of EL expressions in JSP
+attributes.
+
+Correct a regression in the fix for 56777 that added support for URIs in
+config file locations.
+
+Add a new RestCsrfPreventionFilter that provides basic CSRF protection for
+REST APIs.
+
+Use instance manager for WebSocket server endpoint instances.
+
+
+
+
+Note: Due to issues with the code signing service, the Windows Installer has
+not been signed for this release.
+
+
+
+Full details of these changes, and all the other changes, are available in the
+Tomcat 8
+changelog.
+
+
+
+
+
+Download
+
+
+
+
 
 2015-11-19 Tomcat 9.0.0.M1 (alpha) 
Released
 
@@ -334,40 +378,6 @@ Full details of these changes, and all t
 
 
 
-
-
-2015-10-12 Tomcat 8.0.28 Released
-
-
-
-The Apache Tomcat Project is proud to announce the release of version 8.0.28
-of Apache Tomcat. Apache Tomcat 8.0.28 includes fixes for issues identified in
-8.0.27 as well as other enhancements and changes. The notable changes since
-8.0.27 include:
-
-
-
-Allow file based configuration resources (e.g. key stores) to be configured
-using URLs.
-
-Restore code signing to the Windows installer and uninstaller.
-
-
-
-
-
-Full details of these changes, and all the other changes, are available in the
-Tomcat 8
-changelog.
-
-
-
-
-
-Download
-
-
-
 
 
 2015-08-11 Tomcat Connectors 1.2.41 
Released

Modified: tomcat/site/trunk/docs/migration-8.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-8.html?rev=1716452=1716451=1716452=diff
==
--- tomcat/site/trunk/docs/migration-8.html (original)
+++ tomcat/site/trunk/docs/migration-8.html Wed Nov 25 16:01:44 2015
@@ -731,7 +731,8 @@ of Apache Tomcat.
   "8.0.24":"1688727",
   "8.0.26":"1696400",
   "8.0.27":"1704937",
-  

[ANN] Apache Tomcat 8.0.29 available

[Mark Thomas]

The Apache Tomcat team announces the immediate availability of Apache
Tomcat 8.0.29.

Apache Tomcat 8 is an open source software implementation of the Java
Servlet, JavaServer Pages, Java Unified Expression Language and Java
WebSocket technologies.

Apache Tomcat 8.0.29 includes fixes for issues identified in 8.0.28 as
well as other enhancements and changes. The notable changes since 8.0.28
include:

- Add an option to control (per context) quoting of EL expressions in
  JSP attributes

- Correct a regression in the fix for 56777 that added support for
  URIs in config file locations

- Add a new RestCsrfPreventionFilter that provides basic CSRF
  protection for REST APIs

-  Use instance manager for WebSocket server endpoint instances


Please refer to the change log for the complete list of changes:
http://tomcat.apache.org/tomcat-8.0-doc/changelog.html

Downloads:
http://tomcat.apache.org/download-80.cgi

Migration guides from Apache Tomcat 5.5.x, 6.0.x and 7.0.x:
http://tomcat.apache.org/migration.html

Enjoy!

- The Apache Tomcat team

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

[ANNOUNCE] CFP open for ApacheCon North America 2016

[Rich Bowen]

Community growth starts by talking with those interested in your
project. ApacheCon North America is coming, are you?

We are delighted to announce that the Call For Presentations (CFP) is
now open for ApacheCon North America. You can submit your proposed
sessions at
http://events.linuxfoundation.org/events/apache-big-data-north-america/program/cfp
for big data talks and
http://events.linuxfoundation.org/events/apachecon-north-america/program/cfp
for all other topics.

ApacheCon North America will be held in Vancouver, Canada, May 9-13th
2016. ApacheCon has been running every year since 2000, and is the place
to build your project communities.

While we will consider individual talks we prefer to see related
sessions that are likely to draw users and community members. When
submitting your talk work with your project community and with related
communities to come up with a full program that will walk attendees
through the basics and on into mastery of your project in example use
cases. Content that introduces what's new in your latest release is also
of particular interest, especially when it builds upon existing well
know application models. The goal should be to showcase your project in
ways that will attract participants and encourage engagement in your
community, Please remember to involve your whole project community (user
and dev lists) when building content. This is your chance to create a
project specific event within the broader ApacheCon conference.

Content at ApacheCon North America will be cross-promoted as
mini-conferences, such as ApacheCon Big Data, and ApacheCon Mobile, so
be sure to indicate which larger category your proposed sessions fit into.

Finally, please plan to attend ApacheCon, even if you're not proposing a
talk. The biggest value of the event is community building, and we count
on you to make it a place where your project community is likely to
congregate, not just for the technical content in sessions, but for
hackathons, project summits, and good old fashioned face-to-face networking.

-- 
rbo...@apache.org
http://apache.org/

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

svn commit: r1716439 - /tomcat/trunk/java/org/apache/tomcat/buildutil/SignCode.java

[markt]

Author: markt
Date: Wed Nov 25 15:26:09 2015
New Revision: 1716439

URL: http://svn.apache.org/viewvc?rev=1716439=rev
Log:
Add a TODO

Modified:
tomcat/trunk/java/org/apache/tomcat/buildutil/SignCode.java

Modified: tomcat/trunk/java/org/apache/tomcat/buildutil/SignCode.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/buildutil/SignCode.java?rev=1716439=1716438=1716439=diff
==
--- tomcat/trunk/java/org/apache/tomcat/buildutil/SignCode.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/buildutil/SignCode.java Wed Nov 25 
15:26:09 2015
@@ -349,6 +349,9 @@ public class SignCode extends Task {
 private static String getApplicationString(List fileNames, 
List files)
 throws IOException {
 // 16 MB should be more than enough for Tomcat
+// TODO: Refactoring this entire class so it uses streaming rather than
+//   buffering the entire set of files in memory would make it more
+//   widely useful.
 ByteArrayOutputStream baos = new ByteArrayOutputStream(16 * 1024 * 
1024);
 try (ZipOutputStream zos = new ZipOutputStream(baos)) {
 byte[] buf = new byte[32 * 1024];



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

svn commit: r1716449 - in /tomcat/site/trunk/docs/tomcat-8.0-doc: ./ api/ api/org/apache/catalina/ api/org/apache/catalina/ant/ api/org/apache/catalina/ant/jmx/ api/org/apache/catalina/authenticator/

[markt]

Author: markt
Date: Wed Nov 25 16:00:12 2015
New Revision: 1716449

URL: http://svn.apache.org/viewvc?rev=1716449=rev
Log:
Update docs for 8.0.29 release


[This commit notification would consist of 71 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

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

[Bug 58650] TestConnectionLimit test case creates "${catalina.base}" directory in Tomcat sources

[bugzilla]

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

--- Comment #2 from Huxing Zhang  ---
I am about to report this issue when I found this ticket today. :)
Yes, test.entry=org.apache.tomcat.websocket.TestConnectionLimit is the cause of
this issue.
Thanks for Mark's quick fix to this annoying issue.

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

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

[Bug 58635] Break point at java agent code is ignored during catalina.sh jpda run

[bugzilla]

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

--- Comment #2 from Huxing Zhang  ---
I've thought about it, but I am too busy to provide such a for patch for
windows. Thanks for your quick work. :)
>From next time I will consider both cases.

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

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

[Bug 58646] NullPointerException in InternalNioOutputBuffer

[bugzilla]

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

--- Comment #7 from Alexander Malyshev  ---
Ok, It seems like the issue happens even with
org.apache.catalina.connector.RECYCLE_FACADES=true.

Following are the exceptions I got:

Nov 25, 2015 CST 06:10:52.115 PM http-nio-135.60.87.69-443-exec-4
org.apache.coyote.http11.Http11NioProcessor
INFO: Error parsing HTTP request header
 Note: further occurrences of HTTP header parsing errors will be logged at
DEBUG level.

 500 milliseconds between these 2 ---

Nov 25, 2015 CST 06:10:52.697 PM http-nio-135.60.87.69-443-exec-5
org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/].[jsp]
SEVERE: Servlet.service() for servlet [jsp] in context with path [] threw
exception [java.lang.IllegalStateException: The request object has been
recycled and is no longer associated with this facade] with root cause

java.lang.IllegalStateException: The request object has been recycled and is no
longer associated with this facade
at
org.apache.catalina.connector.RequestFacade.getMethod(RequestFacade.java:743)
at org.apache.jsp.index_jsp._jspService(index_jsp.java:82)
at org.apache.jasper.runtime.HttpJspBase.service(HttpJspBase.java:70)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:729)
at
org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper.java:438)
at org.apache.jasper.servlet.JspServlet.serviceJspFile(JspServlet.java:396)
at org.apache.jasper.servlet.JspServlet.service(JspServlet.java:340)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:729)
at
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:291)
at
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)
at org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:52)
at
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:239)
at
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)
at
com.avaya.acc.base.web.filters.NoCachingFilter.doFilter(NoCachingFilter.java:106)
at
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:239)
at
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)
at
com.avaya.acc.base.web.filters.CorsFilter.handleSimpleCORS(CorsFilter.java:438)
at com.avaya.acc.base.web.filters.CorsFilter.doFilter(CorsFilter.java:289)
at
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:239)
at
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)
at
org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:217)
at
org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:106)
at
org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:502)
at com.avaya.acc.base.web.valves.StingerValve.invoke(StingerValve.java:150)
at
org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:142)
at
org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:79)
at
org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:88)
at
com.avaya.acc.base.tomcat.MCPTomcatAccessLogValve.invoke(MCPTomcatAccessLogValve.java:290)
at
org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:518)
at
org.apache.coyote.http11.AbstractHttp11Processor.process(AbstractHttp11Processor.java:1091)
at
org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process(AbstractProtocol.java:673)
at
org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1500)
at
org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.run(NioEndpoint.java:1456)
at
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
at
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
at
org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61)
at java.lang.Thread.run(Thread.java:745)


Nov 25, 2015 CST 06:10:52.703 PM http-nio-135.60.87.69-443-exec-7
org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/].[jsp]
SEVERE: Servlet.service() for servlet [jsp] in context with path [] threw
exception

java.lang.NullPointerException
at
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:246)
at
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)
at
org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:217)
at
org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:106)
at
org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:502)
at 

[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
 -WARNING- No directory 
[/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: 42 mins 16 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar
 -Dtest.reports=output/logs-NIO2 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151125-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151125.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151125-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-20151125/bin
 /openssl -Dexecute.test.bio=false -Dexecute.test.apr=false 
-Dtest.excludePerformance=true -Dexecute.test.nio2=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-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

[Bug 58244] two way SSL loses client certificate after a few requests

[bugzilla]

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

--- Comment #10 from David Balažic  ---
With the Apache 8.0.29 released just now it is the same as with 8.0.28

-- 
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: r1716511 - /tomcat/trunk/webapps/docs/changelog.xml

[violetagg]

Author: violetagg
Date: Wed Nov 25 19:09:27 2015
New Revision: 1716511

URL: http://svn.apache.org/viewvc?rev=1716511=rev
Log:
Fixed typo

Modified:
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1716511=1716510=1716511=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Nov 25 19:09:27 2015
@@ -150,7 +150,7 @@
 
   
 58631: Correct the continuation character use in the Windows
-Service How-To page of the documenation web application. (markt)
+Service How-To page of the documentation web application. (markt)
   
 
   



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

[Bug 58626] Tomcat does not start at boot time due to SIGHUP

[bugzilla]

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

--- Comment #8 from Konstantin Kolinko  ---
(In reply to Michael Osipov from comment #5)
>  
> > https://wiki.apache.org/tomcat/TomcatOnSolaris10
> > https://wiki.apache.org/tomcat/FAQ/Linux_Unix#Q3
> 
> Tomcat 5.5? This is ages old. Nothing is worse that outdated information.
> 

1. That information is not outdated. It applies to current versions as well.
The issue is with O/S, not with Tomcat.

2. You know that the wiki is editable? You can update it yourself.

> Not an option because "stop" does not work anymore.
>

Nobody ever complained about stop. You do not call "stop" during boot time.

> My patch suggests patching both codepaths.
>

You have provided no patch file. I cannot read one's mind.


> I am stuck for 6.x current but would be happy to see this fixed in 8.x
and onwards.
>

Such a new feature has to be implemented and tested with Tomcat 9 first. Then
it can be backported to older versions.

In theory, catalina.sh of Tomcat 9 can be used for Tomcat 6 as well. Is it
true? (I mean, is it safe to backport all improvements that have not been
backported yet, align Tomcat 6 file with trunk one)?

In general: the idea is interesting, but
1) I prefer a solution that is compatible with proposal in bug 53930
2) It needs testing, especially on rare systems
3) Your proposal does not match the current code in trunk, thus my lack of
confidence in your words and your testing.

An explicit patch file is needed so that the discussion were more focused.


> When hooking Tomcat into the init.d

Usually there is a wrapper script. You do not hook-in catalina.sh directly. You
do not run it with root user.

-- 
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: Time for Tomcat 7.0.66

[Violeta Georgieva]

2015-11-25 15:51 GMT+02:00 Konstantin Kolinko :
>
> 2015-11-25 10:32 GMT+03:00 Konstantin Kolinko :
> > 2015-11-24 22:38 GMT+03:00 Violeta Georgieva :
> >> Hi,
> >>
> >> Tomorrow morning I plan to prepare Tomcat 7.0.66 for voting.
> >> If you want to add something to this release, please reply here.
> >
> > 1. The fix implementing configuration option for EL quoting (BZ 57136,
> > r1712859) has not been ported to Tomcat 7 yet.
> >
> > I also plan to restore the old behaviour by default, for the reasons I
> > explained in thread "On escaping of EL in attributes (BZ 57136)" on
> > dev@.
> >
> > I am working on it. Estimation is ~2 hours.
> >
>
> Done.
>
> I think we are OK to go.
>
> I did run the test with Nio +  Java 7 + explicitly set
> compile.source=1.7 and compile.target=1.7.  All tests passed.
>
>

Ok thanks

> (I have to run now. I'll be offline for next ~5 hours).
>
> Best regards,
> Konstantin Kolinko
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>

svn commit: r1716520 - in /tomcat/tc7.0.x/tags/TOMCAT_7_0_66: ./ build.properties.default

[violetagg]

Author: violetagg
Date: Wed Nov 25 19:42:13 2015
New Revision: 1716520

URL: http://svn.apache.org/viewvc?rev=1716520=rev
Log:
Tag 7.0.66

Added:
tomcat/tc7.0.x/tags/TOMCAT_7_0_66/   (props changed)
  - copied from r1716515, tomcat/tc7.0.x/trunk/
Modified:
tomcat/tc7.0.x/tags/TOMCAT_7_0_66/build.properties.default

Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_66/
--
bugtraq:append = false

Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_66/
--
bugtraq:label = Bugzilla ID (optional)

Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_66/
--
--- bugtraq:logregex (added)
+++ bugtraq:logregex Wed Nov 25 19:42:13 2015
@@ -0,0 +1,2 @@
+(https?\://(bz|issues)\.apache\.org/bugzilla/show_bug.cgi\?id=\d+|BZ\s?\d+)
+(\d+)

Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_66/
--
bugtraq:message = Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID%

Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_66/
--
bugtraq:url = https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID%

Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_66/
--
--- svn:ignore (added)
+++ svn:ignore Wed Nov 25 19:42:13 2015
@@ -0,0 +1,7 @@
+.*
+build.properties
+logs
+nbproject
+output
+work
+*.iml

Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_66/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Nov 25 19:42:13 2015
@@ -0,0 +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,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702
 
744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715978,1715981,1716216-1716217,1716355,1716414,1716421

svn commit: r1716513 - in /tomcat/tc8.0.x/trunk: ./ webapps/docs/changelog.xml

[violetagg]

Author: violetagg
Date: Wed Nov 25 19:15:43 2015
New Revision: 1716513

URL: http://svn.apache.org/viewvc?rev=1716513=rev
Log:
Merged revision 1716511 from tomcat/trunk:
Fixed typo

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 25 19:15:43 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,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657
 
609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1
 
666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,168573
 

svn commit: r1716514 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml

[violetagg]

Author: violetagg
Date: Wed Nov 25 19:22:23 2015
New Revision: 1716514

URL: http://svn.apache.org/viewvc?rev=1716514=rev
Log:
Merged revision 1716511 from tomcat/trunk:
Fixed typo

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 25 19:22:23 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,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702
 
744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715978,1715981,1716216-1716217,1716355,1716414,1716421
-/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
 

svn commit: r1716526 - /tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

[violetagg]

Author: violetagg
Date: Wed Nov 25 19:58:53 2015
New Revision: 1716526

URL: http://svn.apache.org/viewvc?rev=1716526=rev
Log:
Follow up to r1716513

Modified:
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1716526=1716525=1716526=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Wed Nov 25 19:58:53 2015
@@ -314,8 +314,8 @@
   
   
 Synchronize OpenSSL to JSSE cipher mapping to recent OpenSSL changes. 
In
-particular, TLSv1.0 is not an alias for those ciphers that
-require TLSv1 and will no work with SSLv3. TLSv1 remains
+particular, TLSv1.0 is now an alias for those ciphers that
+require TLSv1 and will not work with SSLv3. TLSv1 remains
 an alias for SSLv3. (markt)
   
 



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

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

[violetagg]

Author: violetagg
Date: Wed Nov 25 21:06:25 2015
New Revision: 11306

Log:
Stage 7.0.66RC

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

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

[violetagg]

Added: dev/tomcat/tomcat-7/v7.0.66/bin/embed/apache-tomcat-7.0.66-embed.zip.md5
==
--- dev/tomcat/tomcat-7/v7.0.66/bin/embed/apache-tomcat-7.0.66-embed.zip.md5 
(added)
+++ dev/tomcat/tomcat-7/v7.0.66/bin/embed/apache-tomcat-7.0.66-embed.zip.md5 
Wed Nov 25 21:06:25 2015
@@ -0,0 +1 @@
+6ab8a6f31663b1fbc96472fca868a688 *apache-tomcat-7.0.66-embed.zip
\ No newline at end of file

Added: dev/tomcat/tomcat-7/v7.0.66/bin/embed/apache-tomcat-7.0.66-embed.zip.sha1
==
--- dev/tomcat/tomcat-7/v7.0.66/bin/embed/apache-tomcat-7.0.66-embed.zip.sha1 
(added)
+++ dev/tomcat/tomcat-7/v7.0.66/bin/embed/apache-tomcat-7.0.66-embed.zip.sha1 
Wed Nov 25 21:06:25 2015
@@ -0,0 +1 @@
+aa8bd64905e82d5c64dfd7c686fe4c8573c4b3c2 *apache-tomcat-7.0.66-embed.zip
\ No newline at end of file

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

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

Added: dev/tomcat/tomcat-7/v7.0.66/bin/extras/catalina-jmx-remote.jar.asc
==
--- dev/tomcat/tomcat-7/v7.0.66/bin/extras/catalina-jmx-remote.jar.asc (added)
+++ dev/tomcat/tomcat-7/v7.0.66/bin/extras/catalina-jmx-remote.jar.asc Wed Nov 
25 21:06:25 2015
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2
+
+iQIcBAABCgAGBQJWVhgpAAoJECCLCrHWMBHH49wQAI6dl58LJ7DLYDancBcTfoc5
+ScG3prBOE7QluhK+KMzTzxlkcwx8bxEpJQyv1F+6RGmhBBsgsWVqVOehPkvx8ZMG
+W4i2/xX8PpIS5bHcSlo0DG8HJCRQHZYCsyD08qHuLZliHliolmqt/FmeL5CxFNCu
+5hJZcc+qu1nNYirnDvhQvqm08OqrCaGBXQGygXyQgmrsm/6sE5TOu0EcVpsZU8xR
+BBakiK6Mvq1XXorCfbR/7gWkfJOxaVyy4py4dO/F4z/5zEgrcgTWBMJIsOIgaQDW
+T/NrcOjp5LvjAGBzqmP1z5HQki5kb5bCxhdmsfZJR17/aaM4Du7VUWxvgUU6ZE6v
+1GsN+iRUG6/v2Qt1ufBlGYVqOabap223j3gCohMFdGC61SC0x9FuxVbxqu45SCcC
+iHJKwIXguKWQsTS9LxS61k+2puLUQl2/dmuFmGKAkp6uEpgln4zZTvUhJjr3ikHw
+zCoaBZ5s9zayyAMLlqZ1BpiU5/b3VZm3+ioUowN96gVwB92z47gM7K8HRfRoDjWI
+yeX2oJtyO30BrCTBeRD4Im/AXSMIyzZeCdO6YCpvF3MkEDrsbjfZS1ebeSMe3kJi
+VCGtoDsAcENW01vkIE00ozfm4tbzsxSVVTp0fwKY8Bzz/EACLHzCb6pYW4WEALqX
+a7Io0DAfJ0yRbSu70QIa
+=9Sd7
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-7/v7.0.66/bin/extras/catalina-jmx-remote.jar.md5
==
--- dev/tomcat/tomcat-7/v7.0.66/bin/extras/catalina-jmx-remote.jar.md5 (added)
+++ dev/tomcat/tomcat-7/v7.0.66/bin/extras/catalina-jmx-remote.jar.md5 Wed Nov 
25 21:06:25 2015
@@ -0,0 +1 @@
+a2798228d16b90f9554c6a481ee97274 *catalina-jmx-remote.jar
\ No newline at end of file

Added: dev/tomcat/tomcat-7/v7.0.66/bin/extras/catalina-jmx-remote.jar.sha1
==
--- dev/tomcat/tomcat-7/v7.0.66/bin/extras/catalina-jmx-remote.jar.sha1 (added)
+++ dev/tomcat/tomcat-7/v7.0.66/bin/extras/catalina-jmx-remote.jar.sha1 Wed Nov 
25 21:06:25 2015
@@ -0,0 +1 @@
+4c7fcba883cec88b79ebcd23d151e6cbc624f48d *catalina-jmx-remote.jar
\ No newline at end of file

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

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

Added: dev/tomcat/tomcat-7/v7.0.66/bin/extras/catalina-ws.jar.asc
==
--- dev/tomcat/tomcat-7/v7.0.66/bin/extras/catalina-ws.jar.asc (added)
+++ dev/tomcat/tomcat-7/v7.0.66/bin/extras/catalina-ws.jar.asc Wed Nov 25 
21:06:25 2015
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2
+
+iQIcBAABCgAGBQJWVhgoAAoJECCLCrHWMBHH+a8P/1WQleDQ4OpZ1hkY8F47TgMU
+oP2O4fX1eNsGKwaAQZC25uVFpQpk6VmgK18bFGB1SEH8MOukkh0yq4012wTl466o
+fHbAw1IH1Z3Z2p9VMELtDrNlGXskx6blWQ8pZydxMSJVC2CGRWvTMilhhs5bjZ/F
+iqop8YU7Kp+EtN/zLV4/keT8ns/30NFmvLUdar/T8VOamiFjhScQKkcpd8DkN6S1
+z8BR5zJnStWpm0NMnw3VNjfx+49HmYhtvl7idTkkqiagMP7V+iPD6xKNCsaYK+J9
+F2ZW274BNVlK2mpz456KH8merttEAA47LFfu6vzo8vVzbYWpXMRVaQmbJ/TESlys
+pvVKbFKhLhu2OEpG5EqdNbfCAccI6kScobtMgwo4CUa2G6uwLm3xvFuim6B6yauY
+fs6WLwi5CU9SPe5WQ2mteaoE4W75WcelHP40k4+l8WuMHElvf7uU53X3AH5IgoXJ
+DNSHWVtmSc5+wa+0BU0WrrwfPFK9W0CFEUtFUkD1UeHMxY/fVWM2Fgc5mVcQiEYd
+ehq5bDCBm8VU9QxDxYjVfh4EminyahusZc5GedUid20Y6PsnDkHuAQh2soTCgl3O
+vS8MldhVaCrL5ExP1yAwNQS6C+nBk5Wrg6EjkWMmzPpqmVECClpY599aE3237N4n
+osVC7/srG/21DE9Z4l+x
+=Zejf
+-END PGP SIGNATURE-

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

[GUMP@vmgump]: Project tomcat-trunk-validate (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-validate 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-validate :  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-validate/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on checkstyle exists, no need to add for property 
checkstyle.jar.
 -INFO- Failed with reason build failed



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/gump_work/build_tomcat-trunk_tomcat-trunk-validate.html
Work Name: build_tomcat-trunk_tomcat-trunk-validate (Type: Build)
Work ended in a state of : Failed
Elapsed: 1 min 31 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 
-Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-6.13-SNAPSHOT.jar
 -Dexecute.validate=true validate 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/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/checkstyle/target/checkstyle-6.13-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20151125.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.4-SNAPSHOT.jar:/srv/gump/public/workspace/commons-lang-trunk/target/commons-lang3-3.5-SNAPSHOT.ja
 
r:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-20151125.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20151125.jar:/srv/gump/packages/guava/guava-18.0.jar
-
Buildfile: /srv/gump/public/workspace/tomcat-trunk/build.xml

build-prepare:
   [delete] Deleting directory 
/srv/gump/public/workspace/tomcat-trunk/output/build/temp
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/build/temp

compile-prepare:

download-validate:

testexist:
 [echo] Testing  for 
/srv/gump/public/workspace/checkstyle/target/checkstyle-6.13-SNAPSHOT.jar

setproxy:

downloadfile:

validate:
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/res/checkstyle
[checkstyle] Running Checkstyle 6.13-SNAPSHOT on 3073 files
[checkstyle] 
/srv/gump/public/workspace/tomcat-trunk/webapps/docs/changelog.xml:91: error: 
Line matches the illegal pattern '\s+$'.

BUILD FAILED
/srv/gump/public/workspace/tomcat-trunk/build.xml:554: Got 1 errors and 0 
warnings.

Total time: 1 minute 31 seconds
-

To subscribe to this information via syndicated feeds:
- RSS: 
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/rss.xml
- Atom: 
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/atom.xml

== Gump Tracking Only ===
Produced by Apache Gump(TM) version 2.3.
Gump Run 20151125180005, vmgump.apache.org:vmgump:20151125180005
Gump E-mail Identifier (unique within run) #2.

--
Apache Gump
http://gump.apache.org/ [Instance: vmgump]

-
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-validate (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-validate 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-validate :  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-validate/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on checkstyle exists, no need to add for property 
checkstyle.jar.
 -INFO- Failed with reason build failed



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-validate/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-validate.html
Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-validate (Type: Build)
Work ended in a state of : Failed
Elapsed: 1 min 31 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 
-Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-6.13-SNAPSHOT.jar
 -Dexecute.validate=true validate 
[Working Directory: /srv/gump/public/workspace/tomcat-8.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/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/checkstyle/target/checkstyle-6.13-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20151125.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.4-SNAPSHOT.jar:/srv/gump/public/workspace/commons-lang-trunk/target/commons-lang3-3.5-SNAPSHOT.ja
 
r:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-20151125.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20151125.jar:/srv/gump/packages/guava/guava-18.0.jar
-
Buildfile: /srv/gump/public/workspace/tomcat-8.0.x/build.xml

build-prepare:
   [delete] Deleting directory 
/srv/gump/public/workspace/tomcat-8.0.x/output/build/temp
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-8.0.x/output/build/temp

compile-prepare:

download-validate:

testexist:
 [echo] Testing  for 
/srv/gump/public/workspace/checkstyle/target/checkstyle-6.13-SNAPSHOT.jar

setproxy:

downloadfile:

validate:
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-8.0.x/output/res/checkstyle
[checkstyle] Running Checkstyle 6.13-SNAPSHOT on 2981 files
[checkstyle] 
/srv/gump/public/workspace/tomcat-8.0.x/webapps/docs/changelog.xml:62: error: 
Line matches the illegal pattern '\s+$'.

BUILD FAILED
/srv/gump/public/workspace/tomcat-8.0.x/build.xml:546: Got 1 errors and 0 
warnings.

Total time: 1 minute 30 seconds
-

To subscribe to this information via syndicated feeds:
- RSS: 
http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-validate/rss.xml
- Atom: 
http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-validate/atom.xml

== Gump Tracking Only ===
Produced by Apache Gump(TM) version 2.3.
Gump Run 20151125180005, vmgump.apache.org:vmgump:20151125180005
Gump E-mail Identifier (unique within run) #1.

--
Apache Gump
http://gump.apache.org/ [Instance: vmgump]

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

svn commit: r1716544 - in /tomcat/tc8.0.x/trunk: ./ webapps/docs/changelog.xml

[violetagg]

Author: violetagg
Date: Wed Nov 25 21:12:27 2015
New Revision: 1716544

URL: http://svn.apache.org/viewvc?rev=1716544=rev
Log:
Merged revision 1716543 from tomcat/trunk:
checkstyle police

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 25 21:12:27 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,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657
 
609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1
 
666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,168573
 

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

[violetagg]

Author: violetagg
Date: Wed Nov 25 21:19:48 2015
New Revision: 1716546

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

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

Modified: tomcat/tc7.0.x/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.properties.default?rev=1716546=1716545=1716546=diff
==
--- tomcat/tc7.0.x/trunk/build.properties.default (original)
+++ tomcat/tc7.0.x/trunk/build.properties.default Wed Nov 25 21:19:48 2015
@@ -25,7 +25,7 @@
 # - Version Control Flags -
 version.major=7
 version.minor=0
-version.build=66
+version.build=67
 version.patch=0
 version.suffix=-dev
 

Modified: tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default?rev=1716546=1716545=1716546=diff
==
--- tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default (original)
+++ tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default Wed Nov 25 21:19:48 
2015
@@ -35,7 +35,7 @@ maven.asf.release.repo.url=https://repos
 maven.asf.release.repo.repositoryId=apache.releases
 
 # Release version info
-maven.asf.release.deploy.version=7.0.66
+maven.asf.release.deploy.version=7.0.67
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1716546=1716545=1716546=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Nov 25 21:19:48 2015
@@ -57,6 +57,8 @@
   They eventually become mixed with the numbered issues. (I.e., numbered
   issues do not "pop up" wrt. others).
 -->
+
+
 
   
 



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

[VOTE] Release Apache Tomcat 7.0.66

[Violeta Georgieva]

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

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

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

Regards,
Violeta

buildbot success in ASF Buildbot on tomcat-7-trunk

[buildbot]

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

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1716514
Blamelist: violetagg

Build succeeded!

Sincerely,
 -The Buildbot




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

svn commit: r1716543 - /tomcat/trunk/webapps/docs/changelog.xml

[violetagg]

Author: violetagg
Date: Wed Nov 25 21:10:30 2015
New Revision: 1716543

URL: http://svn.apache.org/viewvc?rev=1716543=rev
Log:
checkstyle police

Modified:
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1716543=1716542=1716543=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Nov 25 21:10:30 2015
@@ -88,7 +88,7 @@
   
 58635: Enable break points to be set within agent code when
 running Tomcat with a Java agent. Based on a patch by Huxing Zhang.
-(markt) 
+(markt)
   
 
   



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

svn commit: r1716545 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml

[violetagg]

Author: violetagg
Date: Wed Nov 25 21:15:11 2015
New Revision: 1716545

URL: http://svn.apache.org/viewvc?rev=1716545=rev
Log:
Merged revision 1716543 from tomcat/trunk:
checkstyle police

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 25 21:15:11 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,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702
 
744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715978,1715981,1716216-1716217,1716355,1716414,1716421
-/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
 

[Bug 58647] After blocking write timeout occurs, WsRemoteEndpointImplBase remains in BINARY_PARTIAL_WRITING state.

[bugzilla]

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

--- Comment #2 from Alexander Malyshev  ---
Let's say I have write timeout 5 seconds and idle timeout 15 seconds.
In case short network outage happens first attempt to send may be timed out,
but second attempt will be successful. It's not a good user experience to just
close connection in  case of short network outage. Moreover, write timeout does
not mean connection is terminated. At least I should be able to complete
current message (no matter if it's corrupted - client will be able to detect
it) and either re-send the whole message or send another one.

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

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

[Bug 58244] two way SSL loses client certificate after a few requests

[bugzilla]

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

--- Comment #9 from David Balažic  ---
News update:

with newer software vserions, the behavior changed slightly.

Server side:
 - before: Java 1.8.0u51 , apache 8.0.24/26
 - now   : Java 1.8.0u60 , apache 8.0.28

Clients:
 - before: Firefox (v39 and v40) and Chrome (v44)
 - now   : Firefox (v42.0) and Chrome (v46)

New behavior:
 - Java 1.8.0u60 + Apache 8.0.28 + FF 42.0 = problem appears only if page is
left with no activity for 60 seconds (unlike before when the problem appeared
after 30 seconds even if refreshing/reloading the page every few seconds)

 - Java 1.8.0u60 + Apache 8.0.28 + Chrome 46 : when refreshing page, not
problem even after 60 secs, if page left inactive: problem occurs after 60
seconds

 - Java 1.8.0u60 + Apache 8.0.28 + IE11: after 13 minutes of inactivity the
problem does not occur (did not test longer, but the problem never occurred
with IE before either)


* Apache 8.0.28 =
http://www.apache.si/tomcat/tomcat-8/v8.0.28/bin/apache-tomcat-8.0.28-windows-x64.zip


New clients with old apache 8.0.26:

 - Chrome 46: when refreshing page, not problem even after 60 secs
if page left inactive: problem occurs after 60 seconds

 - FF 42.0: when refreshing page, not problem even after 60 secs
if page left inactive: problem occurs after 60 seconds


So it seems the newer browsers changed behavior.

Additional note: in both Chrome and Firefox after a longer period of inactivity
(like 5 minutes) if the page is refreshed, it will work correctly. Apparently
in such cases everything is done from new, as if it were connecting for the
first time.

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

[Bug 58646] NullPointerException in InternalNioOutputBuffer

[bugzilla]

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

--- Comment #6 from Alexander Malyshev  ---
I don't think it's application bug. During traffic testing only the following
requests are sent:

1) Requests to get static content. Fully processed by tomcat - only filters
apply.
2) Request to get one Jersey REST service which is really simple and is not
using request or response directly.
3) WebSocket requests processed by Tomcat WS implementation.

The only custom part here are filters, but they are pretty simple and I can
disable them and run test again. Also, they're not remembering request or
response objects - only get and use them inside doFilter() method.

Note though that setting org.apache.catalina.connector.RECYCLE_FACADES=true
seem to fix an issue (I can't be sure as before issue was intermittent as
well). But at least I had a few traffic runs without this issue.

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

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

[Bug 58626] Tomcat does not start at boot time due to SIGHUP

[bugzilla]

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

--- Comment #7 from Michael Osipov <1983-01...@gmx.net> ---
No further comments?

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

buildbot failure in ASF Buildbot on tomcat-7-trunk

[buildbot]

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

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1716423
Blamelist: kkolinko,markt

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




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

buildbot success in ASF Buildbot on tomcat-7-trunk

[buildbot]

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

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1716329
Blamelist: kfujino

Build succeeded!

Sincerely,
 -The Buildbot




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

svn commit: r1716334 - in /tomcat/trunk/java/org/apache/catalina/tribes/tipis: AbstractReplicatedMap.java LocalStrings.properties

[kfujino]

Author: kfujino
Date: Wed Nov 25 08:57:56 2015
New Revision: 1716334

URL: http://svn.apache.org/viewvc?rev=1716334=rev
Log:
Add log message when map member added.

Modified:

tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1716334=1716333=1716334=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java 
Wed Nov 25 08:57:56 2015
@@ -740,6 +740,8 @@ public abstract class AbstractReplicated
 }
 synchronized (mapMembers) {
 if (!mapMembers.containsKey(mapMember) ) {
+if (log.isInfoEnabled())
+
log.info(sm.getString("abstractReplicatedMap.mapMemberAdded.added", mapMember));
 mapMembers.put(mapMember, 
Long.valueOf(System.currentTimeMillis()));
 memberAdded = true;
 }

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties?rev=1716334=1716333=1716334=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties 
Wed Nov 25 08:57:56 2015
@@ -35,6 +35,7 @@ abstractReplicatedMap.unable.get=Unable
 abstractReplicatedMap.unable.put=Unable to replicate out data for a 
AbstractReplicatedMap.put operation
 abstractReplicatedMap.unsupport.operation=This operation is not valid on a 
replicated map
 abstractReplicatedMap.mapMemberAdded.nullMember=Notified member is not 
registered in the membership:{0}.
+abstractReplicatedMap.mapMemberAdded.added=Map member added:{0}
 mapMessage.deserialize.error.key=Deserialization error of the MapMessage.key
 mapMessage.deserialize.error.value=Deserialization error of the 
MapMessage.value
 lazyReplicatedMap.unableReplicate.backup=Unable to replicate backup key:{0} to 
backup:{1}. Reason:{2}



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

svn commit: r1716336 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java

[kfujino]

Author: kfujino
Date: Wed Nov 25 08:59:19 2015
New Revision: 1716336

URL: http://svn.apache.org/viewvc?rev=1716336=rev
Log:
Add log message when map member added.

Modified:

tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1716336=1716335=1716336=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
 Wed Nov 25 08:59:19 2015
@@ -745,6 +745,7 @@ public abstract class AbstractReplicated
 }
 synchronized (mapMembers) {
 if (!mapMembers.containsKey(mapMember) ) {
+if (log.isInfoEnabled()) log.info("Map member added:" + 
mapMember);
 mapMembers.put(mapMember, 
Long.valueOf(System.currentTimeMillis()));
 memberAdded = true;
 }



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

svn commit: r1716335 - in /tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis: AbstractReplicatedMap.java LocalStrings.properties

[kfujino]

Author: kfujino
Date: Wed Nov 25 08:58:34 2015
New Revision: 1716335

URL: http://svn.apache.org/viewvc?rev=1716335=rev
Log:
Add log message when map member added.

Modified:

tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1716335=1716334=1716335=diff
==
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
 (original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
 Wed Nov 25 08:58:34 2015
@@ -741,6 +741,9 @@ public abstract class AbstractReplicated
 }
 synchronized (mapMembers) {
 if (!mapMembers.containsKey(mapMember) ) {
+if (log.isInfoEnabled())
+
log.info(sm.getString("abstractReplicatedMap.mapMemberAdded.added", mapMember));
+mapMembers.put(mapMember, 
Long.valueOf(System.currentTimeMillis()));
 mapMembers.put(mapMember, 
Long.valueOf(System.currentTimeMillis()));
 memberAdded = true;
 }

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties?rev=1716335=1716334=1716335=diff
==
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties
 (original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties
 Wed Nov 25 08:58:34 2015
@@ -35,6 +35,7 @@ abstractReplicatedMap.unable.get=Unable
 abstractReplicatedMap.unable.put=Unable to replicate out data for a 
AbstractReplicatedMap.put operation
 abstractReplicatedMap.unsupport.operation=This operation is not valid on a 
replicated map
 abstractReplicatedMap.mapMemberAdded.nullMember=Notified member is not 
registered in the membership:{0}.
+abstractReplicatedMap.mapMemberAdded.added=Map member added:{0}
 mapMessage.deserialize.error.key=Deserialization error of the MapMessage.key
 mapMessage.deserialize.error.value=Deserialization error of the 
MapMessage.value
 lazyReplicatedMap.unableReplicate.backup=Unable to replicate backup key:{0} to 
backup:{1}. Reason:{2}



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

[Bug 58649] New: Version is displayed as "None specified" even if tag is specified during deployment

[bugzilla]

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

Bug ID: 58649
   Summary: Version is displayed as "None specified" even if tag
is specified during deployment
   Product: Tomcat 8
   Version: trunk
  Hardware: PC
Status: NEW
  Severity: normal
  Priority: P2
 Component: Manager
  Assignee: dev@tomcat.apache.org
  Reporter: sagarmmha...@yahoo.co.in

The  in pom.xml has version of the webapp
3.1

tomcat7-maven-plugin:2.2 is used with goal tomcat7:deploy
The console prints 
[INFO] --- tomcat7-maven-plugin:2.2:deploy (default-cli) @ sample-webapp ---
[INFO] Deploying war to http://localhost:8028/sample-webapp  
Uploading:
http://localhost:8028/manager/text/deploy?path=%2Fsample-webapp=true=3.1
Uploaded:
http://localhost:8028/manager/text/deploy?path=%2Fsample-webapp=true=3.1
(1346 KB at 61144.1 KB/sec)

[INFO] tomcatManager status code:200, ReasonPhrase:OK
[INFO] OK - Deployed application at context path /sample-webapp

But the Manager App at http://localhost:8028/manager/html/list displays "None
specified" in the Version column

-- 
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: Time for Tomcat 7.0.66

[Keiichi Fujino]

2015-11-25 16:51 GMT+09:00 Violeta Georgieva :

> 2015-11-25 9:32 GMT+02:00 Konstantin Kolinko :
> >
> > 2015-11-24 22:38 GMT+03:00 Violeta Georgieva :
> > > Hi,
> > >
> > > Tomorrow morning I plan to prepare Tomcat 7.0.66 for voting.
> > > If you want to add something to this release, please reply here.
> >
> > 1. The fix implementing configuration option for EL quoting (BZ 57136,
> > r1712859) has not been ported to Tomcat 7 yet.
> >
> > I also plan to restore the old behaviour by default, for the reasons I
> > explained in thread "On escaping of EL in attributes (BZ 57136)" on
> > dev@.
> >
> > I am working on it. Estimation is ~2 hours.
> >
>
> Ok
>
> >
> > 2. I have a question on recent tribes commit that has been committed
> > to Tomcat 7 as well (see Re: r1716305).
> >
> > I guess a fix there is to simply add the following lines, falling back
> > to old behaviour.
> >
> > if (mapMember == null) {
> > mapMember = member;
> > }
>
> I saw this.
>
> I'll wait for these changes.
>
>
Hi.

I've done this.



> Regards,
> Violeta
>
> > Best regards,
> > Konstantin Kolinko
> >
> > -
> > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> > For additional commands, e-mail: dev-h...@tomcat.apache.org
> >
>
> --
> Keiichi.Fujino
>

[Bug 58649] Version is displayed as "None specified" even if tag is specified during deployment

[bugzilla]

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

Konstantin Kolinko  changed:

   What|Removed |Added

 Resolution|--- |INVALID
 Status|NEW |RESOLVED

--- Comment #2 from Konstantin Kolinko  ---
"version" and "tag" are different things.

Version:
http://tomcat.apache.org/tomcat-8.0-doc/manager-howto.html#Common_Parameters

Tag:
http://tomcat.apache.org/tomcat-8.0-doc/manager-howto.html#Deploy_A_New_Application_Archive_%28WAR%29_Remotely

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

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

[Bug 58649] Version is displayed as "None specified" even if tag is specified during deployment

[bugzilla]

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

Sagar Mhatre  changed:

   What|Removed |Added

 OS||All

--- Comment #1 from Sagar Mhatre  ---
Tomcat version 8.0.28

-- 
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: r1716347 - in /tomcat/trunk: conf/ java/org/apache/jasper/ java/org/apache/jasper/compiler/ test/org/apache/el/ test/webapp/ test/webapp/bug45nnn/ webapps/docs/

[kkolinko]

Author: kkolinko
Date: Wed Nov 25 10:42:10 2015
New Revision: 1716347

URL: http://svn.apache.org/viewvc?rev=1716347=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57136#c25
Change default value of quoteAttributeEL setting in Jasper to be true
for better compatibility with other implementations and older versions of 
Tomcat.
Add command line option -no-quoteAttributeEL in JspC.

Fix tests. For reference: r1702244

Modified:
tomcat/trunk/conf/web.xml
tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
tomcat/trunk/java/org/apache/jasper/JspC.java
tomcat/trunk/java/org/apache/jasper/compiler/AttributeParser.java
tomcat/trunk/test/org/apache/el/TestELInJsp.java
tomcat/trunk/test/webapp/bug45nnn/bug45427.jsp
tomcat/trunk/test/webapp/bug45nnn/bug45451.jspf
tomcat/trunk/test/webapp/bug45nnn/bug45451a.jsp
tomcat/trunk/test/webapp/el-method.jsp
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/jasper-howto.xml

Modified: tomcat/trunk/conf/web.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/conf/web.xml?rev=1716347=1716346=1716347=diff
==
--- tomcat/trunk/conf/web.xml (original)
+++ tomcat/trunk/conf/web.xml Wed Nov 25 10:42:10 2015
@@ -239,10 +239,11 @@
   
   
   
-  
-  
-  
-  
+  
+  
+  
+  
+  
 
 
 jsp

Modified: tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java?rev=1716347=1716346=1716347=diff
==
--- tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java (original)
+++ tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java Wed Nov 25 
10:42:10 2015
@@ -205,7 +205,11 @@ public final class EmbeddedServletOption
  */
 private boolean strictQuoteEscaping = true;
 
-private boolean quoteAttributeEL = false;
+/**
+ * When EL is used in JSP attribute values, should the rules for quoting of
+ * attributes described in JSP.1.6 be applied to the expression?
+ */
+private boolean quoteAttributeEL = true;
 
 public String getProperty(String name ) {
 return settings.getProperty( name );

Modified: tomcat/trunk/java/org/apache/jasper/JspC.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspC.java?rev=1716347=1716346=1716347=diff
==
--- tomcat/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspC.java Wed Nov 25 10:42:10 2015
@@ -138,6 +138,7 @@ public class JspC extends Task implement
 protected static final String SWITCH_NO_BLOCK_EXTERNAL = 
"-no-blockExternal";
 protected static final String SWITCH_NO_STRICT_QUOTE_ESCAPING = 
"-no-strictQuoteEscaping";
 protected static final String SWITCH_QUOTE_ATTRIBUTE_EL = 
"-quoteAttributeEL";
+protected static final String SWITCH_NO_QUOTE_ATTRIBUTE_EL = 
"-no-quoteAttributeEL";
 protected static final String SHOW_SUCCESS ="-s";
 protected static final String LIST_ERRORS = "-l";
 protected static final int INC_WEBXML = 10;
@@ -172,7 +173,7 @@ public class JspC extends Task implement
 protected boolean validateXml;
 protected boolean blockExternal = true;
 protected boolean strictQuoteEscaping = true;
-protected boolean quoteAttributeEL = false;
+protected boolean quoteAttributeEL = true;
 protected boolean xpoweredBy;
 protected boolean mappedFile = false;
 protected boolean poolingEnabled = true;
@@ -391,6 +392,8 @@ public class JspC extends Task implement
 setStrictQuoteEscaping(false);
 } else if (tok.equals(SWITCH_QUOTE_ATTRIBUTE_EL)) {
 setQuoteAttributeEL(true);
+} else if (tok.equals(SWITCH_NO_QUOTE_ATTRIBUTE_EL)) {
+setQuoteAttributeEL(false);
 } else {
 if (tok.startsWith("-")) {
 throw new JasperException("Unrecognized option: " + tok +

Modified: tomcat/trunk/java/org/apache/jasper/compiler/AttributeParser.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/AttributeParser.java?rev=1716347=1716346=1716347=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/AttributeParser.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/AttributeParser.java Wed Nov 
25 10:42:10 2015
@@ -39,9 +39,10 @@ public class AttributeParser {
  *  where the JSP attribute is defined.
  * @param isDeferredSyntaxAllowedAsLiteral
  *  Are deferred expressions treated as literals?
- * @param strictShould the rules of JSP.1.6 for escpaing quotes be
- *  

svn commit: r1716329 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java

[kfujino]

Author: kfujino
Date: Wed Nov 25 08:42:14 2015
New Revision: 1716329

URL: http://svn.apache.org/viewvc?rev=1716329=rev
Log:
Add null check for mapMember.

Modified:

tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1716329=1716328=1716329=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
 Wed Nov 25 08:42:14 2015
@@ -739,6 +739,10 @@ public abstract class AbstractReplicated
 boolean memberAdded = false;
 //select a backup node if we don't have one
 Member mapMember = getChannel().getMember(member);
+if (mapMember == null) {
+log.warn("Notified member is not registered in the membership:" + 
member);
+return;
+}
 synchronized (mapMembers) {
 if (!mapMembers.containsKey(mapMember) ) {
 mapMembers.put(mapMember, 
Long.valueOf(System.currentTimeMillis()));



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

Re: svn commit: r1716305 - in /tomcat/trunk: java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java webapps/docs/changelog.xml

[Keiichi Fujino]

2015-11-25 15:39 GMT+09:00 Konstantin Kolinko :

> 2015-11-25 8:39 GMT+03:00  :
> > Author: kfujino
> > Date: Wed Nov 25 05:39:26 2015
> > New Revision: 1716305
> >
> > URL: http://svn.apache.org/viewvc?rev=1716305=rev
> > Log:
> > When using a static cluster, add the members that have been cached in
> the membership service to the map members list in order to ensure that the
> map member is a static member.
> >
> > Modified:
> >
>  tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
> > tomcat/trunk/webapps/docs/changelog.xml
> >
> > Modified:
> tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
> > URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1716305=1716304=1716305=diff
> >
> ==
> > ---
> tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
> (original)
> > +++
> tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
> Wed Nov 25 05:39:26 2015
> > @@ -733,9 +733,10 @@ public abstract class AbstractReplicated
> >  if ( member.equals(getChannel().getLocalMember(false)) ) return;
> >  boolean memberAdded = false;
> >  //select a backup node if we don't have one
> > +Member mapMember = getChannel().getMember(member);
>
> Can "getChannel().getMember(member)" call return null? Using null
> value as a key for mapMembers looks wrong.
>
> E.g. I see that
> org.apache.catalina.tribes.membership.Membership.getMember(Member) may
> return null.
>
> The Membership.getMember(Member) method is not a Channel method, but
> it is used to implement
> DomainFilterInterceptor.getMember(Member mbr)
> NonBlockingCoordinator.getMember(Member mbr)
> TcpFailureDetector.getMember(Member mbr)
> MCastService.getMember(Member)
>
>
Thanks for the comments.

The "getChannel().getMember(member)" never return a null in most cases.
However, if static member has not been detected yet, the
"getChannel().getMember(member)" can return null.

So, I'll add null check.
if (mapMember == null) {
// todo warn log
return;
}
If null is returned, just return.
And then, the AbstractReplicatedMap.ping method will try to add map members
again.




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

svn commit: r1716328 - in /tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis: AbstractReplicatedMap.java LocalStrings.properties

[kfujino]

Author: kfujino
Date: Wed Nov 25 08:41:14 2015
New Revision: 1716328

URL: http://svn.apache.org/viewvc?rev=1716328=rev
Log:
Add null check for mapMember.

Modified:

tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1716328=1716327=1716328=diff
==
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
 (original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
 Wed Nov 25 08:41:14 2015
@@ -735,6 +735,10 @@ public abstract class AbstractReplicated
 boolean memberAdded = false;
 //select a backup node if we don't have one
 Member mapMember = getChannel().getMember(member);
+if (mapMember == null) {
+
log.warn(sm.getString("abstractReplicatedMap.mapMemberAdded.nullMember", 
member));
+return;
+}
 synchronized (mapMembers) {
 if (!mapMembers.containsKey(mapMember) ) {
 mapMembers.put(mapMember, 
Long.valueOf(System.currentTimeMillis()));

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties?rev=1716328=1716327=1716328=diff
==
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties
 (original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties
 Wed Nov 25 08:41:14 2015
@@ -34,6 +34,7 @@ abstractReplicatedMap.unable.retrieve=Un
 abstractReplicatedMap.unable.get=Unable to replicate out data for a 
AbstractReplicatedMap.get operation
 abstractReplicatedMap.unable.put=Unable to replicate out data for a 
AbstractReplicatedMap.put operation
 abstractReplicatedMap.unsupport.operation=This operation is not valid on a 
replicated map
+abstractReplicatedMap.mapMemberAdded.nullMember=Notified member is not 
registered in the membership:{0}.
 mapMessage.deserialize.error.key=Deserialization error of the MapMessage.key
 mapMessage.deserialize.error.value=Deserialization error of the 
MapMessage.value
 lazyReplicatedMap.unableReplicate.backup=Unable to replicate backup key:{0} to 
backup:{1}. Reason:{2}



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

svn commit: r1716327 - in /tomcat/trunk/java/org/apache/catalina/tribes/tipis: AbstractReplicatedMap.java LocalStrings.properties

[kfujino]

Author: kfujino
Date: Wed Nov 25 08:40:23 2015
New Revision: 1716327

URL: http://svn.apache.org/viewvc?rev=1716327=rev
Log:
Add null check for mapMember.

Modified:

tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1716327=1716326=1716327=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java 
Wed Nov 25 08:40:23 2015
@@ -734,6 +734,10 @@ public abstract class AbstractReplicated
 boolean memberAdded = false;
 //select a backup node if we don't have one
 Member mapMember = getChannel().getMember(member);
+if (mapMember == null) {
+
log.warn(sm.getString("abstractReplicatedMap.mapMemberAdded.nullMember", 
member));
+return;
+}
 synchronized (mapMembers) {
 if (!mapMembers.containsKey(mapMember) ) {
 mapMembers.put(mapMember, 
Long.valueOf(System.currentTimeMillis()));

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties?rev=1716327=1716326=1716327=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties 
Wed Nov 25 08:40:23 2015
@@ -34,6 +34,7 @@ abstractReplicatedMap.unable.retrieve=Un
 abstractReplicatedMap.unable.get=Unable to replicate out data for a 
AbstractReplicatedMap.get operation
 abstractReplicatedMap.unable.put=Unable to replicate out data for a 
AbstractReplicatedMap.put operation
 abstractReplicatedMap.unsupport.operation=This operation is not valid on a 
replicated map
+abstractReplicatedMap.mapMemberAdded.nullMember=Notified member is not 
registered in the membership:{0}.
 mapMessage.deserialize.error.key=Deserialization error of the MapMessage.key
 mapMessage.deserialize.error.value=Deserialization error of the 
MapMessage.value
 lazyReplicatedMap.unableReplicate.backup=Unable to replicate backup key:{0} to 
backup:{1}. Reason:{2}



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

[Bug 58650] New: TestConnectionLimit test case creates "${catalina.base}" directory in Tomcat sources

[bugzilla]

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

Bug ID: 58650
   Summary: TestConnectionLimit test case creates
"${catalina.base}" directory in Tomcat sources
   Product: Tomcat 9
   Version: 9.0.0.M1
  Hardware: PC
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: knst.koli...@gmail.com

An odd effect, that I cannot explain yet.

In Tomcat trunk if I run the whole testsuite or the following single test:

test.entry=org.apache.tomcat.websocket.TestConnectionLimit

a directory with name "${catalina.base}" is created in Tomcat sources. It
contains a directory "logs" and the following empty files:

${catalina.base}/logs/
catalina.2015-11-25.log
host-manager.2015-11-25.log
localhost.2015-11-25.log
manager.2015-11-25.log

The test TestConnectionLimit contains a single @Ignore'd test case. It
originates from r1656077.

My guess that maybe shutdown of JVM (created to run this testcase) triggers
some initialization code in JULI.

-- 
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: r1716360 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/websocket/WsSession.java test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java webapps/docs/changelog.x

[markt]

Author: markt
Date: Wed Nov 25 11:45:04 2015
New Revision: 1716360

URL: http://svn.apache.org/viewvc?rev=1716360=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58624
Correct a thread safety issue that meant that blocking message writes could 
block indefinitely if the WebSocket connection was closed while a message write 
was in progress.

Added:

tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java
  - copied unchanged from r1716359, 
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java
Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 25 11:45:04 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,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702
 
744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712899,1712903,1712906,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715978,1715981,1716216-1716217
-/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
 

svn commit: r1716367 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java

[markt]

Author: markt
Date: Wed Nov 25 11:54:59 2015
New Revision: 1716367

URL: http://svn.apache.org/viewvc?rev=1716367=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58650
Use class level @Ignore if all tests are to be ignored to avoid generation of 
directory named '${catalina.base}'

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 25 11:54:59 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,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702
 
744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712899,1712903,1712906,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715978,1715981,1716216-1716217,1716359
-/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
 

[Bug 58650] TestConnectionLimit test case creates "${catalina.base}" directory in Tomcat sources

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

 OS||All
 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #1 from Mark Thomas  ---
Thanks for tracking down the root cause of this. It has been bugging me for a
while.

I've moved the @Ignore from the single test method to the class and that seems
to have fixed this.

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

buildbot failure in ASF Buildbot on tomcat-7-trunk

[buildbot]

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

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1716367
Blamelist: markt

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




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

svn commit: r1716366 - in /tomcat/tc8.0.x/trunk: ./ test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java

[markt]

Author: markt
Date: Wed Nov 25 11:54:24 2015
New Revision: 1716366

URL: http://svn.apache.org/viewvc?rev=1716366=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=56850
Use class level @Ignore if all tests are to be ignored to avoid generation of 
directory named '${catalina.base}'

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

tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 25 11:54:24 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,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657
 
609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1
 
666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,168573
 

svn commit: r1716359 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/websocket/WsSession.java test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java webapps/docs/changelog.x

[markt]

Author: markt
Date: Wed Nov 25 11:42:32 2015
New Revision: 1716359

URL: http://svn.apache.org/viewvc?rev=1716359=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58624
Correct a thread safety issue that meant that blocking message writes could 
block indefinitely if the WebSocket connection was closed while a message write 
was in progress.

Added:

tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java
  - copied, changed from r1716269, 
tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java
Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 25 11:42:32 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,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657
 
609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1
 
666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,168573
 

svn commit: r1716369 - in /tomcat/tc7.0.x/trunk: ./ conf/ java/org/apache/jasper/ java/org/apache/jasper/compiler/ java/org/apache/jasper/resources/ test/org/apache/el/ test/org/apache/jasper/compiler

[kkolinko]

Author: kkolinko
Date: Wed Nov 25 12:20:25 2015
New Revision: 1716369

URL: http://svn.apache.org/viewvc?rev=1716369=rev
Log:
Further work on https://bz.apache.org/bugzilla/show_bug.cgi?id=57136
Add a configuration option that allows EL expressions in attribute values to 
use JSP attribute quoting or not. The default is not to.

This is backport of Mark's r1712860 (r1712859)
+ documentation (r1712913, r1712926, r1715189)

I am not updating the changelog yet. Further commits are following.

Added:
tomcat/tc7.0.x/trunk/test/webapp-3.0/el-misc-no-quote-attribute-el.jsp
  - copied unchanged from r1716307, 
tomcat/tc7.0.x/trunk/test/webapp-3.0/el-misc.jsp
tomcat/tc7.0.x/trunk/test/webapp-3.0/el-misc-with-quote-attribute-el.jsp
  - copied, changed from r1716307, 
tomcat/tc7.0.x/trunk/test/webapp-3.0/el-misc.jsp
Removed:
tomcat/tc7.0.x/trunk/test/webapp-3.0/el-misc.jsp
Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/conf/web.xml
tomcat/tc7.0.x/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspC.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/Options.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/AttributeParser.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Parser.java

tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/tc7.0.x/trunk/test/org/apache/el/TestELInJsp.java

tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestAttributeParser.java
tomcat/tc7.0.x/trunk/webapps/docs/jasper-howto.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 25 12:20:25 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,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702
 
744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712899,1712903,1712906,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715978,1715981,1716216-1716217,1716359,1716366

svn commit: r1716354 - /tomcat/trunk/conf/web.xml

[kkolinko]

Author: kkolinko
Date: Wed Nov 25 11:12:38 2015
New Revision: 1716354

URL: http://svn.apache.org/viewvc?rev=1716354=rev
Log:
Improve formatting of a comment.

Modified:
tomcat/trunk/conf/web.xml

Modified: tomcat/trunk/conf/web.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/conf/web.xml?rev=1716354=1716353=1716354=diff
==
--- tomcat/trunk/conf/web.xml (original)
+++ tomcat/trunk/conf/web.xml Wed Nov 25 11:12:38 2015
@@ -242,8 +242,7 @@
   
   
   
-  
-  
+  
 
 
 jsp



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

svn commit: r1716355 - in /tomcat/tc8.0.x/trunk: ./ conf/ java/org/apache/jasper/ java/org/apache/jasper/compiler/ test/org/apache/el/ test/webapp/ test/webapp/bug45nnn/ webapps/docs/

[kkolinko]

Author: kkolinko
Date: Wed Nov 25 11:18:23 2015
New Revision: 1716355

URL: http://svn.apache.org/viewvc?rev=1716355=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57136#c25
Change default value of quoteAttributeEL setting in Jasper to be true
for better compatibility with other implementations and older versions of 
Tomcat.
Add command line option -no-quoteAttributeEL in JspC.

Fix tests. For reference: r1702244

Merged r1716347, r1716354 from tomcat/trunk.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/conf/web.xml
tomcat/tc8.0.x/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/JspC.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/AttributeParser.java
tomcat/tc8.0.x/trunk/test/org/apache/el/TestELInJsp.java
tomcat/tc8.0.x/trunk/test/webapp/bug45nnn/bug45427.jsp
tomcat/tc8.0.x/trunk/test/webapp/bug45nnn/bug45451.jspf
tomcat/tc8.0.x/trunk/test/webapp/bug45nnn/bug45451a.jsp
tomcat/tc8.0.x/trunk/test/webapp/el-method.jsp
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.0.x/trunk/webapps/docs/jasper-howto.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 25 11:18:23 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,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657
 
609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1
 

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

[markt]

Author: markt
Date: Wed Nov 25 11:30:17 2015
New Revision: 1716358

URL: http://svn.apache.org/viewvc?rev=1716358=rev
Log:
Additional fix for BZ58624 based on analysis of 8.0.x failure mode

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=1716358=1716357=1716358=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java Wed Nov 25 
11:30:17 2015
@@ -647,7 +647,24 @@ public class WsSession implements Sessio
  * {@link FutureToSendHandler} completes.
  */
 protected void registerFuture(FutureToSendHandler f2sh) {
-futures.put(f2sh, f2sh);
+boolean fail = false;
+synchronized (stateLock) {
+// If the session has already been closed the any registered 
futures
+// will have been processed so the failure result for this future
+// needs to be set here.
+if (state == State.OPEN) {
+futures.put(f2sh, f2sh);
+} else {
+// Construct the exception outside of the sync block
+fail = true;
+}
+}
+
+if (fail) {
+IOException ioe = new 
IOException(sm.getString("wsSession.messageFailed"));
+SendResult sr = new SendResult(ioe);
+f2sh.onResult(sr);
+}
 }
 
 



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

[Bug 58624] Websocket send blocks indefinitely in FutureToSendHandler

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #11 from Mark Thomas  ---
I've back-ported the fix to 8.0.x for 8.0.30 onwards and to 7.0.x for 7.0.66
onwards.

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

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

svn commit: r1716364 - in /tomcat/trunk/test/org/apache/tomcat/websocket: TestConnectionLimit.java server/TestWsRemoteEndpointImplServer.java

[markt]

Author: markt
Date: Wed Nov 25 11:52:11 2015
New Revision: 1716364

URL: http://svn.apache.org/viewvc?rev=1716364=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58650
Use class level @Ignore if all tests are to be ignored to avoid generation of 
directory named '${catalina.base}'

Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/TestConnectionLimit.java

tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java

Modified: tomcat/trunk/test/org/apache/tomcat/websocket/TestConnectionLimit.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestConnectionLimit.java?rev=1716364=1716363=1716364=diff
==
--- tomcat/trunk/test/org/apache/tomcat/websocket/TestConnectionLimit.java 
(original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/TestConnectionLimit.java Wed 
Nov 25 11:52:11 2015
@@ -34,15 +34,14 @@ import org.apache.catalina.startup.Tomca
 import org.apache.catalina.startup.TomcatBaseTest;
 import 
org.apache.tomcat.websocket.TesterMessageCountClient.TesterProgrammaticEndpoint;
 
-
-public class TestConnectionLimit extends TomcatBaseTest{
+@Ignore // Not for use in normal unit test runs
+public class TestConnectionLimit extends TomcatBaseTest {
 
 /*
  * Simple test to see how many outgoing connections can be created on a
  * single machine.
  */
 @Test
-@Ignore // Not for use in normal unit test runs
 public void testSingleMachine() throws Exception {
 Tomcat tomcat = getTomcatInstance();
 // No file system docBase required

Modified: 
tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java?rev=1716364=1716363=1716364=diff
==
--- 
tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java
 (original)
+++ 
tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java
 Wed Nov 25 11:52:11 2015
@@ -48,6 +48,7 @@ import org.apache.catalina.startup.Tomca
 import org.apache.catalina.startup.TomcatBaseTest;
 import org.apache.tomcat.websocket.pojo.TesterUtil.SimpleClient;
 
+@Ignore // This test requires manual intervention to create breakpoints etc.
 public class TestWsRemoteEndpointImplServer extends TomcatBaseTest {
 
 /*
@@ -68,7 +69,6 @@ public class TestWsRemoteEndpointImplSer
  * the call to sendObject(). If the issue is fixed, the thread at 
breakpoint
  * B will continue past sendObject() and terminate with a TimeoutException.
  */
-@Ignore // This test requires manual intervention to create breakpoints 
etc.
 @Test
 public void testClientDropsConnection() throws Exception {
 Tomcat tomcat = getTomcatInstance();



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

svn commit: r1716417 - in /tomcat/tc7.0.x/trunk: ./ bin/catalina.bat bin/catalina.sh webapps/docs/changelog.xml

[markt]

Author: markt
Date: Wed Nov 25 14:04:06 2015
New Revision: 1716417

URL: http://svn.apache.org/viewvc?rev=1716417=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58635
Enable break points to be set within agent code when running Tomcat with a Java 
agent.
Based on a patch by Huxing Zhang.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/bin/catalina.bat
tomcat/tc7.0.x/trunk/bin/catalina.sh
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 25 14:04:06 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,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702
 
744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715978,1715981,1716216-1716217,1716355
-/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
 

svn commit: r1716418 - in /tomcat/tc6.0.x/trunk: ./ bin/catalina.bat bin/catalina.sh webapps/docs/changelog.xml

[markt]

Author: markt
Date: Wed Nov 25 14:05:03 2015
New Revision: 1716418

URL: http://svn.apache.org/viewvc?rev=1716418=rev
Log:
https://bz.apache.org/bugzilla/show_bug.cgi?id=58635
Enable break points to be set within agent code when running Tomcat with a Java 
agent.
Based on a patch by Huxing Zhang.

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/bin/catalina.bat
tomcat/tc6.0.x/trunk/bin/catalina.sh
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 25 14:05:03 2015
@@ -1,3 +1,3 @@
-/tomcat/tc7.0.x/trunk:1224802,1243045,1298635,1304471,1311997,1312007,1331772,1333164,1333176,1348992,1354866,1371298,1371302,1371620,1402110,1409014,1413553,1413557,1413563,1430083,1438415,1446641-1446660,1447013,1453106,1453119,1484919,1486877,1500065,1503852,1505844,1513151,1521040,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1568922,1570163,1577328,1577464-1577465,1578814,1586659,1586897,1586960,1588199,1588997,1589740,1589851,1589997,1590019,1590028,1590337,1590492,1590651,1590838,1590845,1590848,1590912,1593262,1593288,1593371,1593835,1594230,1595174,1595366,1600956,1601333,1601856,1601909,1609079,1609606,1617364,1617374,1617433,1617457-1617458,1624249,1626579,1627420,1627469,1632586,1637686,1637711,1640675,1642045,1643515,1643540,1643572,1643585-1643586,1643642,1643647,1644019,1648817,1656301,1658815,1659523,1659564,1664001,1664176,1665087,1666968,1666989,1668541
 
,1668635,1669802,1676557,1681183,1681841,1681865,1681867,1685829,1693109,1694293,1694433,1694875,1696381,1701945,1710353,1712656,1713873,1714000,1714005,1714540,1715213,1716221
-/tomcat/tc8.0.x/trunk:1637685,1637709,1640674,1641726,1641729-1641730,1643513,1643539,1643571,1643581-1643582,1644018,1648816,1656300,1658801-1658803,1658811,1659522,1663997,1664175,1665086,1666967,1666988,1668634,1669801,1676556,1681182,1681840,1681864,1685827,1689921,1693108,1694291,1694427,1694873,1696379,1701944,1710347,1712618,1712655,1713872,1713998,1714004,1714538,1715207,1716216-1716217
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,656018,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770
 
809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,890139,890265
 

svn commit: r1716377 - /tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

[kkolinko]

Author: kkolinko
Date: Wed Nov 25 13:13:07 2015
New Revision: 1716377

URL: http://svn.apache.org/viewvc?rev=1716377=rev
Log:
Correct a typo in changelog.

Modified:
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1716377=1716376=1716377=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Wed Nov 25 13:13:07 2015
@@ -154,7 +154,7 @@
 
   
 Extend the fix for 57136 to provide a JSP Servlet
-initialisation parameter per web application that controls whether o
+initialisation parameter per web application that controls whether or
 not EL in JSP attributes is processed as if it uses JSP attribute
 quoting. By default, EL does not use JSP attribute quoting. (markt)
   



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

svn commit: r1716402 - /tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java

[markt]

Author: markt
Date: Wed Nov 25 13:37:19 2015
New Revision: 1716402

URL: http://svn.apache.org/viewvc?rev=1716402=rev
Log:
Make the test play nicely with Java 6.

Modified:

tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java

Modified: 
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java?rev=1716402=1716401=1716402=diff
==
--- 
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java
 Wed Nov 25 13:37:19 2015
@@ -16,7 +16,6 @@
  */
 package org.apache.tomcat.websocket.server;
 
-import java.io.IOException;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;
@@ -101,7 +100,7 @@ public class TestWsRemoteEndpointImplSer
 ServerContainer sc = (ServerContainer) 
sce.getServletContext().getAttribute(
 Constants.SERVER_CONTAINER_SERVLET_CONTEXT_ATTRIBUTE);
 
-List encoders = new ArrayList<>();
+List encoders = new ArrayList();
 encoders.add(Bug58624Encoder.class);
 ServerEndpointConfig sec = ServerEndpointConfig.Builder.create(
 Bug58624Endpoint.class, PATH).encoders(encoders).build();
@@ -152,7 +151,7 @@ public class TestWsRemoteEndpointImplSer
 try {
 // Breakpoint B required on following line
 session.getBasicRemote().sendObject("test");
-} catch (IOException | EncodeException e) {
+} catch (Exception e) {
 e.printStackTrace();
 }
 }



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

svn commit: r1716410 - in /tomcat/tc7.0.x/trunk: ./ conf/ java/org/apache/jasper/ test/org/apache/el/ test/webapp-3.0/ test/webapp-3.0/bug45nnn/ webapps/docs/

[kkolinko]

Author: kkolinko
Date: Wed Nov 25 13:47:58 2015
New Revision: 1716410

URL: http://svn.apache.org/viewvc?rev=1716410=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57136#c25
Change default value of quoteAttributeEL setting in Jasper to be true
for better compatibility with other implementations and older versions of 
Tomcat.
Add command line option -no-quoteAttributeEL in JspC.

This is backport of r1716355 from tomcat/tc8.0.x/trunk.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/conf/web.xml
tomcat/tc7.0.x/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspC.java
tomcat/tc7.0.x/trunk/test/org/apache/el/TestELInJsp.java
tomcat/tc7.0.x/trunk/test/webapp-3.0/bug45nnn/bug45427.jsp
tomcat/tc7.0.x/trunk/test/webapp-3.0/bug45nnn/bug45451.jspf
tomcat/tc7.0.x/trunk/test/webapp-3.0/bug45nnn/bug45451a.jsp
tomcat/tc7.0.x/trunk/test/webapp-3.0/el-method.jsp
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/jasper-howto.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 25 13:47:58 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,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702
 
744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715978,1715981,1716216-1716217
-/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
 

Re: Time for Tomcat 7.0.66

[Konstantin Kolinko]

2015-11-25 10:32 GMT+03:00 Konstantin Kolinko :
> 2015-11-24 22:38 GMT+03:00 Violeta Georgieva :
>> Hi,
>>
>> Tomorrow morning I plan to prepare Tomcat 7.0.66 for voting.
>> If you want to add something to this release, please reply here.
>
> 1. The fix implementing configuration option for EL quoting (BZ 57136,
> r1712859) has not been ported to Tomcat 7 yet.
>
> I also plan to restore the old behaviour by default, for the reasons I
> explained in thread "On escaping of EL in attributes (BZ 57136)" on
> dev@.
>
> I am working on it. Estimation is ~2 hours.
>

Done.

I think we are OK to go.

I did run the test with Nio +  Java 7 + explicitly set
compile.source=1.7 and compile.target=1.7.  All tests passed.


(I have to run now. I'll be offline for next ~5 hours).

Best regards,
Konstantin Kolinko

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

svn commit: r1716413 - in /tomcat/trunk: bin/catalina.bat bin/catalina.sh webapps/docs/changelog.xml

[markt]

Author: markt
Date: Wed Nov 25 13:56:24 2015
New Revision: 1716413

URL: http://svn.apache.org/viewvc?rev=1716413=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58635
Enable break points to be set within agent code when running Tomcat with a Java 
agent.
Based on a patch by Huxing Zhang.

Modified:
tomcat/trunk/bin/catalina.bat
tomcat/trunk/bin/catalina.sh
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/bin/catalina.bat
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.bat?rev=1716413=1716412=1716413=diff
==
--- tomcat/trunk/bin/catalina.bat (original)
+++ tomcat/trunk/bin/catalina.bat Wed Nov 25 13:56:24 2015
@@ -317,10 +317,10 @@ goto end
 goto end
 :doJpda
 if not "%SECURITY_POLICY_FILE%" == "" goto doSecurityJpda
-%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% %JPDA_OPTS% %DEBUG_OPTS% -classpath 
"%CLASSPATH%" -Dcatalina.base="%CATALINA_BASE%" 
-Dcatalina.home="%CATALINA_HOME%" -Djava.io.tmpdir="%CATALINA_TMPDIR%" 
%MAINCLASS% %CMD_LINE_ARGS% %ACTION%
+%_EXECJAVA% %JAVA_OPTS% %JPDA_OPTS% %CATALINA_OPTS% %DEBUG_OPTS% -classpath 
"%CLASSPATH%" -Dcatalina.base="%CATALINA_BASE%" 
-Dcatalina.home="%CATALINA_HOME%" -Djava.io.tmpdir="%CATALINA_TMPDIR%" 
%MAINCLASS% %CMD_LINE_ARGS% %ACTION%
 goto end
 :doSecurityJpda
-%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% %JPDA_OPTS% %DEBUG_OPTS% -classpath 
"%CLASSPATH%" -Djava.security.manager 
-Djava.security.policy=="%SECURITY_POLICY_FILE%" 
-Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%" 
-Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION%
+%_EXECJAVA% %JAVA_OPTS% %JPDA_OPTS% %CATALINA_OPTS% %DEBUG_OPTS% -classpath 
"%CLASSPATH%" -Djava.security.manager 
-Djava.security.policy=="%SECURITY_POLICY_FILE%" 
-Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%" 
-Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION%
 goto end
 
 :end

Modified: tomcat/trunk/bin/catalina.sh
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.sh?rev=1716413=1716412=1716413=diff
==
--- tomcat/trunk/bin/catalina.sh (original)
+++ tomcat/trunk/bin/catalina.sh Wed Nov 25 13:56:24 2015
@@ -279,7 +279,7 @@ if [ "$1" = "jpda" ] ; then
   if [ -z "$JPDA_OPTS" ]; then
 
JPDA_OPTS="-agentlib:jdwp=transport=$JPDA_TRANSPORT,address=$JPDA_ADDRESS,server=y,suspend=$JPDA_SUSPEND"
   fi
-  CATALINA_OPTS="$CATALINA_OPTS $JPDA_OPTS"
+  CATALINA_OPTS="$JPDA_OPTS $CATALINA_OPTS"
   shift
 fi
 

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1716413=1716412=1716413=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Nov 25 13:56:24 2015
@@ -85,6 +85,11 @@
 for validating or generating new stored credentials from cleartext
 ones. (schultz)
   
+  
+58635: Enable break points to be set within agent code when
+running Tomcat with a Java agent. Based on a patch by Huxing Zhang.
+(markt) 
+  
 
   
   



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

Re: svn commit: r1716360 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/websocket/WsSession.java test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java webapps/docs/changel

[Konstantin Kolinko]

2015-11-25 14:45 GMT+03:00  :
> Author: markt
> Date: Wed Nov 25 11:45:04 2015
> New Revision: 1716360
>
> URL: http://svn.apache.org/viewvc?rev=1716360=rev
> Log:
> Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58624
> Correct a thread safety issue that meant that blocking message writes could 
> block indefinitely if the WebSocket connection was closed while a message 
> write was in progress.
>
> Added:
> 
> tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java
>   - copied unchanged from r1716359, 
> tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java
> Modified:
> tomcat/tc7.0.x/trunk/   (props changed)
> tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java
> tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
>


TestWsRemoteEndpointImplServer.java uses Java 7 code.

If I run the tests with JAVA_HOME=Java 6 and  java.7.home=path to JDK
7,  then compilation of tests fails:

[javac] Compiling 3 source files to REDACTED\output\testclasses
[javac] 
REDACTED\tc7.0.x\trunk\test\org\apache\tomcat\websocket\server\TestWsRemoteEndpointImplServer.java:104:
illegal start of type
[javac] List encoders = new
ArrayList<>();
[javac]
 ^
[javac] 
REDACTED\tc7.0.x\trunk\test\org\apache\tomcat\websocket\server\TestWsRemoteEndpointImplServer.java:155:
 expected
[javac] } catch (IOException | EncodeException e) {
[javac] ^
[javac] 
REDACTED\tc7.0.x\trunk\test\org\apache\tomcat\websocket\server\TestWsRemoteEndpointImplServer.java:155:
'{' expected
[javac] } catch (IOException | EncodeException e) {
[javac]   ^
[javac] 
REDACTED\tc7.0.x\trunk\test\org\apache\tomcat\websocket\server\TestWsRemoteEndpointImplServer.java:155:
not a statement
[javac] } catch (IOException | EncodeException e) {
[javac]^
[javac] 
REDACTED\tc7.0.x\trunk\test\org\apache\tomcat\websocket\server\TestWsRemoteEndpointImplServer.java:155:
';' expected
[javac] } catch (IOException | EncodeException e) {
[javac] ^
[javac] 
REDACTED\tc7.0.x\trunk\test\org\apache\tomcat\websocket\server\TestWsRemoteEndpointImplServer.java:176:
reached end of file while parsing
[javac] }
[javac]  ^
[javac] 6 errors


At buildbot:
https://ci.apache.org/builders/tomcat-7-trunk/builds/193/steps/compile_1/logs/stdio

In build.xml (in 

Re: svn commit: r1716360 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/websocket/WsSession.java test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java webapps/docs/changel

[Mark Thomas]

On 25/11/2015 13:02, Konstantin Kolinko wrote:
> 2015-11-25 14:45 GMT+03:00  :
>> Author: markt
>> Date: Wed Nov 25 11:45:04 2015
>> New Revision: 1716360
>>
>> URL: http://svn.apache.org/viewvc?rev=1716360=rev
>> Log:
>> Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58624
>> Correct a thread safety issue that meant that blocking message writes could 
>> block indefinitely if the WebSocket connection was closed while a message 
>> write was in progress.
>>
>> Added:
>> 
>> tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java
>>   - copied unchanged from r1716359, 
>> tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java
>> Modified:
>> tomcat/tc7.0.x/trunk/   (props changed)
>> tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java
>> tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
>>
> 
> 
> TestWsRemoteEndpointImplServer.java uses Java 7 code.
> 
> If I run the tests with JAVA_HOME=Java 6 and  java.7.home=path to JDK
> 7,  then compilation of tests fails:
> 
> [javac] Compiling 3 source files to REDACTED\output\testclasses
> [javac] 
> REDACTED\tc7.0.x\trunk\test\org\apache\tomcat\websocket\server\TestWsRemoteEndpointImplServer.java:104:
> illegal start of type
> [javac] List encoders = new
> ArrayList<>();
> [javac]
>  ^
> [javac] 
> REDACTED\tc7.0.x\trunk\test\org\apache\tomcat\websocket\server\TestWsRemoteEndpointImplServer.java:155:
>  expected
> [javac] } catch (IOException | EncodeException e) {
> [javac] ^
> [javac] 
> REDACTED\tc7.0.x\trunk\test\org\apache\tomcat\websocket\server\TestWsRemoteEndpointImplServer.java:155:
> '{' expected
> [javac] } catch (IOException | EncodeException e) {
> [javac]   ^
> [javac] 
> REDACTED\tc7.0.x\trunk\test\org\apache\tomcat\websocket\server\TestWsRemoteEndpointImplServer.java:155:
> not a statement
> [javac] } catch (IOException | EncodeException e) {
> [javac]^
> [javac] 
> REDACTED\tc7.0.x\trunk\test\org\apache\tomcat\websocket\server\TestWsRemoteEndpointImplServer.java:155:
> ';' expected
> [javac] } catch (IOException | EncodeException e) {
> [javac] ^
> [javac] 
> REDACTED\tc7.0.x\trunk\test\org\apache\tomcat\websocket\server\TestWsRemoteEndpointImplServer.java:176:
> reached end of file while parsing
> [javac] }
> [javac]  ^
> [javac] 6 errors
> 
> 
> At buildbot:
> https://ci.apache.org/builders/tomcat-7-trunk/builds/193/steps/compile_1/logs/stdio
> 
> In build.xml (in  call that compiles both Java 6 and Java 7 tests. I think this can be
> solved by splitting it into two javac calls.  (Alternative solution is
> to auto-adjust ${compile.source} and ${compile.target} arguments to
> javac depending on availability of ${java.7.home})

Thanks. I opted for making the test class Java 6 friendly as that seemed
the simplest option.

Mark


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

svn commit: r1716414 - in /tomcat/tc8.0.x/trunk: ./ bin/catalina.bat bin/catalina.sh webapps/docs/changelog.xml

[markt]

Author: markt
Date: Wed Nov 25 13:58:05 2015
New Revision: 1716414

URL: http://svn.apache.org/viewvc?rev=1716414=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58635
Enable break points to be set within agent code when running Tomcat with a Java 
agent.
Based on a patch by Huxing Zhang.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/bin/catalina.bat
tomcat/tc8.0.x/trunk/bin/catalina.sh
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 25 13:58:05 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,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657
 
609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1
 
666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,168573
 

[Bug 58635] Break point at java agent code is ignored during catalina.sh jpda run

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #1 from Mark Thomas  ---
Thanks for the report and patch. Do keep in mind when working on scripts that
you need to consider the Windows scripts as well.

This has been fixed in 9.0.x for 9.0.0.M2 onwards, 8.0.x for 8.0.30 onwards,
7.0.x for 7.0.66 onwards and 6.0.x for 6.0.45 onwards.

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

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

[Bug 58646] NullPointerException in InternalNioOutputBuffer

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

Summary|NullPointerException in |NullPointerException in
   |InternalNioOutputBuffer |InternalNioOutputBuffer
   |under traffic related to|
   | config.   |

--- Comment #4 from Mark Thomas  ---
Correct title based on additional information.

-- 
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: r1716420 - /tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java

[markt]

Author: markt
Date: Wed Nov 25 14:13:56 2015
New Revision: 1716420

URL: http://svn.apache.org/viewvc?rev=1716420=rev
Log:
Don't swallow the stack trace. It is likely to contain useful information.

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

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1716420=1716419=1716420=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Wed Nov 25 
14:13:56 2015
@@ -1003,10 +1003,10 @@ public class Http11Processor extends Abs
 message += 
sm.getString("http11processor.fallToDebug");
 //$FALL-THROUGH$
 case INFO:
-log.info(message);
+log.info(message, t);
 break;
 case DEBUG:
-log.debug(message);
+log.debug(message, t);
 }
 }
 // 400 - Bad Request



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

[Bug 58646] NullPointerException in InternalNioOutputBuffer

[bugzilla]

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

--- Comment #5 from Mark Thomas  ---
I've added the stack trace to the log message.

Initial impressions of this issue are an application bug along the lines of
retaining a reference to the response.

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

buildbot success in ASF Buildbot on tomcat-7-trunk

[buildbot]

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

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1716402
Blamelist: markt

Build succeeded!

Sincerely,
 -The Buildbot




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

[Bug 58647] After blocking write timeout occurs, WsRemoteEndpointImplBase remains in BINARY_PARTIAL_WRITING state.

[bugzilla]

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

--- Comment #1 from Mark Thomas  ---
I'm tempted to resolve this as WONTFIX. My expectation is that any I/O related
exception is going to be fatal to the connection, not least because it is
impossible to know how many bytes have been written.

What is your use case for wanting to re-try the write?

-- 
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: r1716421 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/coyote/http11/AbstractHttp11Processor.java

[markt]

Author: markt
Date: Wed Nov 25 14:15:44 2015
New Revision: 1716421

URL: http://svn.apache.org/viewvc?rev=1716421=rev
Log:
Don't swallow the stack trace. It is likely to contain useful information.

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

tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 25 14:15:44 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,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657
 
609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1
 
666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,168573
 

svn commit: r1716423 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/AbstractHttp11Processor.java

[markt]

Author: markt
Date: Wed Nov 25 14:16:22 2015
New Revision: 1716423

URL: http://svn.apache.org/viewvc?rev=1716423=rev
Log:
Don't swallow the stack trace. It is likely to contain useful information.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 25 14:16:22 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,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702
 
744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715978,1715981,1716216-1716217,1716355,1716414
-/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