DO NOT REPLY [Bug 51230] New: Some jmx attributes of ReplicationValve and JvmRouteBinderValve are unavailable
https://issues.apache.org/bugzilla/show_bug.cgi?id=51230 Bug #: 51230 Summary: Some jmx attributes of ReplicationValve and JvmRouteBinderValve are unavailable Product: Tomcat 7 Version: trunk Platform: All OS/Version: All Status: NEW Severity: minor Priority: P2 Component: Cluster AssignedTo: dev@tomcat.apache.org ReportedBy: mashm...@gmail.com Classification: Unclassified Created attachment 27032 --> https://issues.apache.org/bugzilla/attachment.cgi?id=27032 patch for mbean-descriptor asyncSupported and doProcessingStats(ReplicationValve only) are unavailable. I made the patch for this issue. Regards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
DO NOT REPLY [Bug 51230] Some jmx attributes of ReplicationValve and JvmRouteBinderValve are unavailable
https://issues.apache.org/bugzilla/show_bug.cgi?id=51230 Mark Thomas changed: What|Removed |Added Attachment #27032|0 |1 is patch|| Attachment #27032|application/octet-stream|text/plain mime type|| -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: r1124607 - in /tomcat/trunk: java/org/apache/catalina/ha/session/mbeans-descriptors.xml java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml webapps/docs/changelog.xml
Author: markt Date: Thu May 19 08:49:03 2011 New Revision: 1124607 URL: http://svn.apache.org/viewvc?rev=1124607&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51230 Add missing attributes to JMX for ReplicationValve and JvmRouteBinderValve. Patch provided by Eiji Takahashi. Modified: tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml tomcat/trunk/java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml?rev=1124607&r1=1124606&r2=1124607&view=diff == --- tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml (original) +++ tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml Thu May 19 08:49:03 2011 @@ -28,6 +28,7 @@ http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml?rev=1124607&r1=1124606&r2=1124607&view=diff == --- tomcat/trunk/java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml (original) +++ tomcat/trunk/java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml Thu May 19 08:49:03 2011 @@ -101,10 +101,12 @@ http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1124607&r1=1124606&r2=1124607&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Thu May 19 08:49:03 2011 @@ -50,21 +50,29 @@ - + -46451: Configure svn:bugtraq properties for Tomcat trunk. -Based on a patch provided by Marc Guillemot. (markt) +51230: Add missing attributes to JMX for ReplicationValve and +JvmRouteBinderValve. Patch provided by Eiji Takahashi. (markt) -Add docs for experimental AJP-NIO connector. (markt/rjung) +Add documentation for AJP-NIO connector. (markt/rjung) + + + +46451: Configure svn:bugtraq properties for Tomcat trunk. +Based on a patch provided by Marc Guillemot. (markt) + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51230] Some jmx attributes of ReplicationValve and JvmRouteBinderValve are unavailable
https://issues.apache.org/bugzilla/show_bug.cgi?id=51230 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mark Thomas 2011-05-19 08:49:04 UTC --- Thanks for the report and the patch. The patch has been applied to 7.0.x and will be included in 7.0.15 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
DO NOT REPLY [Bug 51229] Some async examples are not work correctly
https://issues.apache.org/bugzilla/show_bug.cgi?id=51229 Mark Thomas changed: What|Removed |Added Attachment #27031|0 |1 is patch|| Attachment #27031|application/octet-stream|text/plain mime type|| -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: r1124614 - in /tomcat/trunk/webapps: docs/changelog.xml examples/WEB-INF/classes/async/Async0.java examples/jsp/async/index.jsp
Author: markt
Date: Thu May 19 08:55:43 2011
New Revision: 1124614
URL: http://svn.apache.org/viewvc?rev=1124614&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51229
Fix bugs in the Servlet 3.0 asynchronous examples.
Patch provided by Eiji Takahashi.
Modified:
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async0.java
tomcat/trunk/webapps/examples/jsp/async/index.jsp
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1124614&r1=1124613&r2=1124614&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu May 19 08:55:43 2011
@@ -63,6 +63,10 @@
Add documentation for AJP-NIO connector. (markt/rjung)
+
+51229: Fix bugs in the Servlet 3.0 asynchronous examples.
+Patch provided by Eiji Takahashi. (markt)
+
Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async0.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async0.java?rev=1124614&r1=1124613&r2=1124614&view=diff
==
--- tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async0.java (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async0.java Thu May 19
08:55:43 2011
@@ -37,9 +37,9 @@ public class Async0 extends HttpServlet
protected void service(final HttpServletRequest req, final
HttpServletResponse resp) throws ServletException, IOException {
if (Boolean.TRUE == req.getAttribute("dispatch")) {
log.info("Received dispatch, completing on the worker thread.");
-req.getAsyncContext().complete();
log.info("After complete called started:"+req.isAsyncStarted());
resp.getWriter().write("Async dispatch
worked:+"+System.currentTimeMillis()+"\n");
+req.getAsyncContext().complete();
} else {
resp.setContentType("text/plain");
final AsyncContext actx = req.startAsync();
Modified: tomcat/trunk/webapps/examples/jsp/async/index.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/async/index.jsp?rev=1124614&r1=1124613&r2=1124614&view=diff
==
--- tomcat/trunk/webapps/examples/jsp/async/index.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/async/index.jsp Thu May 19 08:55:43 2011
@@ -65,5 +65,5 @@ Use cases:
7. Stock ticker
- "> StockTicker
+ ">
StockTicker
\ No newline at end of file
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51229] Some async examples are not work correctly
https://issues.apache.org/bugzilla/show_bug.cgi?id=51229 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mark Thomas 2011-05-19 08:55:41 UTC --- Thanks for the report and the patch. The patch has been applied to 7.0.x and will be included in 7.0.15 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
DO NOT REPLY [Bug 51220] Add system property that makes it possible for jsp pages with the extends page directive to take advantage of tag pooling
https://issues.apache.org/bugzilla/show_bug.cgi?id=51220 hybris support changed: What|Removed |Added CC||supp...@hybris.de -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
DO NOT REPLY [Bug 51226] [Patch] to add FindLeaks ant task
https://issues.apache.org/bugzilla/show_bug.cgi?id=51226 --- Comment #2 from Mark Thomas 2011-05-19 09:10:40 UTC --- Thanks for the report and the patch. There were a couple of minor issues with the patch and one slightly more serious issue. First the minor issues: - no license header in FindLeaksTask.java - a couple of unused imports in FindLeaksTask.java Tomcat includes a checkstyle configuration in /res/checkstyle that you can use with your IDE. Alternatively, you can set execute.validate=true in your build.properties and ant will run the checkstyle checks. The bigger issue is that the patch changes the output format of find leaks for the manager application. The output is intended to be a plain text list of leaking contexts that can be parsed easily by the client. Adding the additional text from the HTML Manager to the Manager will make it much more difficult for a client to parse the output. If you submit an updated patch, it should get applied pretty quickly. If not, one of the committers will probably make the necessary changes to this patch and apply it but that is likely to take a little longer. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
DO NOT REPLY [Bug 51225] The link for Manager help is broken in Japanese locale
https://issues.apache.org/bugzilla/show_bug.cgi?id=51225 Mark Thomas changed: What|Removed |Added Attachment #27028|0 |1 is patch|| Attachment #27028|application/octet-stream|text/plain mime type|| -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
DO NOT REPLY [Bug 51225] The link for Manager help is broken in Japanese locale
https://issues.apache.org/bugzilla/show_bug.cgi?id=51225 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mark Thomas 2011-05-19 09:15:09 UTC --- Thanks for the report and the patch. The patch has been applied to 7.0.x and will be included in 7.0.15 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: r1124620 - in /tomcat/trunk: java/org/apache/catalina/manager/LocalStrings_de.properties java/org/apache/catalina/manager/LocalStrings_es.properties java/org/apache/catalina/manager/LocalS
Author: markt Date: Thu May 19 09:15:52 2011 New Revision: 1124620 URL: http://svn.apache.org/viewvc?rev=1124620&view=rev Log: Fix broken documentation links for non-English locales in the HTML Manager application. Patch provided by Eiji Takahashi. Modified: tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_de.properties tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ja.properties tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_de.properties URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_de.properties?rev=1124620&r1=1124619&r2=1124620&view=diff == --- tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_de.properties (original) +++ tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_de.properties Thu May 19 09:15:52 2011 @@ -27,9 +27,9 @@ htmlManagerServlet.appsTitle=Anwendungen htmlManagerServlet.expire.explain=mit Inaktivit\u00e4t ≥ htmlManagerServlet.expire.unit=Minuten htmlManagerServlet.helpHtmlManager=Hilfeseite HTML Manager (englisch) -htmlManagerServlet.helpHtmlManagerFile=html-manager-howto.html +htmlManagerServlet.helpHtmlManagerFile=../docs/html-manager-howto.html htmlManagerServlet.helpManager=Hilfeseite Manager (englisch) -htmlManagerServlet.helpManagerFile=manager-howto.html +htmlManagerServlet.helpManagerFile=../docs/manager-howto.html htmlManagerServlet.deployButton=Installieren htmlManagerServlet.deployConfig=XML Konfigurationsdatei URL: htmlManagerServlet.deployPath=Kontext Pfad (optional): Modified: tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties?rev=1124620&r1=1124619&r2=1124620&view=diff == --- tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties (original) +++ tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties Thu May 19 09:15:52 2011 @@ -26,9 +26,9 @@ htmlManagerServlet.appsTitle = Aplicacio htmlManagerServlet.expire.explain = sin trabajar ≥ htmlManagerServlet.expire.unit = minutos htmlManagerServlet.helpHtmlManager = Ayuda HTML de Gestor -htmlManagerServlet.helpHtmlManagerFile = html-manager-howto.html +htmlManagerServlet.helpHtmlManagerFile = ../docs/html-manager-howto.html htmlManagerServlet.helpManager = Ayuda de Gestor -htmlManagerServlet.helpManagerFile = manager-howto.html +htmlManagerServlet.helpManagerFile = ../docs/manager-howto.html htmlManagerServlet.deployButton = Desplegar htmlManagerServlet.deployConfig = URL de archivo de Configuraci\u00F3n XML\: htmlManagerServlet.deployPath = Trayectoria de Contexto (opcional)\: Modified: tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ja.properties URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ja.properties?rev=1124620&r1=1124619&r2=1124620&view=diff == --- tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ja.properties (original) +++ tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ja.properties Thu May 19 09:15:52 2011 @@ -24,9 +24,9 @@ htmlManagerServlet.appsStop=\u505c\u6b62 htmlManagerServlet.appsTasks=\u30b3\u30de\u30f3\u30c9 htmlManagerServlet.appsTitle=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3 htmlManagerServlet.helpHtmlManager=HTML\u30de\u30cd\u30fc\u30b8\u30e3\u30d8\u30eb\u30d7 -htmlManagerServlet.helpHtmlManagerFile=html-manager-howto.html +htmlManagerServlet.helpHtmlManagerFile=../docs/html-manager-howto.html htmlManagerServlet.helpManager=\u30de\u30cd\u30fc\u30b8\u30e3\u30d8\u30eb\u30d7 -htmlManagerServlet.helpManagerFile=manager-howto.html +htmlManagerServlet.helpManagerFile=../docs/manager-howto.html htmlManagerServlet.deployButton=\u914d\u5099 htmlManagerServlet.deployConfig=XML\u8a2d\u5b9a\u30d5\u30a1\u30a4\u30eb\u306eURL: htmlManagerServlet.deployPath=\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9 (\u7701\u7565\u53ef): Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1124620&r1=1124619&r2=1124620&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Thu May 19 09:15:52 2011 @@ -64,6 +64,11 @@ Add documentation for AJP-NIO connector. (markt/rjung) +51225: Fix broken documentation links for non-English locales +in the HTML Manager application. Patch provided by Eiji Takahashi. +(markt) + +
svn commit: r1124624 - /tomcat/trunk/webapps/docs/changelog.xml
Author: markt Date: Thu May 19 09:19:03 2011 New Revision: 1124624 URL: http://svn.apache.org/viewvc?rev=1124624&view=rev Log: MOve to correct version 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=1124624&r1=1124623&r2=1124624&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Thu May 19 09:19:03 2011 @@ -43,6 +43,12 @@ Other --> + + +51197: Fix possible dropped connection when sendError or +sendRedirst are used during async processing. (markt) + + @@ -118,10 +124,6 @@ get returned with requests mapped to a context with a path of /foobar. (markt) - -51197: Fix possible dropped connection when sendError or -sendRedirst are used during async processing. (markt) - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1124625 - /tomcat/trunk/webapps/docs/changelog.xml
Author: markt Date: Thu May 19 09:19:58 2011 New Revision: 1124625 URL: http://svn.apache.org/viewvc?rev=1124625&view=rev Log: grr 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=1124625&r1=1124624&r2=1124625&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Thu May 19 09:19:58 2011 @@ -44,10 +44,12 @@ --> + 51197: Fix possible dropped connection when sendError or sendRedirst are used during async processing. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1124629 - in /tomcat/trunk: java/org/apache/tomcat/util/http/res/LocalStrings_es.properties webapps/docs/changelog.xml
Author: markt Date: Thu May 19 09:27:30 2011 New Revision: 1124629 URL: http://svn.apache.org/viewvc?rev=1124629&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51221 Correct Spanish translation of text used in a 302 response. Patch provided by Paco Soberón. Modified: tomcat/trunk/java/org/apache/tomcat/util/http/res/LocalStrings_es.properties tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/java/org/apache/tomcat/util/http/res/LocalStrings_es.properties URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/res/LocalStrings_es.properties?rev=1124629&r1=1124628&r2=1124629&view=diff == --- tomcat/trunk/java/org/apache/tomcat/util/http/res/LocalStrings_es.properties (original) +++ tomcat/trunk/java/org/apache/tomcat/util/http/res/LocalStrings_es.properties Thu May 19 09:27:30 2011 @@ -27,7 +27,7 @@ sc.206=Contenido Parcial sc.207=Multi-Estado sc.300=M\u00faltiples Elecciones sc.301=Movido permanentemente -sc.302=Movido tempor\u00e1lmente +sc.302=Movido temporalmente sc.303=Mirar Otro sc.304=No Modificado sc.305=Usar Proxy Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1124629&r1=1124628&r2=1124629&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Thu May 19 09:27:30 2011 @@ -49,6 +49,10 @@ 51197: Fix possible dropped connection when sendError or sendRedirst are used during async processing. (markt) + +51221: Correct Spanish translation of text used in a 302 +response. Patch provided by Paco Soberón. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1124631 - /tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/res/LocalStrings_es.properties
Author: markt Date: Thu May 19 09:28:59 2011 New Revision: 1124631 URL: http://svn.apache.org/viewvc?rev=1124631&view=rev Log: CTR on 6.0.x Fix spelling in Spanish 302 response Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/res/LocalStrings_es.properties Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/res/LocalStrings_es.properties URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/res/LocalStrings_es.properties?rev=1124631&r1=1124630&r2=1124631&view=diff == --- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/res/LocalStrings_es.properties (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/res/LocalStrings_es.properties Thu May 19 09:28:59 2011 @@ -27,7 +27,7 @@ sc.206=Contenido Parcial sc.207=Multi-Estado sc.300=M\u00faltiples Elecciones sc.301=Movido permanentemente -sc.302=Movido tempor\u00e1lmente +sc.302=Movido temporalmente sc.303=Mirar Otro sc.304=No Modificado sc.305=Usar Proxy - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1124632 - /tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/http/res/LocalStrings_es.properties
Author: markt Date: Thu May 19 09:29:46 2011 New Revision: 1124632 URL: http://svn.apache.org/viewvc?rev=1124632&view=rev Log: CTR on 5.5.x Fix spelling in Spanish 302 response Modified: tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/http/res/LocalStrings_es.properties Modified: tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/http/res/LocalStrings_es.properties URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/http/res/LocalStrings_es.properties?rev=1124632&r1=1124631&r2=1124632&view=diff == --- tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/http/res/LocalStrings_es.properties (original) +++ tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/http/res/LocalStrings_es.properties Thu May 19 09:29:46 2011 @@ -27,7 +27,7 @@ sc.206=Contenido Parcial sc.207=Multi-Estado sc.300=M\u00faltiples Elecciones sc.301=Movido permanentemente -sc.302=Movido tempor\u00e1lmente +sc.302=Movido temporalmente sc.303=Mirar Otro sc.304=No Modificado sc.305=Usar Proxy - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51221] Wrong spelling in Spanish locale
https://issues.apache.org/bugzilla/show_bug.cgi?id=51221 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mark Thomas 2011-05-19 09:30:18 UTC --- Thanks for the report and explanation. The fix has been applied to 7.0.x, 6.0.x and 5.5.x and will be included in 7.0.15, 6.0.33 and 5.5.34 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: r1124644 - in /tomcat/trunk/webapps/docs: changelog.xml config/listeners.xml
Author: markt Date: Thu May 19 09:43:59 2011 New Revision: 1124644 URL: http://svn.apache.org/viewvc?rev=1124644&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51182 Better organisation of listeners doc Add JAAS/JMX listener info Patch provided by Neil Laurance Modified: tomcat/trunk/webapps/docs/changelog.xml tomcat/trunk/webapps/docs/config/listeners.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1124644&r1=1124643&r2=1124644&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Thu May 19 09:43:59 2011 @@ -76,6 +76,10 @@ Add documentation for AJP-NIO connector. (markt/rjung) +51182: Document JAAS supported added in 51119. +Patch provided by Neil Laurance. (markt) + + 51225: Fix broken documentation links for non-English locales in the HTML Manager application. Patch provided by Eiji Takahashi. (markt) Modified: tomcat/trunk/webapps/docs/config/listeners.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/listeners.xml?rev=1124644&r1=1124643&r2=1124644&view=diff == --- tomcat/trunk/webapps/docs/config/listeners.xml (original) +++ tomcat/trunk/webapps/docs/config/listeners.xml Thu May 19 09:43:59 2011 @@ -65,14 +65,22 @@ - + -Unlike most Catalina components, there are several standard -Listener implementations available. As a result, -the className attribute MUST be used to select the -implementation you wish to use. + -APR Lifecycle Listener (org.apache.catalina.core.AprLifecycleListener) + No element may be nested inside a Listener. + + + + + + Unlike most Catalina components, there are several standard + Listener implementations available. As a result, + the className attribute MUST be used to select the + implementation you wish to use. + + The APR Lifecycle Listener checks for the presence of the APR/native library and loads the library if it is present. For more @@ -104,7 +112,9 @@ -Jasper Listener (org.apache.catalina.core.JasperListener) + + + The Jasper Listener initializes the Jasper 2 JSP engine before any web applications that may use it are loaded. For more @@ -117,8 +127,10 @@ No additional attributes are supported by the Jasper Listener . -Global Resources Lifecycle Listener -(org.apache.catalina.mbeans.GlobalResourcesLifecycleListener) + + + The Global Resources Lifecycle Listener initializes the Global JNDI resources defined in server.xml as part of the No additional attributes are supported by the Global Resources Lifecycle Listener. -JMX Remote Lifecycle Listener -(org.apache.catalina.mbeans.JmxRemoteLifecycleListener) - -This listener requires catalina-jmx-remote.jar to be placed -in $CATALINA_HOME/lib. This jar may be found in the extras -directory of the binary download area. - -The JMX Remote Lifecycle Listener fixes the ports used by -the JMX/RMI Server making things much simpler if you need to connect -jconsole or a similar tool to a remote Tomcat instance that is running -behind a firewall. Only these ports are configured via the listener. The -remainder of the configuration is via the standard system properties for -configuring JMX. For further information on configuring JMX see -http://java.sun.com/javase/6/docs/technotes/guides/management/agent.html";> -Monitoring and Management Using JMX included with the Java SDK -documentation. - -If this listener was configured in server.xml as: - -- -with the following system properties set (e.g. in setenv.sh): - --Dcom.sun.management.jmxremote.password.file=$CATALINA_BASE/conf/jmxremote.password --Dcom.sun.management.jmxremote.access.file=$CATALINA_BASE/conf/jmxremote.access --Dcom.sun.management.jmxremote.ssl=false - -$CATALINA_BASE/conf/jmxremote.password containing: - -admin letmein - -$CATALINA_BASE/conf/jmxremote.access containing: - -admin readwrite - -then opening ports 10001 (RMI Registry) and 10002 (JMX/RMI Server) in your -firewall would enable jconsole to connect to a Tomcat instance running -behind a firewall using a connection string of the form: - -service:jmx:rmi:// :10002/jndi/rmi:// :10001/jmxrmi - -with a user name of admin and a password of -letmein. - - -Note that the example above does not use SSL. JMX access should -be considered equivalent to administrative access and secured accordingly. -
DO NOT REPLY [Bug 51182] Update to listeners.xml documentation to describe changes for 51119
https://issues.apache.org/bugzilla/show_bug.cgi?id=51182 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mark Thomas 2011-05-19 09:43:57 UTC --- Thanks for the patch. It has been applied to 7.0.x and will be included in 7.0.15 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1124644 - in /tomcat/trunk/webapps/docs: changelog.xml config/listeners.xml
2011/5/19 : > Author: markt > Date: Thu May 19 09:43:59 2011 > New Revision: 1124644 > > URL: http://svn.apache.org/viewvc?rev=1124644&view=rev > Log: > Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51182 > Better organisation of listeners doc > Add JAAS/JMX listener info > Patch provided by Neil Laurance > > Modified: > tomcat/trunk/webapps/docs/changelog.xml > tomcat/trunk/webapps/docs/config/listeners.xml > BZ 51119 was recently backported to TC6. I'd be nice to update the docs there as well. > > + 51182: Document JAAS supported added in 51119. > + Patch provided by Neil Laurance. (markt) > + > + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1124672 - /tomcat/trunk/webapps/docs/config/systemprops.xml
Author: markt Date: Thu May 19 10:29:11 2011 New Revision: 1124672 URL: http://svn.apache.org/viewvc?rev=1124672&view=rev Log: Ordering Modified: tomcat/trunk/webapps/docs/config/systemprops.xml Modified: tomcat/trunk/webapps/docs/config/systemprops.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/systemprops.xml?rev=1124672&r1=1124671&r2=1124672&view=diff == --- tomcat/trunk/webapps/docs/config/systemprops.xml (original) +++ tomcat/trunk/webapps/docs/config/systemprops.xml Thu May 19 10:29:11 2011 @@ -98,6 +98,15 @@ + + If true, the requirement to have the object referenced in + jsp:getProperty action to be previously "introduced" + to the JSP processor, as specified in the chapter JSP.5.3 of JSP 2.0 and + later specifications, is enforced. + If not specified, the specification compliant default of + true will be used. + + The name of the variable to use for the expression language expression factory. @@ -111,15 +120,6 @@ will be used. - - If true, the requirement to have the object referenced in - jsp:getProperty action to be previously "introduced" - to the JSP processor, as specified in the chapter JSP.5.3 of JSP 2.0 and - later specifications, is enforced. - If not specified, the specification compliant default of - true will be used. - - If false the requirements for escaping quotes in JSP attributes will be relaxed so that an unescaped quote will not - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1124680 - in /tomcat/trunk: java/org/apache/jasper/compiler/Generator.java webapps/docs/changelog.xml webapps/docs/config/systemprops.xml
Author: markt
Date: Thu May 19 10:44:12 2011
New Revision: 1124680
URL: http://svn.apache.org/viewvc?rev=1124680&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51220
Add a system property to enable tag pooling with JSPs that use a custom base
class.
Based on a patch by Dan Mikusa.
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/systemprops.xml
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Generator.java?rev=1124680&r1=1124679&r2=1124680&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/Generator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Generator.java Thu May 19
10:44:12 2011
@@ -77,6 +77,8 @@ class Generator {
System.getProperty("org.apache.jasper.compiler.Generator.VAR_EXPRESSIONFACTORY",
"_el_expressionfactory");
private static final String VAR_INSTANCEMANAGER =
System.getProperty("org.apache.jasper.compiler.Generator.VAR_INSTANCEMANAGER",
"_jsp_instancemanager");
+private static final boolean POOL_TAGS_WITH_EXTENDS =
+
Boolean.getBoolean("org.apache.jasper.compiler.Generator.VAR_EXPRESSIONFACTORY");
/* System property that controls if the requirement to have the object
* used in jsp:getProperty action to be previously "introduced"
@@ -3423,7 +3425,7 @@ class Generator {
* clarify whether containers can override init() and destroy(). For
* now, we just disable tag pooling for pages that use "extends".
*/
-if (pageInfo.getExtends(false) == null) {
+if (pageInfo.getExtends(false) == null || POOL_TAGS_WITH_EXTENDS) {
isPoolingEnabled = ctxt.getOptions().isPoolingEnabled();
} else {
isPoolingEnabled = false;
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1124680&r1=1124679&r2=1124680&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu May 19 10:44:12 2011
@@ -62,6 +62,14 @@
+
+
+
+51220: Add a system property to enable tag pooling with JSPs
+that use a custom base class. Based on a patch by Dan Mikusa. (markt)
+
+
+
Modified: tomcat/trunk/webapps/docs/config/systemprops.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/systemprops.xml?rev=1124680&r1=1124679&r2=1124680&view=diff
==
--- tomcat/trunk/webapps/docs/config/systemprops.xml (original)
+++ tomcat/trunk/webapps/docs/config/systemprops.xml Thu May 19 10:44:12 2011
@@ -98,6 +98,20 @@
+
+ By default, JSPs that use their own base class via the extends
+ attribute of the page directive, will have Tag pooling disabled since
+ Jasper cannot guarantee that the necessary initialisation will have taken
+ place. This can have a negative impact on performance. Providing the
+ alternative base class calls _jspInit() from Servlet.init(), setting
this
+ property to true will enable pooling with an alternative
base
+ class. If the alternative base class does not call _jspInit() and this
+ property is true, NPEs will occur when attempting to use
+ tags.
+ If not specified, the default value of false will be
used.
+
+
+
If true, the requirement to have the object referenced in
jsp:getProperty action to be previously "introduced"
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1124683 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Thu May 19 10:52:02 2011 New Revision: 1124683 URL: http://svn.apache.org/viewvc?rev=1124683&view=rev Log: Proposal Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1124683&r1=1124682&r2=1124683&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu May 19 10:52:02 2011 @@ -177,3 +177,11 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?view=revision&revision=1094069 +1: markt -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51220 + Add a system property to enable tag pooling with JSPs that use a custom base + class. + Based on a patch by Dan Mikusa. + http://svn.apache.org/viewvc?rev=1124680&view=rev + +1: markt + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51220] Add system property that makes it possible for jsp pages with the extends page directive to take advantage of tag pooling
https://issues.apache.org/bugzilla/show_bug.cgi?id=51220 --- Comment #1 from Mark Thomas 2011-05-19 10:51:59 UTC --- Fixed in 7.0.x and will be in 7.0.15 onwards. Proposed for 6.0.x. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
DO NOT REPLY [Bug 51181] Add support for Web Sockets
https://issues.apache.org/bugzilla/show_bug.cgi?id=51181 --- Comment #6 from Mark Thomas 2011-05-19 11:04:46 UTC --- Current thinking on this is that Tomcat would provide the SocketIO API in a similar manner to how Comet is supported. The underlying transports, e.g web sockets, will also be exposed if practical. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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 propchange: r1100832 - svn:log
Author: markt Revision: 1100832 Modified property: svn:log Modified: svn:log at Thu May 19 11:49:53 2011 -- --- svn:log (original) +++ svn:log Thu May 19 11:49:53 2011 @@ -1 +1,2 @@ Use the correct classloader +This is the fix for CVE-2011-1582 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51232] New: Heavy CPU usage caused by broken browser connection
https://issues.apache.org/bugzilla/show_bug.cgi?id=51232 Bug #: 51232 Summary: Heavy CPU usage caused by broken browser connection Product: Tomcat Connectors Version: 1.2.31 Platform: PC OS/Version: FreeBSD Status: NEW Severity: major Priority: P2 Component: mod_jk AssignedTo: dev@tomcat.apache.org ReportedBy: ari.suut...@syncrontech.com Classification: Unclassified After upgrading mod_jk from 1.2.30 to 1.2.31 we started experiencing huge CPU usage by apache (2.2.18) processes randomly. Usually the apache server is very lightly loaded, but now load levels were almost constantly over 10. It seems that problem occurs if tomcat is serving a page which takes some time to complete (some kind of long report for example). If user isn't patient enought to wait that page completes but presses stop in browser instead the apache server process serving the request starts spinning for 30 seconds. Somebody else has also noticed this (in different environment however): http://osdir.com/ml/users-tomcat.apache.org/2011-05/msg00350.html Here are some relevant lines from jk.log: [Thu May 19 13:02:31.440 2011] [1164:34382815408] [debug] ajp_connection_tcp_get_message::jk_ajp_common.c (1329): 03e061 0A 0A 61 61 61 61 61 61 61 61 61 61 61 61 61 - a..a [Thu May 19 13:02:31.440 2011] [1164:34382815408] [debug] ajp_connection_tcp_get_message::jk_ajp_common.c (1329): 03f061 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 - [Thu May 19 13:02:31.440 2011] [1164:34382815408] [debug] ws_write::mod_jk.c (508): written -1 out of 8184 [Thu May 19 13:02:31.440 2011] [1164:34382815408] [info] ajp_process_callback::jk_ajp_common.c (1885): Writing to client aborted or client network problems [Thu May 19 13:02:31.440 2011] [1164:34382815408] [info] ajp_service::jk_ajp_common.c (2543): (varnish_tc-demo) sending request to tomcat failed (unrecoverable), because of client write error (attempt=1) [Thu May 19 13:02:31.440 2011] [1164:34382815408] [debug] ajp_reset_endpoint::jk_ajp_common.c (757): (varnish_tc-demo) resetting endpoint with socket 13 (socket shutdown) [Thu May 19 13:02:31.440 2011] [1164:34382815408] [debug] jk_shutdown_socket::jk_connect.c (726): About to shutdown socket 13 [192.168.2.99:64615 -> 192.168.9.24:8123] [Thu May 19 13:03:01.000 2011] [1164:34382815408] [debug] jk_shutdown_socket::jk_connect.c (808): Shutdown socket 13 [192.168.2.99:64615 -> 192.168.9.24:8123] and read -374766112 lingering by tes in 30 sec. [Thu May 19 13:03:01.001 2011] [1164:34382815408] [debug] ajp_done::jk_ajp_common.c (3013): recycling connection pool slot=0 for worker varnish_tc-demo [Thu May 19 13:03:01.001 2011] [1164:34382815408] [info] service::jk_lb_worker.c (1388): service failed, worker varnish_tc-demo is in local error state [Thu May 19 13:03:01.001 2011] [1164:34382815408] [info] service::jk_lb_worker.c (1407): unrecoverable error 200, request failed. Client failed in the middle of request, we can't recover to a nother instance. [Thu May 19 13:03:01.001 2011] [1164:34382815408] [info] jk_handler::mod_jk.c (2620): Aborting connection for worker=lb_tc-demo I think that when log says "About to shutdown socket 13" the heavy CPU usage starts and it ends when the next line in log says "Shutdown socket... .read lingering". We have now reverted to mod_jk 1.2.30 which works ok. 1.2.31 made our system almost unusable. This problem is easy to reproduce with apache JMeter (I can provide the test configuration and test page used on tomcat side if necessary). -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
DO NOT REPLY [Bug 50839] Closing connection on the client side (browser) during unfinished transmission result in 100% CPU slike for 30 sec during socket shutdownd in jk_connect.c
https://issues.apache.org/bugzilla/show_bug.cgi?id=50839 Mark Thomas changed: What|Removed |Added CC||ari.suut...@syncrontech.com --- Comment #9 from Mark Thomas 2011-05-19 12:06:20 UTC --- *** Bug 51232 has been marked as a duplicate of this bug. *** -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
DO NOT REPLY [Bug 51232] Heavy CPU usage caused by broken browser connection
https://issues.apache.org/bugzilla/show_bug.cgi?id=51232 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||DUPLICATE --- Comment #1 from Mark Thomas 2011-05-19 12:06:20 UTC --- *** This bug has been marked as a duplicate of bug 50839 *** -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: r1124711 - /tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
Author: markt
Date: Thu May 19 12:36:06 2011
New Revision: 1124711
URL: http://svn.apache.org/viewvc?rev=1124711&view=rev
Log:
Remove unused code. Made unnecessary by r618481
Modified:
tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
Modified: tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java?rev=1124711&r1=1124710&r2=1124711&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java Thu May 19
12:36:06 2011
@@ -60,7 +60,6 @@ public class JspCompilationContext {
private final Log log = LogFactory.getLog(JspCompilationContext.class); //
must not be static
protected Map tagFileJarUrls;
-protected boolean isPackagedTagFile;
protected String className;
protected String jspUri;
@@ -138,9 +137,6 @@ public class JspCompilationContext {
this.isTagFile = true;
this.tagInfo = tagInfo;
this.tagJarResource = tagJarResource;
-if (tagJarResource != null) {
-isPackagedTagFile = true;
-}
}
/* Methods to override */
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1124714 - /tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
Author: markt
Date: Thu May 19 12:41:50 2011
New Revision: 1124714
URL: http://svn.apache.org/viewvc?rev=1124714&view=rev
Log:
Remove unused attribute
Modified:
tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
Modified: tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java?rev=1124714&r1=1124713&r2=1124714&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java Thu May 19
12:41:50 2011
@@ -69,7 +69,6 @@ public class JspCompilationContext {
protected String servletJavaFileName;
protected String javaPath;
protected String classFileName;
-protected String contentType;
protected ServletWriter writer;
protected Options options;
protected JspServletWrapper jsw;
@@ -515,19 +514,6 @@ public class JspCompilationContext {
}
/**
- * Get the content type of this JSP.
- *
- * Content type includes content type and encoding.
- */
-public String getContentType() {
-return contentType;
-}
-
-public void setContentType(String contentType) {
-this.contentType = contentType;
-}
-
-/**
* Where is the servlet being generated?
*/
public ServletWriter getWriter() {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1124719 - in /tomcat/trunk/java/org/apache/jasper: JspC.java JspCompilationContext.java servlet/JspServlet.java servlet/JspServletWrapper.java
Author: markt
Date: Thu May 19 12:45:49 2011
New Revision: 1124719
URL: http://svn.apache.org/viewvc?rev=1124719&view=rev
Log:
Remove unused isErrPage attribute
Modified:
tomcat/trunk/java/org/apache/jasper/JspC.java
tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java
tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
Modified: tomcat/trunk/java/org/apache/jasper/JspC.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspC.java?rev=1124719&r1=1124718&r2=1124719&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspC.java Thu May 19 12:45:49 2011
@@ -1160,7 +1160,7 @@ public class JspC implements Options {
String jspUri=file.replace('\\','/');
JspCompilationContext clctxt = new JspCompilationContext
-( jspUri, false, this, context, null, rctxt );
+( jspUri, this, context, null, rctxt );
/* Override the defaults */
if ((targetClassName != null) && (targetClassName.length() > 0)) {
Modified: tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java?rev=1124719&r1=1124718&r2=1124719&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java Thu May 19
12:45:49 2011
@@ -63,7 +63,6 @@ public class JspCompilationContext {
protected String className;
protected String jspUri;
-protected boolean isErrPage;
protected String basePackageName;
protected String derivedPackageName;
protected String servletJavaFileName;
@@ -95,14 +94,12 @@ public class JspCompilationContext {
// jspURI _must_ be relative to the context
public JspCompilationContext(String jspUri,
- boolean isErrPage,
Options options,
ServletContext context,
JspServletWrapper jsw,
JspRuntimeContext rctxt) {
this.jspUri = canonicalURI(jspUri);
-this.isErrPage = isErrPage;
this.options = options;
this.jsw = jsw;
this.context = context;
@@ -132,7 +129,7 @@ public class JspCompilationContext {
JspServletWrapper jsw,
JspRuntimeContext rctxt,
JarResource tagJarResource) {
-this(tagfile, false, options, context, jsw, rctxt);
+this(tagfile, options, context, jsw, rctxt);
this.isTagFile = true;
this.tagInfo = tagInfo;
this.tagJarResource = tagJarResource;
@@ -385,18 +382,6 @@ public class JspCompilationContext {
return jspUri;
}
-/**
- * Are we processing something that has been declared as an
- * errorpage?
- */
-public boolean isErrorPage() {
-return isErrPage;
-}
-
-public void setErrorPage(boolean isErrPage) {
-this.isErrPage = isErrPage;
-}
-
public boolean isTagFile() {
return isTagFile;
}
Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java?rev=1124719&r1=1124718&r2=1124719&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java (original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java Thu May 19
12:45:49 2011
@@ -129,12 +129,12 @@ public class JspServlet extends HttpServ
AccessController.doPrivileged(new
PrivilegedExceptionAction(){
@Override
public Object run() throws IOException,
ServletException {
-serviceJspFile(null, null, jspFile, null, true);
+serviceJspFile(null, null, jspFile, true);
return null;
}
});
} else {
-serviceJspFile(null, null, jspFile, null, true);
+serviceJspFile(null, null, jspFile, true);
}
} catch (IOException e) {
throw new ServletException("Could not precompile jsp: " +
jspFile, e);
@@ -330,7 +330,7 @@ public class JspServlet extends HttpServ
try {
boolean precompile = preCompile(request);
-serviceJspFile(request, response, jspUri, null, precompile);
+servi
svn commit: r1124757 - /tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
Author: markt
Date: Thu May 19 13:33:12 2011
New Revision: 1124757
URL: http://svn.apache.org/viewvc?rev=1124757&view=rev
Log:
Fix copy/paste error
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Generator.java?rev=1124757&r1=1124756&r2=1124757&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/Generator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Generator.java Thu May 19
13:33:12 2011
@@ -78,7 +78,7 @@ class Generator {
private static final String VAR_INSTANCEMANAGER =
System.getProperty("org.apache.jasper.compiler.Generator.VAR_INSTANCEMANAGER",
"_jsp_instancemanager");
private static final boolean POOL_TAGS_WITH_EXTENDS =
-
Boolean.getBoolean("org.apache.jasper.compiler.Generator.VAR_EXPRESSIONFACTORY");
+
Boolean.getBoolean("org.apache.jasper.compiler.Generator.POOL_TAGS_WITH_EXTENDS");
/* System property that controls if the requirement to have the object
* used in jsp:getProperty action to be previously "introduced"
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1124765 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Thu May 19 13:36:55 2011 New Revision: 1124765 URL: http://svn.apache.org/viewvc?rev=1124765&view=rev Log: Update proposal Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1124765&r1=1124764&r2=1124765&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu May 19 13:36:55 2011 @@ -183,5 +183,6 @@ PATCHES PROPOSED TO BACKPORT: class. Based on a patch by Dan Mikusa. http://svn.apache.org/viewvc?rev=1124680&view=rev + http://svn.apache.org/viewvc?rev=1124757&view=rev (fixes copy/paste error) +1: markt -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "PoweredBy" by KrzysztofGil
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change
notification.
The "PoweredBy" page has been changed by KrzysztofGil.
http://wiki.apache.org/tomcat/PoweredBy?action=diff&rev1=333&rev2=334
--
[[http://www.ubiquityhosting.com|{{http://www.ubiquityservers.com/images/header_02.jpg|http://www.ubiquityhosting.com}}]]
[[http://www.ubiquityhosting.com|Ubiquity Linux Hosting]] - Ubiquity uses
Tomcat to power numerous sites subscribing to their
[[http://www.ubiquityhosting.com/web-hosting/linux.html|Linux hosting]], as
well as parts of their own site.
=== UKi6.com - Tomcat Hosting ===
- [[http://www.uki6.com|UKi6 - Java / Tomcat Hosting]], Private Tomcat
instances, versions 5.5 and 6.0 supported. Linux CentOS 5.x 64bit servers,
minimum 2 x Quad Core CPUs and 12+ GB RAM. 1 month Trial packages!
+ [[http://www.uki6.com|UKi6 - Java / Tomcat Hosting]], Dedicated JAVA / Tomcat
hosting company. Private Tomcat instances, versions 5.5 / 6.0 / 7.0 supported,
Linux CentOS 5.x 64bit servers, minimum 2 x Quad Core CPUs and 12-24 GB RAM.
extra 128 MB heap size for $3. Tomcat supported with all plans, including VPS
Hosting. [[http://www.uki6.com/java-hosting-Private-Tomcat-Hosting|Private
Tomcat]] Lite $9.50/pm. 1 month Trial available!
=== Webhost.uk.net ===
{{http://www.webhost.uk.net/banners/webhost160_120.png|http://www.webhost.uk.net/banners/webhost160_120.png|class="external_image
fkromjtocnoxhitqgdwz fkromjtocnoxhitqgdwz"}} "UK Web Hosting"
[[http://www.webhost.uk.net/|WebHostUK LTD]] - Proud to be Apache Tomcat UK Web
Hosting provider.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1124986 - in /tomcat/trunk/java/org/apache/jasper: JspCompilationContext.java compiler/Compiler.java resources/LocalStrings.properties
Author: markt
Date: Thu May 19 16:25:45 2011
New Revision: 1124986
URL: http://svn.apache.org/viewvc?rev=1124986&view=rev
Log:
Refactoring in preparation for a fix for BZ 33453
Modified:
tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java?rev=1124986&r1=1124985&r2=1124986&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java Thu May 19
16:25:45 2011
@@ -19,9 +19,12 @@ package org.apache.jasper;
import java.io.File;
import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.net.JarURLConnection;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
+import java.net.URLConnection;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
@@ -382,6 +385,43 @@ public class JspCompilationContext {
return jspUri;
}
+public long getJspLastModified() {
+long result = -1;
+URLConnection uc = null;
+try {
+URL jspUrl = getResource(getJspFile());
+if (jspUrl == null) {
+incrementRemoved();
+return result;
+}
+uc = jspUrl.openConnection();
+if (uc instanceof JarURLConnection) {
+result = ((JarURLConnection) uc).getJarEntry().getTime();
+} else {
+result = uc.getLastModified();
+}
+} catch (IOException e) {
+if (log.isDebugEnabled()) {
+log.debug(Localizer.getMessage(
+"jsp.error.lastModified", getJspFile()), e);
+}
+result = -1;
+} finally {
+if (uc != null) {
+try {
+uc.getInputStream().close();
+} catch (IOException e) {
+if (log.isDebugEnabled()) {
+log.debug(Localizer.getMessage(
+"jsp.error.lastModified", getJspFile()), e);
+}
+result = -1;
+}
+}
+}
+return result;
+}
+
public boolean isTagFile() {
return isTagFile;
}
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java?rev=1124986&r1=1124985&r2=1124986&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java Thu May 19
16:25:45 2011
@@ -429,8 +429,6 @@ public abstract class Compiler {
*/
public boolean isOutDated(boolean checkClass) {
-String jsp = ctxt.getJspFile();
-
if (jsw != null
&& (ctxt.getOptions().getModificationTestInterval() > 0)) {
@@ -442,24 +440,9 @@ public abstract class Compiler {
jsw.setLastModificationTest(System.currentTimeMillis());
}
-long jspRealLastModified = 0;
-try {
-URL jspUrl = ctxt.getResource(jsp);
-if (jspUrl == null) {
-ctxt.incrementRemoved();
-return true;
-}
-URLConnection uc = jspUrl.openConnection();
-if (uc instanceof JarURLConnection) {
-jspRealLastModified =
-((JarURLConnection) uc).getJarEntry().getTime();
-} else {
-jspRealLastModified = uc.getLastModified();
-}
-uc.getInputStream().close();
-} catch (Exception e) {
-if (log.isDebugEnabled())
-log.debug("Problem accessing resource. Treat as outdated.", e);
+long jspRealLastModified = ctxt.getJspLastModified();
+if (jspRealLastModified < 0) {
+// Something went wrong - assume modification
return true;
}
Modified: tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=1124986&r1=1124985&r2=1124986&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties Thu
May 19 16:25:45 2011
@@ -454,6 +454,7 @@ jsp.error.nested_jsproot=Nested
svn commit: r1124987 - in /tomcat/trunk: java/org/apache/jasper/compiler/Generator.java webapps/docs/changelog.xml
Author: markt
Date: Thu May 19 16:27:42 2011
New Revision: 1124987
URL: http://svn.apache.org/viewvc?rev=1124987&view=rev
Log:
More prep for BZ 33453. Include a comment header in generated Java files
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Generator.java?rev=1124987&r1=1124986&r2=1124987&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/Generator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Generator.java Thu May 19
16:27:42 2011
@@ -23,15 +23,19 @@ import java.beans.Introspector;
import java.beans.PropertyDescriptor;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
+import java.util.Date;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Hashtable;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import java.util.TimeZone;
import java.util.Vector;
import javax.el.MethodExpression;
@@ -116,6 +120,8 @@ class Generator {
private Vector tagHandlerPoolNames;
private GenBuffer charArrayBuffer;
+
+private DateFormat timestampFormat;
/**
* @param s
@@ -3436,6 +3442,8 @@ class Generator {
if (isPoolingEnabled) {
tagHandlerPoolNames = new Vector();
}
+timestampFormat = new SimpleDateFormat("-MM-dd HH:mm:ss");
+timestampFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
}
/**
@@ -3456,6 +3464,7 @@ class Generator {
if (gen.isPoolingEnabled) {
gen.compileTagHandlerPoolList(page);
}
+gen.generateCommentHeader();
if (gen.ctxt.isTagFile()) {
JasperTagInfo tagInfo = (JasperTagInfo) gen.ctxt.getTagInfo();
gen.generateTagHandlerPreamble(tagInfo, page);
@@ -3479,6 +3488,15 @@ class Generator {
}
}
+private void generateCommentHeader() {
+out.println("/*");
+out.println(" * Generated by the Jasper component of Apache Tomcat");
+out.println(" * Version: " + ctxt.getServletContext().getServerInfo());
+out.println(" * Generated at: " + timestampFormat.format(new Date()) +
+" UTC");
+out.println(" */");
+}
+
/*
* Generates tag handler preamble.
*/
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1124987&r1=1124986&r2=1124987&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu May 19 16:27:42 2011
@@ -68,6 +68,10 @@
51220: Add a system property to enable tag pooling with JSPs
that use a custom base class. Based on a patch by Dan Mikusa. (markt)
+
+Include a comment header in generated java files that indicates when
the
+file was generated and which version of Tomcat generated it. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51195] "Find leaks" reports a false positive memory/classloader leak
https://issues.apache.org/bugzilla/show_bug.cgi?id=51195
--- Comment #4 from Joern Huxhorn 2011-05-19 17:19:01
UTC ---
Created attachment 27038
--> https://issues.apache.org/bugzilla/attachment.cgi?id=27038
Implements the suggested change in StandardHost
This patch against trunk implements the suggested changes.
The code is purely my own work, apply any license you like.
Unfortunately, I was unable to perform an "ant release" build due to unrelated
issues so I couldn't test this myself.
I got the following build error:
compile-non-log4j:
[javac]
[snip]/tomcat-trunk/output/extras/logging/commons-logging-1.1.1-src/build2.xml:359:
warning: 'includeantruntime' was not set, defaulting to
build.sysclasspath=last; set to false for repeatable builds
[javac] Compiling 11 source files to
[snip]/tomcat-trunk/output/extras/logging/commons-logging-1.1.1-src/target/classes
[javac]
[snip]/tomcat-trunk/output/extras/logging/commons-logging-1.1.1-src/src/java/org/apache/juli/logging/impl/ServletContextCleaner.java:24:
package javax.servlet does not exist
[javac] import javax.servlet.ServletContextEvent;
[javac] ^
[javac]
[snip]/tomcat-trunk/output/extras/logging/commons-logging-1.1.1-src/src/java/org/apache/juli/logging/impl/ServletContextCleaner.java:25:
package javax.servlet does not exist
[javac] import javax.servlet.ServletContextListener;
[javac] ^
[javac]
[snip]/tomcat-trunk/output/extras/logging/commons-logging-1.1.1-src/src/java/org/apache/juli/logging/impl/ServletContextCleaner.java:52:
cannot find symbol
[javac] symbol: class ServletContextListener
[javac] public class ServletContextCleaner implements
ServletContextListener {
[javac] ^
[javac]
[snip]/tomcat-trunk/output/extras/logging/commons-logging-1.1.1-src/src/java/org/apache/juli/logging/impl/ServletContextCleaner.java:61:
cannot find symbol
[javac] symbol : class ServletContextEvent
[javac] location: class org.apache.juli.logging.impl.ServletContextCleaner
[javac] public void contextDestroyed(ServletContextEvent sce) {
[javac] ^
[javac]
[snip]/tomcat-trunk/output/extras/logging/commons-logging-1.1.1-src/src/java/org/apache/juli/logging/impl/ServletContextCleaner.java:135:
cannot find symbol
[javac] symbol : class ServletContextEvent
[javac] location: class org.apache.juli.logging.impl.ServletContextCleaner
[javac] public void contextInitialized(ServletContextEvent sce) {
[javac]^
[javac] 5 errors
BUILD FAILED
--
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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
