[GUMP@vmgump]: Project tomcat-trunk-test (in module tomcat-trunk) 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 tomcat-trunk-test has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 2 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test : Tomcat 8.x, a web server implementing Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-trunk-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -DEBUG- Dependency on tomcat-trunk-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/build/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/gump_work/build_tomcat-trunk_tomcat-trunk-test.html Work Name: build_tomcat-trunk_tomcat-trunk-test (Type: Build) Work ended in a state of : Failed Elapsed: 22 mins 20 secs Command Line: /usr/lib/jvm/java-6-openjdk/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/dist/junit-31032012.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-31032012-native-src.tar.gz -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-31032012-native-src.tar.gz -Dexamples.sources.skip=true -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps -Djdt.jar=/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-31032012.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-src.jar -Dtest.accesslog=true -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dcommons-dbcp.home=/ srv/gump/public/workspace/commons-dbcp-1.x -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-31032012.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-6-openjdk/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.jar:/srv/gump/public/workspace/tomcat-trunk/outp ut/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-util.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jaf-1.1ea/activation.jar:/srv/gump/packages/eclipse/plugins/org .eclipse.jdt.core_3.4.2/jdtcore.jar:/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-31032012.jar:/srv/gump/public/workspace
[GUMP@vmgump]: Project tomcat-tc7.0.x-test (in module tomcat-7.0.x) 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 tomcat-tc7.0.x-test has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc7.0.x-test : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/build/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test (Type: Build) Work ended in a state of : Failed Elapsed: 22 mins 21 secs Command Line: /usr/lib/jvm/java-6-openjdk/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/dist/junit-31032012.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-31032012-native-src.tar.gz -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-31032012-native-src.tar.gz -Dexamples.sources.skip=true -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps -Djdt.jar=/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-31032012.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar -Dtest.accesslog=true -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dcommons-dbcp.home=/ srv/gump/public/workspace/commons-dbcp-1.x -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-31032012.jar test [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-6-openjdk/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/outp ut/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-util.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jaf-1.1ea/activation.jar:/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar:/srv/gump/public/workspace/tomcat-7. 0.x/tomcat-deps/tomcat-dbcp-31032012.jar:/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-31032012.jar:/srv/gump/public/workspace/junit/dist/
svn commit: r1307701 - in /tomcat/taglibs/standard/trunk: build-tools/pom.xml compat/pom.xml impl/pom.xml jstlel/pom.xml spec/pom.xml
Author: jboynes Date: Sat Mar 31 02:35:49 2012 New Revision: 1307701 URL: http://svn.apache.org/viewvc?rev=1307701&view=rev Log: start cleaning up site prior to release shorten module names so they fit in the site menu Modified: tomcat/taglibs/standard/trunk/build-tools/pom.xml tomcat/taglibs/standard/trunk/compat/pom.xml tomcat/taglibs/standard/trunk/impl/pom.xml tomcat/taglibs/standard/trunk/jstlel/pom.xml tomcat/taglibs/standard/trunk/spec/pom.xml Modified: tomcat/taglibs/standard/trunk/build-tools/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/build-tools/pom.xml?rev=1307701&r1=1307700&r2=1307701&view=diff == --- tomcat/taglibs/standard/trunk/build-tools/pom.xml (original) +++ tomcat/taglibs/standard/trunk/build-tools/pom.xml Sat Mar 31 02:35:49 2012 @@ -32,7 +32,7 @@ taglibs-build-tools 1.2-SNAPSHOT -Apache Standard Taglib - Build Tools +Build Tools Build tool settings common to all Standard Taglib modules Modified: tomcat/taglibs/standard/trunk/compat/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/pom.xml?rev=1307701&r1=1307700&r2=1307701&view=diff == --- tomcat/taglibs/standard/trunk/compat/pom.xml (original) +++ tomcat/taglibs/standard/trunk/compat/pom.xml Sat Mar 31 02:35:49 2012 @@ -34,15 +34,13 @@ 1.2-SNAPSHOT bundle -Apache Standard Taglib - JSTL 1.0 Compatibility +JSTL 1.0 Compatibility 2001 -An implementation of the JSP Standard Tag Library (JSTL). +Supports JSTL 1.0 tags using the Servlet container's EL implementation. -http://tomcat.apache.org/taglibs/standard/ - scm:svn:http://svn.apache.org/repos/asf/tomcat/taglibs/standard/trunk/compat scm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/standard/trunk/compat @@ -51,51 +49,23 @@ - -Pierre Delisle - - -Shawn Bayern - - -Nathan Abramson - - -Hans Bergsten - - -Scott Hasse - - -Justyna Horwat - - -Mark Kolb - - -Jan Luehe - - -Glenn Nielsen - - -Dmitri Plotnikov - - -Felipe Leme - - -Henri Yandell - - -Bjorn Townsend - +Pierre Delisle +Shawn Bayern +Nathan Abramson +Hans Bergsten +Scott Hasse +Justyna Horwat +Mark Kolb +Jan Luehe +Glenn Nielsen +Dmitri Plotnikov +Felipe Leme +Henri Yandell +Bjorn Townsend - -Robert Goff - +Robert Goff Modified: tomcat/taglibs/standard/trunk/impl/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/pom.xml?rev=1307701&r1=1307700&r2=1307701&view=diff == --- tomcat/taglibs/standard/trunk/impl/pom.xml (original) +++ tomcat/taglibs/standard/trunk/impl/pom.xml Sat Mar 31 02:35:49 2012 @@ -34,15 +34,13 @@ 1.2-SNAPSHOT bundle -Apache Standard Taglib - JSTL Implementation +JSTL Implementation 2001 An implementation of the JSP Standard Tag Library (JSTL). -http://tomcat.apache.org/taglibs/standard/ - scm:svn:http://svn.apache.org/repos/asf/tomcat/taglibs/standard/trunk/impl scm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/standard/trunk/impl @@ -51,51 +49,23 @@ - -Pierre Delisle - - -Shawn Bayern - - -Nathan Abramson - - -Hans Bergsten - - -Scott Hasse - - -Justyna Horwat - - -Mark Kolb - - -Jan Luehe - - -Glenn Nielsen - - -Dmitri Plotnikov - - -Felipe Leme - - -Henri Yandell - - -Bjorn Townsend - +Pierre Delisle +Shawn Bayern +Nathan Abramson +Hans Bergsten +Scott Hasse +Justyna Horwat +Mark Kolb +Jan Luehe +Glenn Nielsen +Dmitri Plotnikov +Felipe Leme +Henri Yandell +Bjorn Townsend - -Robert Goff - +Robert Goff Modified: tomcat/taglibs/standard/trunk/jstlel/pom.xml URL: http://svn.apache.org/viewvc/tomcat/ta
Taglibs build #2 failed due to Hudson error
From the log: https://builds.apache.org/job/taglib-standard/2/consoleText Parsing POMs ERROR: Failed to parse POMs hudson.util.IOException2: remote file operation failed: /home/jenkins/jenkins-slave/workspace/taglib-standard at hudson.remoting.Channel@1c4071a9:ubuntu3 at hudson.FilePath.act(FilePath.java:828) at hudson.FilePath.act(FilePath.java:814) at hudson.maven.MavenModuleSetBuild$RunnerImpl.parsePoms(MavenModuleSetBuild.java:914) at hudson.maven.MavenModuleSetBuild$RunnerImpl.doRun(MavenModuleSetBuild.java:658) at hudson.model.AbstractBuild$AbstractRunner.run(AbstractBuild.java:473) at hudson.model.Run.run(Run.java:1410) at hudson.maven.MavenModuleSetBuild.run(MavenModuleSetBuild.java:481) at hudson.model.ResourceController.execute(ResourceController.java:88) at hudson.model.Executor.run(Executor.java:238) Caused by: java.io.FileNotFoundException: /tmp/hudson-remoting6347775300781058040/META-INF/plexus/components.xml (No such file or directory) at java.io.FileOutputStream.open(Native Method) at java.io.FileOutputStream.(FileOutputStream.java:194) at java.io.FileOutputStream.(FileOutputStream.java:145) at hudson.remoting.RemoteClassLoader.makeResource(RemoteClassLoader.java:270) at hudson.remoting.RemoteClassLoader.findResources(RemoteClassLoader.java:237) at java.lang.ClassLoader.getResources(ClassLoader.java:1040) at java.lang.ClassLoader.getResources(ClassLoader.java:1036) at hudson.maven.MavenUtil$MaskingClassLoader.getResources(MavenUtil.java:291) at hudson.maven.MavenUtil.createEmbedder(MavenUtil.java:199) at hudson.maven.MavenModuleSetBuild$PomParser.invoke(MavenModuleSetBuild.java:1218) at hudson.maven.MavenModuleSetBuild$PomParser.invoke(MavenModuleSetBuild.java:1049) at hudson.FilePath$FileCallableWrapper.call(FilePath.java:2154) at hudson.remoting.UserRequest.perform(UserRequest.java:118) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:287) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303) at java.util.concurrent.FutureTask.run(FutureTask.java:138) at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908) at java.lang.Thread.run(Thread.java:662) Resubmitting the build worked fine. What causes this type of problem? Thanks Jeremy - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1307680 - /tomcat/taglibs/standard/trunk/pom.xml
Author: jboynes Date: Sat Mar 31 01:16:01 2012 New Revision: 1307680 URL: http://svn.apache.org/viewvc?rev=1307680&view=rev Log: update standard to use released parent pom Modified: tomcat/taglibs/standard/trunk/pom.xml Modified: tomcat/taglibs/standard/trunk/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/pom.xml?rev=1307680&r1=1307679&r2=1307680&view=diff == --- tomcat/taglibs/standard/trunk/pom.xml (original) +++ tomcat/taglibs/standard/trunk/pom.xml Sat Mar 31 01:16:01 2012 @@ -27,7 +27,7 @@ org.apache.taglibs taglibs-parent -1 +3 pom - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52135] Global error page is not handled
https://issues.apache.org/bugzilla/show_bug.cgi?id=52135 j...@iname.com changed: What|Removed |Added CC||j...@iname.com -- 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: r1307649 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Fri Mar 30 22:39:54 2012 New Revision: 1307649 URL: http://svn.apache.org/viewvc?rev=1307649&view=rev Log: vote and add patch link 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=1307649&r1=1307648&r2=1307649&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Mar 30 22:39:54 2012 @@ -181,7 +181,9 @@ PATCHES PROPOSED TO BACKPORT: Revert the fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=46915 since the use case described in bug 46915 is invalid as it breaks the EL specification. - +1: markt +http://svn.apache.org/viewvc?rev=1307511&view=rev +(The revision to revert in 6.0.x is r769336) + +1: markt, kkolinko -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 46915] Unable to get ResourceBundle keys in Tomcat 6
https://issues.apache.org/bugzilla/show_bug.cgi?id=46915 --- Comment #4 from Konstantin Kolinko 2012-03-30 22:35:21 UTC --- Confirming as INVALID. To find the place in specification, search for the string of "???". -> it is in description of ResourceBundleELResolver.getValue(..) method. 5.5.x might be different, because javax.el package and ResourceBundleELResolver were introduced with JSP 2.1. Just noting that JSTL has similar feature in its i18n tags - see fmt:message. -- 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: r1307634 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Fri Mar 30 21:57:20 2012 New Revision: 1307634 URL: http://svn.apache.org/viewvc?rev=1307634&view=rev Log: vote 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=1307634&r1=1307633&r2=1307634&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Mar 30 21:57:20 2012 @@ -124,6 +124,10 @@ PATCHES PROPOSED TO BACKPORT: (=r1300157+r1300161 in TC7) +1: markt 0: fhanik - introducing a new parser this late into a release seems too risky for 6 + +1: kkolinko: With followups (in trunk: r1304275,1304895; in 7.0.x: r1304897). +The fix affects response.contentType parsing only. So I think it is +acceptable. I'd be more concerned if it affected request.contentType +processing. -1: * Fix bug https://issues.apache.org/bugzilla/show_bug.cgi?id=52858 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
7.0.27 progress report
The unit tests for 7.0.x have completed twice in a row on both Linux and Windows. That is much better than what I was seeing a few days ago and comparable to previous releases. Next up the TCKs. That'll be tomorrows task. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1307628 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Fri Mar 30 21:43:08 2012 New Revision: 1307628 URL: http://svn.apache.org/viewvc?rev=1307628&view=rev Log: vote, adding one more clean-up to the list 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=1307628&r1=1307627&r2=1307628&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Mar 30 21:43:08 2012 @@ -93,8 +93,10 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?view=revision&revision=r1298542 http://svn.apache.org/viewvc?view=revision&revision=r1298577 http://svn.apache.org/viewvc?view=revision&revision=r1298590 + http://svn.apache.org/viewvc?view=revision&revision=r1298592 +1: schultz, fhanik +1: markt if clean-up is also applied + +1: kkolinko: with clean-ups (r1298542, r1298577, r1298590, r1298592) -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52723 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a restored build on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/522 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1307603 Blamelist: kkolinko Build succeeded! sincerely, -The Buildbot
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/2920 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1307591 Blamelist: markt Build succeeded! sincerely, -The Buildbot
DO NOT REPLY [Bug 51741] Eclipse WTP "Serve modules without publishing" broken with tc7, needs patch in tomcat
https://issues.apache.org/bugzilla/show_bug.cgi?id=51741 --- Comment #13 from Konstantin Kolinko 2012-03-30 20:51:25 UTC --- See r1307600 for one more issue with the patch. The fix will be in 7.0.27. -- 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: r1307603 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Fri Mar 30 20:49:20 2012 New Revision: 1307603 URL: http://svn.apache.org/viewvc?rev=1307603&view=rev Log: Update changelog 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=1307603&r1=1307602&r2=1307603&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Mar 30 20:49:20 2012 @@ -68,6 +68,14 @@ during an asynchronous request on a container thread. (markt) +Correct fix for 51741 (1307600): +If VirtualDirContext class is configured with non-empty +value of extraResourcePaths option (a feature added +in 7.0.24), do not implicitly set allowLinking option to +the value of true. If it is really needed, it should be +set explicitly. (kkolinko) + + 52500: Added configurable mechanism to retrieve user names from X509 client certificates. Based on a patch provided by Michael Furman. (schultz) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [JK] Shared memory design problems
On 03/30/2012 10:16 PM, Le Huy wrote: Have you look at how mod_proxy solves this issue, it seems that it does not suffer the problem that we are experiencing , and also does not need any share memory file. ... it uses shared memory (scoreboard in 2.0 and 2.2, mod_slotmem in 2.4) ... and it sucks ;) ... and it doesn't even support graceful restarts (all runtime data is lost) ... and its for httpd. Our shm was designed when there were no things like IIS workers, so its time to adapt the technology. Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1307600 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/naming/resources/VirtualDirContext.java
Author: kkolinko
Date: Fri Mar 30 20:33:27 2012
New Revision: 1307600
URL: http://svn.apache.org/viewvc?rev=1307600&view=rev
Log:
Merged revision 1307597 from tomcat/trunk:
Followup to https://issues.apache.org/bugzilla/show_bug.cgi?id=51741
Remove wrong call. The tests pass for me with this call being removed.
If allowLinking feature is really needed, it should be configured explicitly.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1307597
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java?rev=1307600&r1=1307599&r2=1307600&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java
Fri Mar 30 20:33:27 2012
@@ -114,9 +114,6 @@ public class VirtualDirContext extends F
mappedResourcePaths.put(path, resourcePaths);
}
resourcePaths.add(dir);
-
-// Set allowLinking since there can be no canonical path
-setAllowLinking(true);
}
}
if (mappedResourcePaths.isEmpty()) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1307597 - /tomcat/trunk/java/org/apache/naming/resources/VirtualDirContext.java
Author: kkolinko
Date: Fri Mar 30 20:28:50 2012
New Revision: 1307597
URL: http://svn.apache.org/viewvc?rev=1307597&view=rev
Log:
Followup to https://issues.apache.org/bugzilla/show_bug.cgi?id=51741
Remove wrong call. The tests pass for me with this call being removed.
If allowLinking feature is really needed, it should be configured explicitly.
Modified:
tomcat/trunk/java/org/apache/naming/resources/VirtualDirContext.java
Modified: tomcat/trunk/java/org/apache/naming/resources/VirtualDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/VirtualDirContext.java?rev=1307597&r1=1307596&r2=1307597&view=diff
==
--- tomcat/trunk/java/org/apache/naming/resources/VirtualDirContext.java
(original)
+++ tomcat/trunk/java/org/apache/naming/resources/VirtualDirContext.java Fri
Mar 30 20:28:50 2012
@@ -114,9 +114,6 @@ public class VirtualDirContext extends F
mappedResourcePaths.put(path, resourcePaths);
}
resourcePaths.add(dir);
-
-// Set allowLinking since there can be no canonical path
-setAllowLinking(true);
}
}
if (mappedResourcePaths.isEmpty()) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52135] Global error page is not handled
https://issues.apache.org/bugzilla/show_bug.cgi?id=52135 --- Comment #8 from Mark Thomas 2012-03-30 20:19:33 UTC --- e-mail the Servlet EG (of which I am a member but only since JSR 340 so I do not have access to the thinking behind the changes in JSR 315). You'll need to join the JSR-340 users mailing list. See http://java.net/projects/servlet-spec -- 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 52135] Global error page is not handled
https://issues.apache.org/bugzilla/show_bug.cgi?id=52135 --- Comment #7 from Keith Donald 2012-03-30 20:17:10 UTC --- The XSD for Servlet 3.0's web.xml clearly allows a element containing only a sub-element. Older versions of the XSD do not. This is an indication this is a Servlet 3.0 feature. This feature is useful. Most REST API implementations need to report unhandled errors the same way: by returning a JSON body containing the error message (reason). Having to define a error-page entry for each error code that may be set by the application via HttpServletResponse#sendError is more work than it should be. Having a single error-page entry for a default error handler is a lot simpler and future proof. I consider this a bug in Tomcat 7. Shoot me down if you want! -- 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: [JK] Shared memory design problems
Have you look at how mod_proxy solves this issue, it seems that it does not suffer the problem that we are experiencing , and also does not need any share memory file. On Wed, Mar 28, 2012 at 2:32 PM, Mladen Turk wrote: > On 03/28/2012 02:01 PM, jean-frederic clere wrote: >> >> What about a look on file that contains the id? It gets created and lock >> by the first worker that needs the shared memory and writes the id inside >> and unlock the file? Other workers will just read the id in the file. >> > > I started to work on 'get by id' record/slot concept. > There are many advantages over the 'presume we have a correct order' > > Currently if someone reorders worker list everything breaks apart > or at least gets overwritten by something else. > > The idea is that instead going trough worker/member list and > allocate next free slot, we actually search if the object with > the same id (combination of name, type and parent) exists and > if not then actually create a new shm record. > > This would mean that jk_shm_alloc_xxx won't reset data on > each restart (done by single proc in httpd and multiple in IIS) > Thus the sequence will actually be what it is: config update. > > > Regards > -- > ^TM > > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52135] Global error page is not handled
https://issues.apache.org/bugzilla/show_bug.cgi?id=52135 --- Comment #6 from rstoyanc...@yahoo.com 2012-03-30 20:13:58 UTC --- Mark, what's the process of getting a clarification? This is a useful feature for example in REST-ful web service scenarios where the behavior of ServletResponse.sendError() to send HTML is not desirable: http://blog.newsplore.com/2010/08/04/restful-error-handling-with-tomcat-springmvc -- 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 52998] Performance issue with ExpressionFactory.newInstance()
https://issues.apache.org/bugzilla/show_bug.cgi?id=52998 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #3 from Mark Thomas 2012-03-30 20:12:54 UTC --- Patch looks good to me. I applied it so I can get on with the pre-release testing. -- 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: r1307593 - in /tomcat/tc7.0.x/trunk: ./ java/javax/el/ExpressionFactory.java webapps/docs/changelog.xml
Author: markt
Date: Fri Mar 30 20:12:34 2012
New Revision: 1307593
URL: http://svn.apache.org/viewvc?rev=1307593&view=rev
Log:
Remainder of fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=52998
Cache ExpressionFactory class per class loader (kkolinko)
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/javax/el/ExpressionFactory.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1307591
Modified: tomcat/tc7.0.x/trunk/java/javax/el/ExpressionFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/el/ExpressionFactory.java?rev=1307593&r1=1307592&r2=1307593&view=diff
==
--- tomcat/tc7.0.x/trunk/java/javax/el/ExpressionFactory.java (original)
+++ tomcat/tc7.0.x/trunk/java/javax/el/ExpressionFactory.java Fri Mar 30
20:12:34 2012
@@ -25,11 +25,17 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.UnsupportedEncodingException;
+import java.lang.ref.WeakReference;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.Properties;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
/**
*
@@ -48,6 +54,10 @@ public abstract class ExpressionFactory
private static final String SEP;
private static final String PROPERTY_FILE;
+private static final CacheValue nullTcclFactory = new CacheValue();
+private static ConcurrentMap factoryCache
+= new ConcurrentHashMap();
+
static {
if (IS_SECURITY_ENABLED) {
SEP = AccessController.doPrivileged(
@@ -118,15 +128,60 @@ public abstract class ExpressionFactory
ExpressionFactory result = null;
ClassLoader tccl = Thread.currentThread().getContextClassLoader();
-String className = discoverClassName(tccl);
+CacheValue cacheValue;
+Class clazz;
+
+if (tccl == null) {
+cacheValue = nullTcclFactory;
+} else {
+CacheKey key = new CacheKey(tccl);
+cacheValue = factoryCache.get(key);
+if (cacheValue == null) {
+CacheValue newCacheValue = new CacheValue();
+cacheValue = factoryCache.putIfAbsent(key, newCacheValue);
+if (cacheValue == null) {
+cacheValue = newCacheValue;
+}
+}
+}
+
+final Lock readLock = cacheValue.getLock().readLock();
+readLock.lock();
try {
-Class clazz = null;
-if (tccl == null) {
-clazz = Class.forName(className);
-} else {
-clazz = tccl.loadClass(className);
+clazz = cacheValue.getFactoryClass();
+} finally {
+readLock.unlock();
+}
+
+if (clazz == null) {
+String className = null;
+try {
+final Lock writeLock = cacheValue.getLock().writeLock();
+writeLock.lock();
+try {
+className = cacheValue.getFactoryClassName();
+if (className == null) {
+className = discoverClassName(tccl);
+cacheValue.setFactoryClassName(className);
+}
+if (tccl == null) {
+clazz = Class.forName(className);
+} else {
+clazz = tccl.loadClass(className);
+}
+cacheValue.setFactoryClass(clazz);
+} finally {
+writeLock.unlock();
+}
+} catch (ClassNotFoundException e) {
+throw new ELException(
+"Unable to find ExpressionFactory of type: " + className,
+e);
}
+}
+
+try {
Constructor constructor = null;
// Do we need to look for a constructor that will take properties?
if (properties != null) {
@@ -146,21 +201,17 @@ public abstract class ExpressionFactory
(ExpressionFactory) constructor.newInstance(properties);
}
-} catch (ClassNotFoundException e) {
-throw new ELException(
-"Unable to find ExpressionFactory of type: " + className,
-e);
} catch (InstantiationException e) {
throw new ELException(
-
svn commit: r1307591 - /tomcat/trunk/java/javax/el/ExpressionFactory.java
Author: markt
Date: Fri Mar 30 20:10:48 2012
New Revision: 1307591
URL: http://svn.apache.org/viewvc?rev=1307591&view=rev
Log:
Remainder of fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=52998
Cache ExpressionFactory class per class loader (kkolinko)
Modified:
tomcat/trunk/java/javax/el/ExpressionFactory.java
Modified: tomcat/trunk/java/javax/el/ExpressionFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ExpressionFactory.java?rev=1307591&r1=1307590&r2=1307591&view=diff
==
--- tomcat/trunk/java/javax/el/ExpressionFactory.java (original)
+++ tomcat/trunk/java/javax/el/ExpressionFactory.java Fri Mar 30 20:10:48 2012
@@ -25,11 +25,17 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.UnsupportedEncodingException;
+import java.lang.ref.WeakReference;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.Properties;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
/**
*
@@ -48,6 +54,10 @@ public abstract class ExpressionFactory
private static final String SEP;
private static final String PROPERTY_FILE;
+private static final CacheValue nullTcclFactory = new CacheValue();
+private static ConcurrentMap factoryCache
+= new ConcurrentHashMap();
+
static {
if (IS_SECURITY_ENABLED) {
SEP = AccessController.doPrivileged(
@@ -118,15 +128,60 @@ public abstract class ExpressionFactory
ExpressionFactory result = null;
ClassLoader tccl = Thread.currentThread().getContextClassLoader();
-String className = discoverClassName(tccl);
+CacheValue cacheValue;
+Class clazz;
+
+if (tccl == null) {
+cacheValue = nullTcclFactory;
+} else {
+CacheKey key = new CacheKey(tccl);
+cacheValue = factoryCache.get(key);
+if (cacheValue == null) {
+CacheValue newCacheValue = new CacheValue();
+cacheValue = factoryCache.putIfAbsent(key, newCacheValue);
+if (cacheValue == null) {
+cacheValue = newCacheValue;
+}
+}
+}
+
+final Lock readLock = cacheValue.getLock().readLock();
+readLock.lock();
try {
-Class clazz = null;
-if (tccl == null) {
-clazz = Class.forName(className);
-} else {
-clazz = tccl.loadClass(className);
+clazz = cacheValue.getFactoryClass();
+} finally {
+readLock.unlock();
+}
+
+if (clazz == null) {
+String className = null;
+try {
+final Lock writeLock = cacheValue.getLock().writeLock();
+writeLock.lock();
+try {
+className = cacheValue.getFactoryClassName();
+if (className == null) {
+className = discoverClassName(tccl);
+cacheValue.setFactoryClassName(className);
+}
+if (tccl == null) {
+clazz = Class.forName(className);
+} else {
+clazz = tccl.loadClass(className);
+}
+cacheValue.setFactoryClass(clazz);
+} finally {
+writeLock.unlock();
+}
+} catch (ClassNotFoundException e) {
+throw new ELException(
+"Unable to find ExpressionFactory of type: " + className,
+e);
}
+}
+
+try {
Constructor constructor = null;
// Do we need to look for a constructor that will take properties?
if (properties != null) {
@@ -146,21 +201,17 @@ public abstract class ExpressionFactory
(ExpressionFactory) constructor.newInstance(properties);
}
-} catch (ClassNotFoundException e) {
-throw new ELException(
-"Unable to find ExpressionFactory of type: " + className,
-e);
} catch (InstantiationException e) {
throw new ELException(
-"Unable to create ExpressionFactory of type: " + className,
+"Unable to create ExpressionFactory of type: " +
clazz.getName(),
e);
} catch (IllegalAccessException e) {
throw new ELException(
-"Unable to create Expres
DO NOT REPLY [Bug 52135] Global error page is not handled
https://issues.apache.org/bugzilla/show_bug.cgi?id=52135 Mark Thomas changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||INVALID --- Comment #5 from Mark Thomas 2012-03-30 19:53:33 UTC --- There is no reference in section 10.9.2 for the behaviour described. That it works in Glassfish does not make it part of the specification. There is no explanation of why those elements are now optional. Nor does section 10.9.2 explain how the case where neither is provided should be handled. -- 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 52135] Global error page is not handled
https://issues.apache.org/bugzilla/show_bug.cgi?id=52135 Sutanu Ghosh changed: What|Removed |Added CC||sutan...@yahoo.com -- 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 52135] Global error page is not handled
https://issues.apache.org/bugzilla/show_bug.cgi?id=52135 Sutanu Ghosh changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|INVALID | --- Comment #4 from Sutanu Ghosh 2012-03-30 19:43:24 UTC --- I have tested this on Apache Tomcat/7.0.23 If I declare following without or : /error It does not take effect, i.e. /error does not get invoked when any http error or exception from servlet occurs. Not sure if this is a valid declaration per servlet 3.0 spec. But if supported it's very useful to allow a "catch-all" error handler. -- 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 52998] Performance issue with ExpressionFactory.newInstance()
https://issues.apache.org/bugzilla/show_bug.cgi?id=52998 --- Comment #2 from Mark Thomas 2012-03-30 19:34:35 UTC --- I've taken care of the static references in Jasper. I haven't reviewed the patch for the remaining issues yet. -- 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: r1307581 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/jasper/compiler/Validator.java java/org/apache/jasper/runtime/JspApplicationContextImpl.java webapps/docs/changelog.xml
Author: markt
Date: Fri Mar 30 19:33:52 2012
New Revision: 1307581
URL: http://svn.apache.org/viewvc?rev=1307581&view=rev
Log:
Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=52998
Remove static references to ExpressionFactory. These should be per web
application.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Validator.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/JspApplicationContextImpl.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1307579
Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Validator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Validator.java?rev=1307581&r1=1307580&r2=1307581&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Validator.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Validator.java Fri Mar
30 19:33:52 2012
@@ -27,6 +27,7 @@ import java.util.Locale;
import javax.el.ELException;
import javax.el.ExpressionFactory;
import javax.el.FunctionMapper;
+import javax.servlet.jsp.JspFactory;
import javax.servlet.jsp.tagext.FunctionInfo;
import javax.servlet.jsp.tagext.PageData;
import javax.servlet.jsp.tagext.TagAttributeInfo;
@@ -500,8 +501,7 @@ class Validator {
new JspUtil.ValidAttribute("doctype-public"),
new JspUtil.ValidAttribute("doctype-system") };
-private static final ExpressionFactory EXPRESSION_FACTORY =
-ExpressionFactory.newInstance();
+private final ExpressionFactory expressionFactory;
/*
* Constructor
@@ -510,6 +510,11 @@ class Validator {
this.pageInfo = compiler.getPageInfo();
this.err = compiler.getErrorDispatcher();
this.loader = compiler.getCompilationContext().getClassLoader();
+// Get the cached EL expression factory for this context
+expressionFactory =
+JspFactory.getDefaultFactory().getJspApplicationContext(
+compiler.getCompilationContext().getServletContext()).
+getExpressionFactory();
}
@Override
@@ -1177,7 +1182,7 @@ class Validator {
Boolean.TYPE == expectedClass ||
expectedClass.isEnum()) {
try {
-
EXPRESSION_FACTORY.coerceToType(attrs.getValue(i), expectedClass);
+
expressionFactory.coerceToType(attrs.getValue(i), expectedClass);
} catch (Exception e) {
err.jspError
(n, "jsp.error.coerce_to_type",
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/JspApplicationContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/JspApplicationContextImpl.java?rev=1307581&r1=1307580&r2=1307581&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/JspApplicationContextImpl.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/JspApplicationContextImpl.java
Fri Mar 30 19:33:52 2012
@@ -50,8 +50,8 @@ public class JspApplicationContextImpl i
private static final String KEY =
JspApplicationContextImpl.class.getName();
-private static final ExpressionFactory expressionFactory =
-ExpressionFactory.newInstance();
+private final ExpressionFactory expressionFactory =
+ExpressionFactory.newInstance();
private final List contextListeners = new
ArrayList();
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=1307581&r1=1307580&r2=1307581&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Mar 30 19:33:52 2012
@@ -214,6 +214,11 @@
via EL. (markt)
+52998: Partial fix. Remove static references to the EL
+expression factory and use per web application references instead.
+(markt)
+
+
53001: Revert the fix for 46915 since the use
case
described in the bug is invalid since it breaks the EL specification.
(markt)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.
svn commit: r1307579 - in /tomcat/trunk/java/org/apache/jasper: compiler/Validator.java runtime/JspApplicationContextImpl.java
Author: markt
Date: Fri Mar 30 19:32:01 2012
New Revision: 1307579
URL: http://svn.apache.org/viewvc?rev=1307579&view=rev
Log:
Remove static references to ExpressionFactory. These should be per web
application.
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Validator.java
tomcat/trunk/java/org/apache/jasper/runtime/JspApplicationContextImpl.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Validator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Validator.java?rev=1307579&r1=1307578&r2=1307579&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/Validator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Validator.java Fri Mar 30
19:32:01 2012
@@ -27,6 +27,7 @@ import java.util.Locale;
import javax.el.ELException;
import javax.el.ExpressionFactory;
import javax.el.FunctionMapper;
+import javax.servlet.jsp.JspFactory;
import javax.servlet.jsp.tagext.FunctionInfo;
import javax.servlet.jsp.tagext.PageData;
import javax.servlet.jsp.tagext.TagAttributeInfo;
@@ -500,8 +501,7 @@ class Validator {
new JspUtil.ValidAttribute("doctype-public"),
new JspUtil.ValidAttribute("doctype-system") };
-private static final ExpressionFactory EXPRESSION_FACTORY =
-ExpressionFactory.newInstance();
+private final ExpressionFactory expressionFactory;
/*
* Constructor
@@ -510,6 +510,11 @@ class Validator {
this.pageInfo = compiler.getPageInfo();
this.err = compiler.getErrorDispatcher();
this.loader = compiler.getCompilationContext().getClassLoader();
+// Get the cached EL expression factory for this context
+expressionFactory =
+JspFactory.getDefaultFactory().getJspApplicationContext(
+compiler.getCompilationContext().getServletContext()).
+getExpressionFactory();
}
@Override
@@ -1177,7 +1182,7 @@ class Validator {
Boolean.TYPE == expectedClass ||
expectedClass.isEnum()) {
try {
-
EXPRESSION_FACTORY.coerceToType(attrs.getValue(i), expectedClass);
+
expressionFactory.coerceToType(attrs.getValue(i), expectedClass);
} catch (Exception e) {
err.jspError
(n, "jsp.error.coerce_to_type",
Modified:
tomcat/trunk/java/org/apache/jasper/runtime/JspApplicationContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/JspApplicationContextImpl.java?rev=1307579&r1=1307578&r2=1307579&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/runtime/JspApplicationContextImpl.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/runtime/JspApplicationContextImpl.java
Fri Mar 30 19:32:01 2012
@@ -50,8 +50,8 @@ public class JspApplicationContextImpl i
private static final String KEY =
JspApplicationContextImpl.class.getName();
-private static final ExpressionFactory expressionFactory =
-ExpressionFactory.newInstance();
+private final ExpressionFactory expressionFactory =
+ExpressionFactory.newInstance();
private final List contextListeners = new
ArrayList();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1307577 - in /tomcat/tc7.0.x/trunk: ./ java/javax/el/ExpressionFactory.java
Author: markt
Date: Fri Mar 30 19:21:01 2012
New Revision: 1307577
URL: http://svn.apache.org/viewvc?rev=1307577&view=rev
Log:
Refactoring. Move class name discovery into separate helper method. (kkolinko)
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/javax/el/ExpressionFactory.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1307310
Modified: tomcat/tc7.0.x/trunk/java/javax/el/ExpressionFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/el/ExpressionFactory.java?rev=1307577&r1=1307576&r2=1307577&view=diff
==
--- tomcat/tc7.0.x/trunk/java/javax/el/ExpressionFactory.java (original)
+++ tomcat/tc7.0.x/trunk/java/javax/el/ExpressionFactory.java Fri Mar 30
19:21:01 2012
@@ -115,48 +115,11 @@ public abstract class ExpressionFactory
* @return the new ExpressionFactory
*/
public static ExpressionFactory newInstance(Properties properties) {
-String className = null;
ExpressionFactory result = null;
ClassLoader tccl = Thread.currentThread().getContextClassLoader();
+String className = discoverClassName(tccl);
-// First services API
-className = getClassNameServices(tccl);
-if (className == null) {
-if (IS_SECURITY_ENABLED) {
-className = AccessController.doPrivileged(
-new PrivilegedAction() {
-@Override
-public String run() {
-return getClassNameJreDir();
-}
-}
-);
-} else {
-// Second el.properties file
-className = getClassNameJreDir();
-}
-}
-if (className == null) {
-if (IS_SECURITY_ENABLED) {
-className = AccessController.doPrivileged(
-new PrivilegedAction() {
-@Override
-public String run() {
-return getClassNameSysProp();
-}
-}
-);
-} else {
-// Third system property
-className = getClassNameSysProp();
-}
-}
-if (className == null) {
-// Fourth - default
-className = "org.apache.el.ExpressionFactoryImpl";
-}
-
try {
Class clazz = null;
if (tccl == null) {
@@ -215,6 +178,55 @@ public abstract class ExpressionFactory
return result;
}
+/**
+ * Discover the name of class that implements ExpressionFactory.
+ *
+ * @param tccl
+ *{@code ClassLoader}
+ * @return Class name. There is default, so it is never {@code null}.
+ */
+private static String discoverClassName(ClassLoader tccl) {
+String className = null;
+
+// First services API
+className = getClassNameServices(tccl);
+if (className == null) {
+if (IS_SECURITY_ENABLED) {
+className = AccessController.doPrivileged(
+new PrivilegedAction() {
+@Override
+public String run() {
+return getClassNameJreDir();
+}
+}
+);
+} else {
+// Second el.properties file
+className = getClassNameJreDir();
+}
+}
+if (className == null) {
+if (IS_SECURITY_ENABLED) {
+className = AccessController.doPrivileged(
+new PrivilegedAction() {
+@Override
+public String run() {
+return getClassNameSysProp();
+}
+}
+);
+} else {
+// Third system property
+className = getClassNameSysProp();
+}
+}
+if (className == null) {
+// Fourth - default
+className = "org.apache.el.ExpressionFactoryImpl";
+}
+return className;
+}
+
private static String getClassNameServices(ClassLoader tccl) {
InputStream is = null;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1307575 - in /tomcat/trunk/res/maven: mvn-pub.xml tomcat-catalina-ha.pom tomcat-catalina.pom tomcat-coyote.pom tomcat-embed-jasper.pom tomcat-jasper.pom tomcat-jni.pom tomcat-spdy.pom tom
Author: markt Date: Fri Mar 30 19:15:50 2012 New Revision: 1307575 URL: http://svn.apache.org/viewvc?rev=1307575&view=rev Log: Add new JARs to Maven build. Review dependencies and add a few new ones as well as some missing ones. Added: tomcat/trunk/res/maven/tomcat-jni.pom (with props) tomcat/trunk/res/maven/tomcat-spdy.pom (with props) Modified: tomcat/trunk/res/maven/mvn-pub.xml tomcat/trunk/res/maven/tomcat-catalina-ha.pom tomcat/trunk/res/maven/tomcat-catalina.pom tomcat/trunk/res/maven/tomcat-coyote.pom tomcat/trunk/res/maven/tomcat-embed-jasper.pom tomcat/trunk/res/maven/tomcat-jasper.pom tomcat/trunk/res/maven/tomcat-util.pom Modified: tomcat/trunk/res/maven/mvn-pub.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/mvn-pub.xml?rev=1307575&r1=1307574&r2=1307575&view=diff == --- tomcat/trunk/res/maven/mvn-pub.xml (original) +++ tomcat/trunk/res/maven/mvn-pub.xml Fri Mar 30 19:15:50 2012 @@ -252,6 +252,8 @@ srcJarFileName="servlet-api-src.jar"/> + + Modified: tomcat/trunk/res/maven/tomcat-catalina-ha.pom URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-catalina-ha.pom?rev=1307575&r1=1307574&r2=1307575&view=diff == --- tomcat/trunk/res/maven/tomcat-catalina-ha.pom (original) +++ tomcat/trunk/res/maven/tomcat-catalina-ha.pom Fri Mar 30 19:15:50 2012 @@ -52,5 +52,11 @@ @MAVEN.DEPLOY.VERSION@ compile + + org.apache.tomcat + tomcat-util + @MAVEN.DEPLOY.VERSION@ + compile + Modified: tomcat/trunk/res/maven/tomcat-catalina.pom URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-catalina.pom?rev=1307575&r1=1307574&r2=1307575&view=diff == --- tomcat/trunk/res/maven/tomcat-catalina.pom (original) +++ tomcat/trunk/res/maven/tomcat-catalina.pom Fri Mar 30 19:15:50 2012 @@ -48,6 +48,12 @@ org.apache.tomcat + tomcat-jni + @MAVEN.DEPLOY.VERSION@ + compile + + + org.apache.tomcat tomcat-util @MAVEN.DEPLOY.VERSION@ compile Modified: tomcat/trunk/res/maven/tomcat-coyote.pom URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-coyote.pom?rev=1307575&r1=1307574&r2=1307575&view=diff == --- tomcat/trunk/res/maven/tomcat-coyote.pom (original) +++ tomcat/trunk/res/maven/tomcat-coyote.pom Fri Mar 30 19:15:50 2012 @@ -24,9 +24,21 @@ org.apache.tomcat + tomcat-jni + @MAVEN.DEPLOY.VERSION@ + compile + + + org.apache.tomcat tomcat-juli @MAVEN.DEPLOY.VERSION@ compile + + org.apache.tomcat + tomcat-util + @MAVEN.DEPLOY.VERSION@ + compile + Modified: tomcat/trunk/res/maven/tomcat-embed-jasper.pom URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-embed-jasper.pom?rev=1307575&r1=1307574&r2=1307575&view=diff == --- tomcat/trunk/res/maven/tomcat-embed-jasper.pom (original) +++ tomcat/trunk/res/maven/tomcat-embed-jasper.pom Fri Mar 30 19:15:50 2012 @@ -28,5 +28,10 @@ @MAVEN.DEPLOY.VERSION@ compile + + org.eclipse.jdt.core.compiler + ecj + 3.7.2 + Modified: tomcat/trunk/res/maven/tomcat-jasper.pom URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-jasper.pom?rev=1307575&r1=1307574&r2=1307575&view=diff == --- tomcat/trunk/res/maven/tomcat-jasper.pom (original) +++ tomcat/trunk/res/maven/tomcat-jasper.pom Fri Mar 30 19:15:50 2012 @@ -49,7 +49,7 @@ org.eclipse.jdt.core.compiler ecj - 3.7 + 3.7.2 org.apache.tomcat Added: tomcat/trunk/res/maven/tomcat-jni.pom URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-jni.pom?rev=1307575&view=auto == --- tomcat/trunk/res/maven/tomcat-jni.pom (added) +++ tomcat/trunk/res/maven/tomcat-jni.pom Fri Mar 30 19:15:50 2012 @@ -0,0 +1,24 @@ + + + + 4.0.0 + org.apache.tomcat + tomcat-jni + @MAVEN.DEPLOY.VERSION@ + Interface code to the native connector + Propchange: tomcat/trunk/res/maven/tomcat-jni.pom -- svn:eol-style = native Added: tomcat/trunk/res/maven/tomcat-spdy.pom URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-spdy.pom?rev=1307575&view=auto == --- tomcat/trunk/res/maven/tomcat-spdy.pom (added)
Re: [GUMP@vmgump]: Project tomcat-trunk-test (in module tomcat-trunk) failed
On 30/03/2012 19:41, Mark Thomas wrote: > The Maven publishing for the new JARs still needs to be fixed. Done. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [GUMP@vmgump]: Project tomcat-trunk-test (in module tomcat-trunk) failed
Costin broke the unit tests for Gump when the jni classes were moved to a separate JAR. I've hopefully fixed this so we should be good to go with the next Gump run. The Maven publishing for the new JARs still needs to be fixed. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn propchange: r1307514 - svn:log
Author: markt Revision: 1307514 Modified property: svn:log Modified: svn:log at Fri Mar 30 18:19:30 2012 -- --- svn:log (original) +++ svn:log Fri Mar 30 18:19:30 2012 @@ -0,0 +1 @@ +Revert r758664 and the fix for bug 46915 since the bug is invalid since the EL specification requires the behaviour that bug objects to. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1307514 - in /tomcat/tc7.0.x/trunk: ./ java/javax/el/ResourceBundleELResolver.java test/javax/el/TestResourceBundleELResolver.java webapps/docs/changelog.xml
2012/3/30 : > Author: markt > Date: Fri Mar 30 16:33:49 2012 > New Revision: 1307514 > > URL: http://svn.apache.org/viewvc?rev=1307514&view=rev > Log: (empty) Log message above is missing. > > Added: > tomcat/tc7.0.x/trunk/test/javax/el/TestResourceBundleELResolver.java > - copied unchanged from r1307512, > tomcat/trunk/test/javax/el/TestResourceBundleELResolver.java > Modified: > tomcat/tc7.0.x/trunk/ (props changed) > tomcat/tc7.0.x/trunk/java/javax/el/ResourceBundleELResolver.java > tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml > > Propchange: tomcat/tc7.0.x/trunk/ > -- > Merged /tomcat/trunk:r1307511-1307512 > Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 53001] Behaviour of ResourceBundleELResolver
https://issues.apache.org/bugzilla/show_bug.cgi?id=53001 --- Comment #5 from b.diedrich...@googlemail.com 2012-03-30 18:09:37 UTC --- Thank you Mark, this was really a quick resolution of the issue. -- 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 46915] Unable to get ResourceBundle keys in Tomcat 6
https://issues.apache.org/bugzilla/show_bug.cgi?id=46915 Mark Thomas changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||INVALID -- 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 46915] Unable to get ResourceBundle keys in Tomcat 6
https://issues.apache.org/bugzilla/show_bug.cgi?id=46915
Mark Thomas changed:
What|Removed |Added
Status|RESOLVED|REOPENED
Resolution|FIXED |
--- Comment #3 from Mark Thomas 2012-03-30 16:37:20 UTC ---
This bug should have been resolved as INVALID since the behaviour complained
about is required by the EL specification.
There is no way to avoid this in Tomcat 6 but in Tomcat 7 onwards
${messageString.resourceBundle.getKeys()} can be used.
The regression was reported as bug 53001.
--
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 53001] Behaviour of ResourceBundleELResolver
https://issues.apache.org/bugzilla/show_bug.cgi?id=53001 Mark Thomas changed: What|Removed |Added Component|Servlet & JSP API |Jasper Version|unspecified |6.0.35 Product|Tomcat 7|Tomcat 6 Target Milestone|--- |default --- Comment #4 from Mark Thomas 2012-03-30 16:35:59 UTC --- Fixed in trunk and 7.0.x and will be included in 7.0.27 onwards. The fixed has been 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
svn commit: r1307518 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Fri Mar 30 16:35:12 2012 New Revision: 1307518 URL: http://svn.apache.org/viewvc?rev=1307518&view=rev Log: Propose patch 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=1307518&r1=1307517&r2=1307518&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Mar 30 16:35:12 2012 @@ -170,7 +170,14 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?view=revision&revision=1084109 +1: markt, kkolinko -1: - + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53001 + Revert the fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=46915 + since the use case described in bug 46915 is invalid as it breaks the EL + specification. + +1: markt + -1: + PATCHES/ISSUES THAT ARE STALLED - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1307514 - in /tomcat/tc7.0.x/trunk: ./ java/javax/el/ResourceBundleELResolver.java test/javax/el/TestResourceBundleELResolver.java webapps/docs/changelog.xml
Author: markt
Date: Fri Mar 30 16:33:49 2012
New Revision: 1307514
URL: http://svn.apache.org/viewvc?rev=1307514&view=rev
Log: (empty)
Added:
tomcat/tc7.0.x/trunk/test/javax/el/TestResourceBundleELResolver.java
- copied unchanged from r1307512,
tomcat/trunk/test/javax/el/TestResourceBundleELResolver.java
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/javax/el/ResourceBundleELResolver.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1307511-1307512
Modified: tomcat/tc7.0.x/trunk/java/javax/el/ResourceBundleELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/el/ResourceBundleELResolver.java?rev=1307514&r1=1307513&r2=1307514&view=diff
==
--- tomcat/tc7.0.x/trunk/java/javax/el/ResourceBundleELResolver.java (original)
+++ tomcat/tc7.0.x/trunk/java/javax/el/ResourceBundleELResolver.java Fri Mar 30
16:33:49 2012
@@ -33,18 +33,20 @@ public class ResourceBundleELResolver ex
@Override
public Object getValue(ELContext context, Object base, Object property)
-throws NullPointerException, PropertyNotFoundException,
ELException {
+throws NullPointerException, PropertyNotFoundException,
+ELException {
+
if (context == null) {
throw new NullPointerException();
}
if (base instanceof ResourceBundle) {
+context.setPropertyResolved(true);
+
if (property != null) {
try {
-Object result = ((ResourceBundle) base).getObject(property
+return ((ResourceBundle) base).getObject(property
.toString());
-context.setPropertyResolved(true);
-return result;
} catch (MissingResourceException mre) {
return "???" + property.toString() + "???";
}
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=1307514&r1=1307513&r2=1307514&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Mar 30 16:33:49 2012
@@ -213,6 +213,11 @@
52970: Take account of coercion rules when invoking methods
via EL. (markt)
+
+53001: Revert the fix for 46915 since the use
case
+described in the bug is invalid since it breaks the EL specification.
+(markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1307512 - /tomcat/trunk/test/javax/el/TestResourceBundleELResolver.java
Author: markt
Date: Fri Mar 30 16:31:10 2012
New Revision: 1307512
URL: http://svn.apache.org/viewvc?rev=1307512&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53001
Add a test case
Added:
tomcat/trunk/test/javax/el/TestResourceBundleELResolver.java (with props)
Added: tomcat/trunk/test/javax/el/TestResourceBundleELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/javax/el/TestResourceBundleELResolver.java?rev=1307512&view=auto
==
--- tomcat/trunk/test/javax/el/TestResourceBundleELResolver.java (added)
+++ tomcat/trunk/test/javax/el/TestResourceBundleELResolver.java Fri Mar 30
16:31:10 2012
@@ -0,0 +1,78 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package javax.el;
+
+import java.util.Enumeration;
+import java.util.ListResourceBundle;
+import java.util.ResourceBundle;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import org.apache.jasper.el.ELContextImpl;
+
+public class TestResourceBundleELResolver {
+
+@Test
+public void bug53001() {
+ExpressionFactory factory = ExpressionFactory.newInstance();
+ELContext context = new ELContextImpl();
+
+ResourceBundle rb = new TesterResourceBundle();
+
+ValueExpression var =
+factory.createValueExpression(rb, ResourceBundle.class);
+context.getVariableMapper().setVariable("rb", var);
+
+
+ValueExpression ve = factory.createValueExpression(
+context, "${rb.keys}", String.class);
+
+MethodExpression me = factory.createMethodExpression(
+context, "${rb.getKeys()}", Enumeration.class, null);
+
+// Ensure we are specification compliant
+String result1 = (String) ve.getValue(context);
+Assert.assertEquals("???keys???", result1);
+
+// Check that the method expression does return the keys
+Object result2 = me.invoke(context, null);
+Assert.assertTrue(result2 instanceof Enumeration);
+@SuppressWarnings("unchecked")
+Enumeration e = (Enumeration) result2;
+
+Assert.assertTrue(e.hasMoreElements());
+Assert.assertEquals("key2", e.nextElement());
+Assert.assertTrue(e.hasMoreElements());
+Assert.assertEquals("key1", e.nextElement());
+Assert.assertFalse(e.hasMoreElements());
+}
+
+
+private static class TesterResourceBundle extends ListResourceBundle {
+
+@Override
+protected Object[][] getContents() {
+return contents;
+}
+
+private static final Object[][] contents = {
+{"key1","value1"},
+{"key2","value2"}
+};
+}
+}
Propchange: tomcat/trunk/test/javax/el/TestResourceBundleELResolver.java
--
svn:eol-style = native
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1307511 - /tomcat/trunk/java/javax/el/ResourceBundleELResolver.java
Author: markt
Date: Fri Mar 30 16:30:37 2012
New Revision: 1307511
URL: http://svn.apache.org/viewvc?rev=1307511&view=rev
Log:
Revert r758664 and the fix for bug 46915 since the bug is invalid since the EL
specification requires the behaviour that bug objects to.
Modified:
tomcat/trunk/java/javax/el/ResourceBundleELResolver.java
Modified: tomcat/trunk/java/javax/el/ResourceBundleELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ResourceBundleELResolver.java?rev=1307511&r1=1307510&r2=1307511&view=diff
==
--- tomcat/trunk/java/javax/el/ResourceBundleELResolver.java (original)
+++ tomcat/trunk/java/javax/el/ResourceBundleELResolver.java Fri Mar 30
16:30:37 2012
@@ -33,18 +33,20 @@ public class ResourceBundleELResolver ex
@Override
public Object getValue(ELContext context, Object base, Object property)
-throws NullPointerException, PropertyNotFoundException,
ELException {
+throws NullPointerException, PropertyNotFoundException,
+ELException {
+
if (context == null) {
throw new NullPointerException();
}
if (base instanceof ResourceBundle) {
+context.setPropertyResolved(true);
+
if (property != null) {
try {
-Object result = ((ResourceBundle) base).getObject(property
+return ((ResourceBundle) base).getObject(property
.toString());
-context.setPropertyResolved(true);
-return result;
} catch (MissingResourceException mre) {
return "???" + property.toString() + "???";
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-trunk-test (in module tomcat-trunk) 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 tomcat-trunk-test has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test : Tomcat 8.x, a web server implementing Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-trunk-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -DEBUG- Dependency on tomcat-trunk-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/build/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/gump_work/build_tomcat-trunk_tomcat-trunk-test.html Work Name: build_tomcat-trunk_tomcat-trunk-test (Type: Build) Work ended in a state of : Failed Elapsed: 12 secs Command Line: /usr/lib/jvm/java-6-openjdk/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/dist/junit-30032012.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-30032012-native-src.tar.gz -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-30032012-native-src.tar.gz -Dexamples.sources.skip=true -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps -Djdt.jar=/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-30032012.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-src.jar -Dtest.accesslog=true -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dcommons-dbcp.home=/ srv/gump/public/workspace/commons-dbcp-1.x -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-30032012.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-6-openjdk/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.jar:/srv/gump/public/workspace/tomcat-trunk/outp ut/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-util.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jaf-1.1ea/activation.jar:/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar:/srv/gump/public/workspace/tomcat-tr unk/tomcat-deps/tomcat-dbcp-30032012.jar:/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-30032012.jar:/srv/gump/public/workspace/junit/dist/junit-30032012.jar -
DO NOT REPLY [Bug 53001] Behaviour of ResourceBundleELResolver
https://issues.apache.org/bugzilla/show_bug.cgi?id=53001 --- Comment #3 from Mark Thomas 2012-03-30 15:23:19 UTC --- No change in the spec. I failed to check the EL spec before I fixed bug 46915. If I had, that would have been resolved as INVALID. It looks like EL 2.2 (Tomcat 7) has some new features that would allow the requirement in bug 46915 to be met. Time to write some unit tests. -- 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 52744] [Jasper] JSP files are always recompiled in development mode
https://issues.apache.org/bugzilla/show_bug.cgi?id=52744 --- Comment #11 from Mark Thomas 2012-03-30 15:20:19 UTC --- (In reply to comment #10) > When JASPER read a jsp file timestamp from a jar, it could get a precise time That is not possible. JAR uses the zip format and that uses a 2s precision for timestamps. At this point in time I simply can't see how - based on the information provided so far - that the problem described in the original report can happen. Hence the NEEDINFO state. Unless someone steps up and provides the necessary information that explains how to reproduce this issue then this will eventually get resolved as INVALID. -- 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 52744] [Jasper] JSP files are always recompiled in development mode
https://issues.apache.org/bugzilla/show_bug.cgi?id=52744
--- Comment #10 from xiaming 2012-03-30 14:24:24 UTC ---
This happens in an OSGi application EBA, the web module in deployed EBA won't
be extracted into file system, instead it is still in jar file. When JASPER
read a jsp file timestamp from a jar, it could get a precise time, while the
compiled jsp .class file is read from the file system, the time precision is
not good as the one read from jar file.
In OSGi world, the code piece will be called, the uc is an instance of
JarURLConnection, so the precise time will be returned for jspRealLastModified.
uc = jspUrl.openConnection();
if (uc instanceof JarURLConnection) {
result = ((JarURLConnection) uc).getJarEntry().getTime();
} else {
result = uc.getLastModified();
}
--
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 52918] Add WebSocket Support to Tomcat 6
https://issues.apache.org/bugzilla/show_bug.cgi?id=52918 mike_mac changed: What|Removed |Added CC||mike_mac...@yahoo.com -- 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 53008] New: New test case for Basic Authenticator
https://issues.apache.org/bugzilla/show_bug.cgi?id=53008 Bug #: 53008 Summary: New test case for Basic Authenticator Product: Tomcat 7 Version: trunk Platform: PC OS/Version: Linux Status: NEW Severity: enhancement Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: br...@pingtoo.com Classification: Unclassified Created attachment 28519 --> https://issues.apache.org/bugzilla/attachment.cgi?id=28519 patch file for test org.apache.catalina.authenticator.TestNonLoginAndBasicAuthenticator RFC2617 states the authentication scheme is case-insensitive. A new test case has been added which confirms that tomcat already complies with the requirement. The attached patch file passes checkstyle and all tests run successfully against the trunk. -- 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: Time for 7.0.27
2012/3/28 Konstantin Kolinko : > 2012/3/27 Mark Thomas : >> The 7.0.x change log is looking long again and with the only open TC7 >> bugs in NEEDINFO state, I am going to start the process of rolling the >> 7.0.27 release. >> >> I'm not going to tag 7.0.27 until I've confirmed that all the various >> tests pass and they'll probably take a day or so to run. >> > > There are two issues that I know > 1) a problem from r1210012 > 2) performance issue with ExpressionFactory.newInstance(), reported in > [1] on dev@ > > [1] http://tomcat.markmail.org/thread/7bbvzmkvyvryvn44 > > I'll commit interim fix for 1) shortly and add 2) to bugzilla. > Regarding 2). It is filed as https://issues.apache.org/bugzilla/show_bug.cgi?id=52998 I attached a patch to the issue. Please take a look. It does not solve all the issues mentioned in BZ though. One would have to dig into Jasper for the rest of those. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52998] Performance issue with ExpressionFactory.newInstance()
https://issues.apache.org/bugzilla/show_bug.cgi?id=52998 --- Comment #1 from Konstantin Kolinko 2012-03-30 10:15:35 UTC --- Created attachment 28518 --> https://issues.apache.org/bugzilla/attachment.cgi?id=28518 2012-03-30_tc8_52998_ExpressionFactory.patch Patch against trunk that implements caching in ExpressionFactory. Notes: 1. r1307310 should be ported to 7.0.x before this patch. Maybe whitespace cleanup r1187778 shall be ported as well. 2. This patch only implements the caching. The issue with static references mentioned in Comment 0 is not addressed. 3. There is no way to clean stale cache entries from stopped webapps, but the cache entry objects are small, so I think we can live with it. Weak references are used, so the class loaders from undeployed apps should be eligible for garbage collection. -- 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 53001] Behaviour of ResourceBundleELResolver
https://issues.apache.org/bugzilla/show_bug.cgi?id=53001 --- Comment #2 from b.diedrich...@googlemail.com 2012-03-30 10:09:43 UTC --- Thanks for the quick reply. I did not check the spec so wasn't aware that the current behaviour actually violates the el specs. Why was the fix for bug 46915 done in the first place? Did the specs change from then to now? Anyways, keep up the good work. Tomcat is an impressive and very reliable product. -- 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 46915] Unable to get ResourceBundle keys in Tomcat 6
https://issues.apache.org/bugzilla/show_bug.cgi?id=46915 Mark Thomas changed: What|Removed |Added Attachment #23417|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 53001] Behaviour of ResourceBundleELResolver
https://issues.apache.org/bugzilla/show_bug.cgi?id=53001 --- Comment #1 from Mark Thomas 2012-03-30 09:37:02 UTC --- Tomcat is no longer following the EL spec. The behaviour prior to the fix for bug 46915 was correct. I'm not sure it is possible to fix bug 46915 and be specification compliant. I'll revert the fix for bug 46915, put together some test cases and see what I can come up with. Depending on how well things go, bug 46915 will either stay as FIXED or be changed to INVALID. -- 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: Jenkins configuration
2012/3/30 Jeremy Boynes : > On Mar 29, 2012, at 8:22 AM, Olivier Lamy wrote: >> 2012/3/29 Jeremy Boynes : > ... >>> However, we are also getting errors about the effective path of parent >>> files which I believe is caused because the aggregating pom in trunks is >>> not actually the parent of the modules it contains. This is because the >>> structure of taglibs was as four projects intended to be released >>> independently (parent, standard, rdc and extended) and not intended to be >>> built as one. >>> >> but the parent is in reactors (i.e. a module in the aggregator pom) so >> not an issue. > > Maybe not now but it is causing Maven to warn: > [WARNING] > [WARNING] Some problems were encountered while building the effective model > for org.apache.taglibs:taglibs-parent:pom:4-SNAPSHOT > [WARNING] 'parent.relativePath' points at > org.apache.tomcat.taglibs:taglibs-aggregator instead of org.apache:apache, > please verify your project structure @ line 20, column 11 > ... > [WARNING] It is highly recommended to fix these problems because they > threaten the stability of your build. > [WARNING] > [WARNING] For this reason, future Maven versions might no longer support > building such malformed projects. > > [ >>> I propose we keep that split in Jenkins and re-configure it into 4 projects >>> matching what would be released. That would also remove the aggregator stub >>> trunks. >> I like the idea about building all in one shot (at least for lazy >> maintenance convenience :-) ) > > It may be more convenient but it's not how we would do a release build. Each > of those libraries has different levels of activity and would be released > separately - that's what we should be building. Building them together > increases the risk of unexpected cross-project issues. It's also building > more than is impacted by any change. > all set. Note snapshots are automatically deployed to https://repository.apache.org/content/repositories/snapshots . > -- > Jeremy > > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > -- Olivier Lamy Talend: http://coders.talend.com http://twitter.com/olamy | http://linkedin.com/in/olamy - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1307310 - /tomcat/trunk/java/javax/el/ExpressionFactory.java
Author: kkolinko
Date: Fri Mar 30 08:47:15 2012
New Revision: 1307310
URL: http://svn.apache.org/viewvc?rev=1307310&view=rev
Log:
Refactoring. Move classname discovery into separate helper method.
Modified:
tomcat/trunk/java/javax/el/ExpressionFactory.java
Modified: tomcat/trunk/java/javax/el/ExpressionFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ExpressionFactory.java?rev=1307310&r1=1307309&r2=1307310&view=diff
==
--- tomcat/trunk/java/javax/el/ExpressionFactory.java (original)
+++ tomcat/trunk/java/javax/el/ExpressionFactory.java Fri Mar 30 08:47:15 2012
@@ -115,47 +115,10 @@ public abstract class ExpressionFactory
* @return the new ExpressionFactory
*/
public static ExpressionFactory newInstance(Properties properties) {
-String className = null;
ExpressionFactory result = null;
ClassLoader tccl = Thread.currentThread().getContextClassLoader();
-
-// First services API
-className = getClassNameServices(tccl);
-if (className == null) {
-if (IS_SECURITY_ENABLED) {
-className = AccessController.doPrivileged(
-new PrivilegedAction() {
-@Override
-public String run() {
-return getClassNameJreDir();
-}
-}
-);
-} else {
-// Second el.properties file
-className = getClassNameJreDir();
-}
-}
-if (className == null) {
-if (IS_SECURITY_ENABLED) {
-className = AccessController.doPrivileged(
-new PrivilegedAction() {
-@Override
-public String run() {
-return getClassNameSysProp();
-}
-}
-);
-} else {
-// Third system property
-className = getClassNameSysProp();
-}
-}
-if (className == null) {
-// Fourth - default
-className = "org.apache.el.ExpressionFactoryImpl";
-}
+String className = discoverClassName(tccl);
try {
Class clazz = null;
@@ -215,6 +178,55 @@ public abstract class ExpressionFactory
return result;
}
+/**
+ * Discover the name of class that implements ExpressionFactory.
+ *
+ * @param tccl
+ *{@code ClassLoader}
+ * @return Class name. There is default, so it is never {@code null}.
+ */
+private static String discoverClassName(ClassLoader tccl) {
+String className = null;
+
+// First services API
+className = getClassNameServices(tccl);
+if (className == null) {
+if (IS_SECURITY_ENABLED) {
+className = AccessController.doPrivileged(
+new PrivilegedAction() {
+@Override
+public String run() {
+return getClassNameJreDir();
+}
+}
+);
+} else {
+// Second el.properties file
+className = getClassNameJreDir();
+}
+}
+if (className == null) {
+if (IS_SECURITY_ENABLED) {
+className = AccessController.doPrivileged(
+new PrivilegedAction() {
+@Override
+public String run() {
+return getClassNameSysProp();
+}
+}
+);
+} else {
+// Third system property
+className = getClassNameSysProp();
+}
+}
+if (className == null) {
+// Fourth - default
+className = "org.apache.el.ExpressionFactoryImpl";
+}
+return className;
+}
+
private static String getClassNameServices(ClassLoader tccl) {
InputStream is = null;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
