[Bug 54483] New: error in translation
https://issues.apache.org/bugzilla/show_bug.cgi?id=54483 Bug ID: 54483 Summary: error in translation Product: Tomcat 7 Version: 7.0.35 Hardware: PC Status: NEW Severity: trivial Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: adinam...@gmail.com Classification: Unclassified in the file LocalStrings_es.properties under org/apache/catalina/core, the property standardContext.reloadingCompleted has the value "Se ha completado la Regarga de este Contexto". It should be "Se ha completado la recarga de este contexto". regarga != recarga greetings. -- 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: r1438399 - in /tomcat/native/branches/1.1.x/native: include/tcn_version.h os/win32/libtcnative.rc
Author: jfclere Date: Fri Jan 25 09:17:41 2013 New Revision: 1438399 URL: http://svn.apache.org/viewvc?rev=1438399&view=rev Log: Prepare for release. Modified: tomcat/native/branches/1.1.x/native/include/tcn_version.h tomcat/native/branches/1.1.x/native/os/win32/libtcnative.rc Modified: tomcat/native/branches/1.1.x/native/include/tcn_version.h URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/include/tcn_version.h?rev=1438399&r1=1438398&r2=1438399&view=diff == --- tomcat/native/branches/1.1.x/native/include/tcn_version.h (original) +++ tomcat/native/branches/1.1.x/native/include/tcn_version.h Fri Jan 25 09:17:41 2013 @@ -69,13 +69,13 @@ extern "C" { #define TCN_MINOR_VERSION 1 /** patch level */ -#define TCN_PATCH_VERSION 25 +#define TCN_PATCH_VERSION 26 /** * This symbol is defined for internal, "development" copies of TCN. This * symbol will be #undef'd for releases. */ -#define TCN_IS_DEV_VERSION 1 +#define TCN_IS_DEV_VERSION 0 /** The formatted string of APU's version */ Modified: tomcat/native/branches/1.1.x/native/os/win32/libtcnative.rc URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/os/win32/libtcnative.rc?rev=1438399&r1=1438398&r2=1438399&view=diff == --- tomcat/native/branches/1.1.x/native/os/win32/libtcnative.rc (original) +++ tomcat/native/branches/1.1.x/native/os/win32/libtcnative.rc Fri Jan 25 09:17:41 2013 @@ -20,7 +20,7 @@ LANGUAGE 0x9,0x1 "See the License for the specific language governing " \ "permissions and limitations under the License." -#define TCN_VERSION "1.1.25" +#define TCN_VERSION "1.1.26" 1000 ICON "apache.ico" 1001 DIALOGEX 0, 0, 252, 51 @@ -36,8 +36,8 @@ BEGIN END 1 VERSIONINFO - FILEVERSION 1,1,25,0 - PRODUCTVERSION 1,1,25,0 + FILEVERSION 1,1,26,0 + PRODUCTVERSION 1,1,26,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1438411 - /tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
Author: markt Date: Fri Jan 25 10:09:05 2013 New Revision: 1438411 URL: http://svn.apache.org/viewvc?rev=1438411&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54483 Fix translation s/recycling/reloading/ Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties?rev=1438411&r1=1438410&r2=1438411&view=diff == --- tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties (original) +++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties Fri Jan 25 10:09:05 2013 @@ -102,7 +102,7 @@ standardContext.notWrapper = El Hijo de standardContext.parameter.duplicate = Duplicado par\u00E1metro de inicializaci\u00F3n de contexto [{0}] standardContext.parameter.required = Es necesario poner nombre de par\u00E1metro y valor de par\u00E1metro standardContext.pathInvalid = Una ruta de contexto debe de ser o una cadena vac\u00EDa o comenzar con "/". La ruta [{0}] no cumple con estos criterios y ha sido cambiada por [{1}] -standardContext.reloadingCompleted = Se ha completado la Regarga de este Contexto +standardContext.reloadingCompleted = Se ha completado la recarga de este Contexto standardContext.reloadingStarted = Ha comenzado la recarga de Contexto [{0}] standardContext.resourcesStart = Error arrancando Recursos est\u00E1ticos standardContext.securityConstraint.mixHttpMethod = No est\u00E1 permitido mezclar y ien la misma colecci\u00F3n de recursos web - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1438415 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/LocalStrings_es.properties webapps/docs/changelog.xml
Author: markt Date: Fri Jan 25 10:13:43 2013 New Revision: 1438415 URL: http://svn.apache.org/viewvc?rev=1438415&view=rev Log: Fix translation s/recycling/reloading/ Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1438411 Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties?rev=1438415&r1=1438414&r2=1438415&view=diff == --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties Fri Jan 25 10:13:43 2013 @@ -132,7 +132,7 @@ standardContext.notWrapper = El Hijo de standardContext.parameter.duplicate = Duplicado par\u00E1metro de inicializaci\u00F3n de contexto [{0}] standardContext.parameter.required = Es necesario poner nombre de par\u00E1metro y valor de par\u00E1metro standardContext.pathInvalid = Una ruta de contexto debe de ser o una cadena vac\u00EDa o comenzar con "/". La ruta [{0}] no cumple con estos criterios y ha sido cambiada por [{1}] -standardContext.reloadingCompleted = Se ha completado la Regarga de este Contexto +standardContext.reloadingCompleted = Se ha completado la recarga de este Contexto standardContext.reloadingFailed = Fall\u00F3 la recarga de este Contexto debido a errores previos standardContext.reloadingStarted = Ha comenzado la recarga de Contexto [{0}] standardContext.resourcesStart = Error arrancando Recursos est\u00E1ticos 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=1438415&r1=1438414&r2=1438415&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Jan 25 10:13:43 2013 @@ -75,6 +75,10 @@ 54458: Include exception when logging errors in the DataSourceRealm. Patch provided by Violeta Georgieva. (markt) + +54483: Correct one of the Spanish translations. Based on a +suggestion from adinamita. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54483] error in translation
https://issues.apache.org/bugzilla/show_bug.cgi?id=54483 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED OS||All --- Comment #1 from Mark Thomas --- Thanks for the report and the suggested change. This has been fixed in trunk and 7.0.x and will be included in 7.0.36 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 54483] error in translation
https://issues.apache.org/bugzilla/show_bug.cgi?id=54483 --- Comment #2 from adinam...@gmail.com --- you're welcome!! it's no big deal but it was bugging me everytime the context was reloaded :P -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project taglibs-parent (in module tomcat-taglibs) failed
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 taglibs-parent has an issue affecting its community integration. This issue affects 2 projects, and has been outstanding for 5 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - taglibs-parent : Taglib Parent POM - taglibs-standard-spec : JSP Taglibs Full details are available at: http://vmgump.apache.org/gump/public/tomcat-taglibs/taglibs-parent/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Sole pom output [pom.xml] identifier set to project name -INFO- Optional dependency doxia-site-renderer prerequisite failed with reason build failed -DEBUG- (Apache Gump generated) Apache Maven Settings in: /srv/gump/public/workspace/tomcat-taglibs/taglibs-parent/gump_mvn_settings.xml -INFO- Failed with reason build failed -DEBUG- Maven POM in: /srv/gump/public/workspace/tomcat-taglibs/taglibs-parent/pom.xml -DEBUG- Extracted fallback artifacts from Gump Repository The following work was performed: http://vmgump.apache.org/gump/public/tomcat-taglibs/taglibs-parent/gump_work/build_tomcat-taglibs_taglibs-parent.html Work Name: build_tomcat-taglibs_taglibs-parent (Type: Build) Work ended in a state of : Failed Elapsed: 5 secs Command Line: /opt/maven2/bin/mvn --batch-mode --settings /srv/gump/public/workspace/tomcat-taglibs/taglibs-parent/gump_mvn_settings.xml install [Working Directory: /srv/gump/public/workspace/tomcat-taglibs/taglibs-parent] M2_HOME: /opt/maven2 - [INFO]task-segment: [install] [INFO] Downloading: http://localhost:8192/maven2/org/apache/velocity/velocity/1.6.4/velocity-1.6.4.pom [WARNING] Unable to get resource 'org.apache.velocity:velocity:pom:1.6.4' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection refused Downloading: http://localhost:8192/maven2/org/apache/velocity/velocity/1.6.4/velocity-1.6.4.pom [WARNING] Unable to get resource 'org.apache.velocity:velocity:pom:1.6.4' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection refused Downloading: http://localhost:8192/maven2/org/apache/velocity/velocity/1.6.4/velocity-1.6.4.jar [WARNING] Unable to get resource 'org.apache.velocity:velocity:jar:1.6.4' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection refused Downloading: http://localhost:8192/maven2/org/apache/velocity/velocity/1.6.4/velocity-1.6.4.jar [WARNING] Unable to get resource 'org.apache.velocity:velocity:jar:1.6.4' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection refused [INFO] [ERROR] BUILD ERROR [INFO] [INFO] Failed to resolve artifact. Missing: -- 1) org.apache.velocity:velocity:jar:1.6.4 Try downloading the file manually from the project website. Then, install it using the command: mvn install:install-file -DgroupId=org.apache.velocity -DartifactId=velocity -Dversion=1.6.4 -Dpackaging=jar -Dfile=/path/to/file Alternatively, if you host your own repository you can deploy the file there: mvn deploy:deploy-file -DgroupId=org.apache.velocity -DartifactId=velocity -Dversion=1.6.4 -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id] Path to dependency: 1) org.apache.maven.plugins:maven-remote-resources-plugin:maven-plugin:1.2.1 2) org.apache.velocity:velocity:jar:1.6.4 -- 1 required artifact is missing. for artifact: org.apache.maven.plugins:maven-remote-resources-plugin:maven-plugin:1.2.1 from the specified remote repositories: gump-central (http://localhost:8192/maven2), gump-apache.snapshots (http://localhost:8192/repo/m2-snapshot-repository) [INFO] [INFO] For more information, run Maven with the -e switch [INFO] [INFO] Total time: 4 seconds [INFO] Finished at: Fri Jan 25 11:45:36 UTC 2013 [INFO] Final Memory: 13M/33M [INFO] - To subscribe to this information via syndicated feeds: - RSS: http://vmgump.apache.org/gump/public/tomcat-taglibs/taglibs-parent/rss.xml - Atom: http://vmgump.apache.org/gump/public/tomcat-taglibs/taglibs-parent/a
[Bug 53869] Performance tuning solution to resolve too many cascaded JspContextWrapper issue
https://issues.apache.org/bugzilla/show_bug.cgi?id=53869 --- Comment #11 from Mark Thomas --- The test case used to evaluate this patch is flawed. It fails to take account of the call to rootJspCtxt.getELContext() and does not compare the performance of the new implementation for a simple JSP page that does not use EL and does not have nested tags. When these additional issues are taken into consideration the proposed patch significantly impacts performance for these simple pages. Performance (as measured by this test case) is 1.5 to 2 times slower for simple pages. However, it is not all doom and gloom. A small tweak to the proposed patch to use lazy instantiation for the EL context and performance is (as near as makes no difference) back to where it was for simple pages and still noticeably improved for the more complex case. -- 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: r1438463 - /tomcat/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java
Author: markt Date: Fri Jan 25 12:06:04 2013 New Revision: 1438463 URL: http://svn.apache.org/viewvc?rev=1438463&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53869 Performance improvement for pages with lots of heavily nested tags. Retain a reference to the root JSP context rather than traversing the hierarchy on every call. Based on a patch suggested by Sheldon Shao. Modified: tomcat/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java Modified: tomcat/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java?rev=1438463&r1=1438462&r2=1438463&view=diff == --- tomcat/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java (original) +++ tomcat/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java Fri Jan 25 12:06:04 2013 @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.jasper.runtime; import java.io.IOException; @@ -78,10 +77,22 @@ public class JspContextWrapper extends P private final HashMap originalNestedVars; +private ServletContext servletContext = null; + +private ELContext elContext = null; + +private PageContext rootJspCtxt; + public JspContextWrapper(JspContext jspContext, ArrayList nestedVars, ArrayList atBeginVars, ArrayList atEndVars, Map aliases) { this.invokingJspCtxt = (PageContext) jspContext; +if (jspContext instanceof JspContextWrapper) { +rootJspCtxt = ((JspContextWrapper)jspContext).rootJspCtxt; +} +else { +rootJspCtxt = invokingJspCtxt; +} this.nestedVars = nestedVars; this.atBeginVars = atBeginVars; this.atEndVars = atEndVars; @@ -126,7 +137,7 @@ public class JspContextWrapper extends P return pageAttributes.get(name); } -return invokingJspCtxt.getAttribute(name, scope); +return rootJspCtxt.getAttribute(name, scope); } @Override @@ -159,7 +170,7 @@ public class JspContextWrapper extends P removeAttribute(name, PAGE_SCOPE); } } else { -invokingJspCtxt.setAttribute(name, value, scope); +rootJspCtxt.setAttribute(name, value, scope); } } @@ -173,13 +184,13 @@ public class JspContextWrapper extends P Object o = pageAttributes.get(name); if (o == null) { -o = invokingJspCtxt.getAttribute(name, REQUEST_SCOPE); +o = rootJspCtxt.getAttribute(name, REQUEST_SCOPE); if (o == null) { if (getSession() != null) { -o = invokingJspCtxt.getAttribute(name, SESSION_SCOPE); +o = rootJspCtxt.getAttribute(name, SESSION_SCOPE); } if (o == null) { -o = invokingJspCtxt.getAttribute(name, APPLICATION_SCOPE); +o = rootJspCtxt.getAttribute(name, APPLICATION_SCOPE); } } } @@ -196,11 +207,11 @@ public class JspContextWrapper extends P } pageAttributes.remove(name); -invokingJspCtxt.removeAttribute(name, REQUEST_SCOPE); +rootJspCtxt.removeAttribute(name, REQUEST_SCOPE); if (getSession() != null) { -invokingJspCtxt.removeAttribute(name, SESSION_SCOPE); +rootJspCtxt.removeAttribute(name, SESSION_SCOPE); } -invokingJspCtxt.removeAttribute(name, APPLICATION_SCOPE); +rootJspCtxt.removeAttribute(name, APPLICATION_SCOPE); } @Override @@ -214,7 +225,7 @@ public class JspContextWrapper extends P if (scope == PAGE_SCOPE) { pageAttributes.remove(name); } else { -invokingJspCtxt.removeAttribute(name, scope); +rootJspCtxt.removeAttribute(name, scope); } } @@ -229,7 +240,7 @@ public class JspContextWrapper extends P if (pageAttributes.get(name) != null) { return PAGE_SCOPE; } else { -return invokingJspCtxt.getAttributesScope(name); +return rootJspCtxt.getAttributesScope(name); } } @@ -239,7 +250,7 @@ public class JspContextWrapper extends P return Collections.enumeration(pageAttributes.keySet()); } -return invokingJspCtxt.getAttributeNamesInScope(scope); +return rootJspCtxt.getAttributeNamesInScope(scope); } @Override @@ -249,12 +260,12 @@ public class JspContextWrapper extends P @Override public JspWriter getOut() { -return invokingJspCtxt.getOut(); +return rootJspCtxt.getOut(); } @Override public HttpSession getSession() { -return invokingJspCtxt.getSession(
svn commit: r1438464 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/jasper/runtime/JspContextWrapper.java webapps/docs/changelog.xml
Author: markt Date: Fri Jan 25 12:08:23 2013 New Revision: 1438464 URL: http://svn.apache.org/viewvc?rev=1438464&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53869 Performance improvement for pages with lots of heavily nested tags. Retain a reference to the root JSP context rather than traversing the hierarchy on every call. Based on a patch suggested by Sheldon Shao. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1438463 Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java?rev=1438464&r1=1438463&r2=1438464&view=diff == --- tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java Fri Jan 25 12:08:23 2013 @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.jasper.runtime; import java.io.IOException; @@ -77,10 +76,22 @@ public class JspContextWrapper extends P private HashMap originalNestedVars; +private ServletContext servletContext = null; + +private ELContext elContext = null; + +private PageContext rootJspCtxt; + public JspContextWrapper(JspContext jspContext, ArrayList nestedVars, ArrayList atBeginVars, ArrayList atEndVars, Map aliases) { this.invokingJspCtxt = (PageContext) jspContext; +if (jspContext instanceof JspContextWrapper) { +rootJspCtxt = ((JspContextWrapper)jspContext).rootJspCtxt; +} +else { +rootJspCtxt = invokingJspCtxt; +} this.nestedVars = nestedVars; this.atBeginVars = atBeginVars; this.atEndVars = atEndVars; @@ -123,7 +134,7 @@ public class JspContextWrapper extends P return pageAttributes.get(name); } -return invokingJspCtxt.getAttribute(name, scope); +return rootJspCtxt.getAttribute(name, scope); } @Override @@ -156,7 +167,7 @@ public class JspContextWrapper extends P removeAttribute(name, PAGE_SCOPE); } } else { -invokingJspCtxt.setAttribute(name, value, scope); +rootJspCtxt.setAttribute(name, value, scope); } } @@ -170,13 +181,13 @@ public class JspContextWrapper extends P Object o = pageAttributes.get(name); if (o == null) { -o = invokingJspCtxt.getAttribute(name, REQUEST_SCOPE); +o = rootJspCtxt.getAttribute(name, REQUEST_SCOPE); if (o == null) { if (getSession() != null) { -o = invokingJspCtxt.getAttribute(name, SESSION_SCOPE); +o = rootJspCtxt.getAttribute(name, SESSION_SCOPE); } if (o == null) { -o = invokingJspCtxt.getAttribute(name, APPLICATION_SCOPE); +o = rootJspCtxt.getAttribute(name, APPLICATION_SCOPE); } } } @@ -193,11 +204,11 @@ public class JspContextWrapper extends P } pageAttributes.remove(name); -invokingJspCtxt.removeAttribute(name, REQUEST_SCOPE); +rootJspCtxt.removeAttribute(name, REQUEST_SCOPE); if (getSession() != null) { -invokingJspCtxt.removeAttribute(name, SESSION_SCOPE); +rootJspCtxt.removeAttribute(name, SESSION_SCOPE); } -invokingJspCtxt.removeAttribute(name, APPLICATION_SCOPE); +rootJspCtxt.removeAttribute(name, APPLICATION_SCOPE); } @Override @@ -211,7 +222,7 @@ public class JspContextWrapper extends P if (scope == PAGE_SCOPE) { pageAttributes.remove(name); } else { -invokingJspCtxt.removeAttribute(name, scope); +rootJspCtxt.removeAttribute(name, scope); } } @@ -226,7 +237,7 @@ public class JspContextWrapper extends P if (pageAttributes.get(name) != null) { return PAGE_SCOPE; } else { -return invokingJspCtxt.getAttributesScope(name); +return rootJspCtxt.getAttributesScope(name); } } @@ -236,7 +247,7 @@ public class JspContextWrapper extends P return Collections.enumeration(pageAttributes.keySet()); } -return invokingJspCtxt.getAttributeNamesInScope(scope); +return rootJspCtxt.getAttributeNamesInScope(scope); } @Override @@ -246,12 +257,12 @@
[Bug 53869] Performance tuning solution to resolve too many cascaded JspContextWrapper issue
https://issues.apache.org/bugzilla/show_bug.cgi?id=53869 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #12 from Mark Thomas --- The modified patch has been applied to trunk and will be included in 7.0.36 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: r1438466 - in /tomcat/trunk/java/org/apache/tomcat/websocket: LocalStrings.properties WsRemoteEndpointBase.java
Author: markt Date: Fri Jan 25 12:20:08 2013 New Revision: 1438466 URL: http://svn.apache.org/viewvc?rev=1438466&view=rev Log: Fix an i18n TODO Modified: tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java Modified: tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties?rev=1438466&r1=1438465&r2=1438466&view=diff == --- tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties (original) +++ tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties Fri Jan 25 12:20:08 2013 @@ -13,6 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +messageSendStateMachine.changeType=When sending a fragmented message, all fragments bust be of the same type messageSendStateMachine.closed=Message will not be sent because the WebSocket session has been closed messageSendStateMachine.inProgress=Message will not be sent because the WebSocket session is currently sending another message Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java?rev=1438466&r1=1438465&r2=1438466&view=diff == --- tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java (original) +++ tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java Fri Jan 25 12:20:08 2013 @@ -457,8 +457,8 @@ public abstract class WsRemoteEndpointBa if (fragmented) { // Currently fragmented if (text != isText) { -// TODO i18n -throw new IllegalStateException(); +throw new IllegalStateException( + sm.getString("messageSendStateMachine.changeType")); } nextText = text; nextFragmented = !isLast; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1438471 - in /tomcat/trunk/java: javax/websocket/Session.java org/apache/tomcat/websocket/WsSession.java org/apache/tomcat/websocket/WsWebSocketContainer.java org/apache/tomcat/websocket/
Author: markt Date: Fri Jan 25 12:36:33 2013 New Revision: 1438471 URL: http://svn.apache.org/viewvc?rev=1438471&view=rev Log: Implement Session#getContainer() for client and server Modified: tomcat/trunk/java/javax/websocket/Session.java tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java tomcat/trunk/java/org/apache/tomcat/websocket/server/WsProtocolHandler.java Modified: tomcat/trunk/java/javax/websocket/Session.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/websocket/Session.java?rev=1438471&r1=1438470&r2=1438471&view=diff == --- tomcat/trunk/java/javax/websocket/Session.java (original) +++ tomcat/trunk/java/javax/websocket/Session.java Fri Jan 25 12:36:33 2013 @@ -25,6 +25,9 @@ import java.util.Set; public interface Session { +/** + * Returns the container that created this session. + */ WebSocketContainer getContainer(); void addMessageHandler(MessageHandler listener) 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=1438471&r1=1438470&r2=1438471&view=diff == --- tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java (original) +++ tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java Fri Jan 25 12:36:33 2013 @@ -46,6 +46,7 @@ public class WsSession implements Sessio private final Endpoint localEndpoint; private final WsRemoteEndpointBase wsRemoteEndpoint; private final ClassLoader applicationClassLoader; +private final WebSocketContainer webSocketContainer; private MessageHandler textMessageHandler = null; private MessageHandler binaryMessageHandler = null; @@ -65,17 +66,18 @@ public class WsSession implements Sessio * @param wsRemoteEndpoint */ public WsSession(Endpoint localEndpoint, -WsRemoteEndpointBase wsRemoteEndpoint) { +WsRemoteEndpointBase wsRemoteEndpoint, +WebSocketContainer webSocketContainer) { this.localEndpoint = localEndpoint; this.wsRemoteEndpoint = wsRemoteEndpoint; +this.webSocketContainer = webSocketContainer; applicationClassLoader = Thread.currentThread().getContextClassLoader(); } @Override public WebSocketContainer getContainer() { -// TODO Auto-generated method stub -return null; +return webSocketContainer; } Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java?rev=1438471&r1=1438470&r2=1438471&view=diff == --- tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java (original) +++ tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Fri Jan 25 12:36:33 2013 @@ -145,7 +145,8 @@ public class WsWebSocketContainer implem "wsWebSocketContainer.endpointCreateFail", clazz.getName()), e); } -WsSession wsSession = new WsSession(endpoint, wsRemoteEndpointClient); +WsSession wsSession = +new WsSession(endpoint, wsRemoteEndpointClient, this); endpoint.onOpen(wsSession, clientEndpointConfiguration); Modified: tomcat/trunk/java/org/apache/tomcat/websocket/server/WsProtocolHandler.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsProtocolHandler.java?rev=1438471&r1=1438470&r2=1438471&view=diff == --- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsProtocolHandler.java (original) +++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsProtocolHandler.java Fri Jan 25 12:36:33 2013 @@ -50,8 +50,7 @@ public class WsProtocolHandler implement private final Endpoint ep; private final EndpointConfiguration endpointConfig; private final ClassLoader applicationClassLoader; -private final int binaryBufferSize; -private final int textBufferSize; +private final WebSocketContainer webSocketContainer; private WsSession wsSession; @@ -61,9 +60,8 @@ public class WsProtocolHandler implement WebSocketContainer wsc) { this.ep = ep; this.endpointConfig = endpointConfig; +this.webSocketContainer = wsc; applicationClassLoader = Thread.currentThread().getContextClassLoader(); -binaryBufferSize = (int) wsc.getMaxBinaryMessageBufferSize(); -textBufferSize = (int) wsc.getMaxTextMessageBufferSize(); } @@ -87,9 +85,13 @@ public class WsProtoc
svn commit: r1438484 - in /tomcat/trunk/java/org/apache/tomcat/websocket: LocalStrings.properties WsSession.java
Author: markt Date: Fri Jan 25 13:00:51 2013 New Revision: 1438484 URL: http://svn.apache.org/viewvc?rev=1438484&view=rev Log: Fix a handful of i18n TODOs Modified: tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java Modified: tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties?rev=1438484&r1=1438483&r2=1438484&view=diff == --- tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties (original) +++ tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties Fri Jan 25 13:00:51 2013 @@ -37,6 +37,13 @@ wsFrame.wrongRsv=The client frame set th wsRemoteEndpoint.concurrentMessageSend=Messages may not be send concurrently even when using the asynchronous send messages. The client must wait for the previous message to complete before sending the next. +wsSession.duplicateHandlerBinary=A binary message handler has already been configured +wsSession.duplicateHandlerPong=A pong message handler has already been configured +wsSession.duplicateHandlerText=A text message handler has already been configured +wsSession.invalidHandlerTypePong=A pong message handler must implement MessageHandler.Basic +wsSession.removeHandlerFailed=Unable to remove the handler [{0}] as it was not registered with this session +wsSession.unknownHandler=Unable to add the message handler [{0}] as it was for the unrecognised type [{1}] + wsWebSocketContainer.invalidStatus=The HTTP response from the server [{0}] did not permit the HTTP upgrade to WebSocket wsWebSocketContainer.maxBuffer=This implementation limits the maximum size of a buffer to Integer.MAX_VALUE wsWebSocketContainer.pathNoHost=No host was specified in URI 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=1438484&r1=1438483&r2=1438484&view=diff == --- tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java (original) +++ tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java Fri Jan 25 13:00:51 2013 @@ -39,9 +39,13 @@ import javax.websocket.RemoteEndpoint; import javax.websocket.Session; import javax.websocket.WebSocketContainer; +import org.apache.tomcat.util.res.StringManager; + public class WsSession implements Session { private static final Charset UTF8 = Charset.forName("UTF8"); +private static final StringManager sm = +StringManager.getManager(Constants.PACKAGE_NAME); private final Endpoint localEndpoint; private final WsRemoteEndpointBase wsRemoteEndpoint; @@ -88,30 +92,31 @@ public class WsSession implements Sessio if (t.equals(String.class)) { if (textMessageHandler != null) { -// TODO i18n -throw new IllegalStateException(); +throw new IllegalStateException( +sm.getString("wsSession.duplicateHandlerText")); } textMessageHandler = listener; } else if (t.equals(ByteBuffer.class)) { if (binaryMessageHandler != null) { -// TODO i18n -throw new IllegalStateException(); +throw new IllegalStateException( +sm.getString("wsSession.duplicateHandlerBinary")); } binaryMessageHandler = listener; } else if (t.equals(PongMessage.class)) { if (pongMessageHandler != null) { -// TODO i18n -throw new IllegalStateException(); +throw new IllegalStateException( +sm.getString("wsSession.duplicateHandlerPong")); } if (listener instanceof MessageHandler.Basic) { -pongMessageHandler = (MessageHandler.Basic) listener; +pongMessageHandler = +(MessageHandler.Basic) listener; } else { -// TODO i18n -throw new IllegalArgumentException(); +throw new IllegalStateException( +sm.getString("wsSession.invalidHandlerTypePong")); } } else { -// TODO i18n -throw new IllegalArgumentException(); +throw new IllegalArgumentException( +sm.getString("wsSession.unknownHandler", listener, t)); } } @@ -144,7 +149,11 @@ public class WsSession implements Sessio } else if (listener.equals(pongMessageHandler)) { pongMessageHandler = null; } -// TODO Ignore? ISE? + +// ISE for now. Could swallow this silently / log this
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/3842 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1438484 Blamelist: markt BUILD FAILED: failed compile_1 sincerely, -The Buildbot
svn commit: r1438539 - /tomcat/native/tags/TOMCAT_NATIVE_1_1_26/
Author: jfclere Date: Fri Jan 25 14:35:10 2013 New Revision: 1438539 URL: http://svn.apache.org/viewvc?rev=1438539&view=rev Log: release 1.1.26 (25 was broken). Added: tomcat/native/tags/TOMCAT_NATIVE_1_1_26/ (props changed) - copied from r1438538, tomcat/native/branches/1.1.x/ Propchange: tomcat/native/tags/TOMCAT_NATIVE_1_1_26/ -- --- svn:ignore (added) +++ svn:ignore Fri Jan 25 14:35:10 2013 @@ -0,0 +1 @@ +dist Propchange: tomcat/native/tags/TOMCAT_NATIVE_1_1_26/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Jan 25 14:35:10 2013 @@ -0,0 +1 @@ +/tomcat/native/trunk:815411,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE] Release Apache Tomcat Native 1.1.26
Version 1.1.26 is bug fixing release. The proposed release artefacts can be found at [1], and the build was done using tag [2]. The VOTE will remain open for at least 48 hours. The Apache Tomcat Native 1.1.26 is [ ] Stable, go ahead and release [ ] Broken because of ... [1] http://people.apache.org/~jfclere/native/1.1.26 [2] https://svn.apache.org/repos/asf/tomcat/native/tags/TOMCAT_NATIVE_1_1_26 Cheers Jean-Frederic - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54496] New: ..tribes.membership.MemberImpl.toString() might be better using .getClass().getName()
https://issues.apache.org/bugzilla/show_bug.cgi?id=54496 Bug ID: 54496 Summary: ..tribes.membership.MemberImpl.toString() might be better using .getClass().getName() Product: Tomcat 7 Version: 7.0.35 Hardware: PC OS: Linux Status: NEW Severity: trivial Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: stewart.vi...@gmail.com Classification: Unclassified public String toString() { StringBuilder buf = new StringBuilder("org.apache.catalina.tribes.membership.MemberImpl["); Might be better to use .getClass().getName() to cover StaticMember and any other sub-classes that might arise. -- 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: r1438684 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: markt Date: Fri Jan 25 20:21:58 2013 New Revision: 1438684 URL: http://svn.apache.org/viewvc?rev=1438684&view=rev Log: Add missing title Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml 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=1438684&r1=1438683&r2=1438684&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Jan 25 20:21:58 2013 @@ -140,7 +140,7 @@ - + Update to Commons Daemon 1.0.12. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1438747 - /tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
Author: kkolinko Date: Fri Jan 25 22:34:57 2013 New Revision: 1438747 URL: http://svn.apache.org/viewvc?rev=1438747&view=rev Log: Make the messages list synchronized as a whole, instead of just using a volatile reference to it. I am still observing random failures with TestWsWebSocketContainer, so an issue is not here. Modified: tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java Modified: tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java?rev=1438747&r1=1438746&r2=1438747&view=diff == --- tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java (original) +++ tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java Fri Jan 25 22:34:57 2013 @@ -20,6 +20,7 @@ import java.io.IOException; import java.net.URI; import java.nio.ByteBuffer; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -245,7 +246,8 @@ public class TestWsWebSocketContainer ex private final CountDownLatch latch; -private volatile List messages = new ArrayList<>(); +private final List messages = Collections +.synchronizedList(new ArrayList()); public TesterMessageHandler(CountDownLatch latch) { this.latch = latch; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54497] New: RuntimeException in WebappClassLoader.checkThreadLocalMapForLeaks() causes LifecycleException
https://issues.apache.org/bugzilla/show_bug.cgi?id=54497 Bug ID: 54497 Summary: RuntimeException in WebappClassLoader.checkThreadLocalMapForLeaks() causes LifecycleException Product: Tomcat 8 Version: trunk Hardware: PC OS: Windows XP Status: NEW Severity: normal Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: knst.koli...@gmail.com Classification: Unclassified Observed this when testing Tomcat trunk at r1438747, at WinXP 32-bit, JDK 7u11. (running TestWsWebSocketContainer with APR, Tomcat-Native 1.1.26 RC) There occurred an NPE in WebappClassLoader.checkThreadLocalMapForLeaks(). It was uncaught and caused LifecycleException and ultimately a failure to stop Tomcat. === In stderr: SEVERE: A child container failed during stop java.util.concurrent.ExecutionException: org.apache.catalina.LifecycleException: Failed to stop component [StandardEngine[Tomcat].StandardHost[localhost].StandardContext[]] at java.util.concurrent.FutureTask$Sync.innerGet(FutureTask.java:252) at java.util.concurrent.FutureTask.get(FutureTask.java:111) at org.apache.catalina.core.ContainerBase.stopInternal(ContainerBase.java:974) at org.apache.catalina.util.LifecycleBase.stop(LifecycleBase.java:232) at org.apache.catalina.core.ContainerBase$StopChild.call(ContainerBase.java:1404) at org.apache.catalina.core.ContainerBase$StopChild.call(ContainerBase.java:1393) at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:334) at java.util.concurrent.FutureTask.run(FutureTask.java:166) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1110) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:603) at java.lang.Thread.run(Thread.java:722) Caused by: org.apache.catalina.LifecycleException: Failed to stop component [StandardEngine[Tomcat].StandardHost[localhost].StandardContext[]] at org.apache.catalina.util.LifecycleBase.stop(LifecycleBase.java:236) ... 7 more Caused by: org.apache.catalina.LifecycleException: Failed to stop component [WebappLoader[]] at org.apache.catalina.util.LifecycleBase.stop(LifecycleBase.java:236) at org.apache.catalina.core.StandardContext.stopInternal(StandardContext.java:5365) at org.apache.catalina.util.LifecycleBase.stop(LifecycleBase.java:232) ... 7 more Caused by: java.lang.NullPointerException at sun.reflect.UnsafeFieldAccessorImpl.ensureObj(UnsafeFieldAccessorImpl.java:54) at sun.reflect.UnsafeObjectFieldAccessorImpl.get(UnsafeObjectFieldAccessorImpl.java:36) at java.lang.reflect.Field.get(Field.java:372) at org.apache.catalina.loader.WebappClassLoader.checkThreadLocalMapForLeaks(WebappClassLoader.java:2247) at org.apache.catalina.loader.WebappClassLoader.checkThreadLocalsForLeaks(WebappClassLoader.java:2188) at org.apache.catalina.loader.WebappClassLoader.clearReferences(WebappClassLoader.java:1731) at org.apache.catalina.loader.WebappClassLoader.stop(WebappClassLoader.java:1641) at org.apache.catalina.loader.WebappLoader.stopInternal(WebappLoader.java:491) at org.apache.catalina.util.LifecycleBase.stop(LifecycleBase.java:232) ... 9 more === In testcase: Testcase: testSmallTextBufferClientTextMessage took 2,328 sec Caused an ERROR Failed to stop component [StandardServer[-1]] org.apache.catalina.LifecycleException: Failed to stop component [StandardServer[-1]] at org.apache.catalina.util.LifecycleBase.stop(LifecycleBase.java:236) at org.apache.catalina.startup.Tomcat.stop(Tomcat.java:336) at org.apache.catalina.startup.TomcatBaseTest.tearDown(TomcatBaseTest.java:163) Caused by: org.apache.catalina.LifecycleException: Failed to stop component [StandardService[Tomcat]] at org.apache.catalina.util.LifecycleBase.stop(LifecycleBase.java:236) at org.apache.catalina.core.StandardServer.stopInternal(StandardServer.java:766) at org.apache.catalina.util.LifecycleBase.stop(LifecycleBase.java:232) Caused by: org.apache.catalina.LifecycleException: Failed to stop component [StandardEngine[Tomcat]] at org.apache.catalina.util.LifecycleBase.stop(LifecycleBase.java:236) at org.apache.catalina.core.StandardService.stopInternal(StandardService.java:501) at org.apache.catalina.util.LifecycleBase.stop(LifecycleBase.java:232) Caused by: org.apache.catalina.LifecycleException: A child container failed during stop at org.apache.catalina.core.ContainerBase.stopInternal(ContainerBase.java:981) at org.apache.catalina.util.LifecycleBase.stop(LifecycleBase.java:232) === Thoughts: 1. We should catch throwables in those checkFor**Leaks methods. It should not cause a "failed to stop component" failure. 2. In that method there are many calls to "table[j]". The array member should be evaluated