[Bug 57431] New: Enable custom context implementation when using embedded tomcat
https://issues.apache.org/bugzilla/show_bug.cgi?id=57431 Bug ID: 57431 Summary: Enable custom context implementation when using embedded tomcat Product: Tomcat 9 Version: unspecified Hardware: All OS: All Status: NEW Severity: minor Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: felix.schumac...@internetallee.de Created attachment 32362 --> https://issues.apache.org/bugzilla/attachment.cgi?id=32362&action=edit Enable custom context class when using embedded tomcat When creating a context with the embedded tomcat it will always use the StandardContext and ignore the context class that was setup in the host. The attached patch will try to use the configured class from the host. -- 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 57425] ReplicatedContext implementation throws NullPointerException for attributes with null value
https://issues.apache.org/bugzilla/show_bug.cgi?id=57425 Felix Schumacher changed: What|Removed |Added Attachment #32358|0 |1 is obsolete|| --- Comment #4 from Felix Schumacher --- Created attachment 32363 --> https://issues.apache.org/bugzilla/attachment.cgi?id=32363&action=edit Don't add context attribute if it is null Don't add a context attribute if its value or name is null. For the test case the bugfix 57431 will have to be applied. -- 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
Deadlock while running tests on tomcat9
Hi all, while running "ant test" on current trunk from tomcat 9 a deadlock occurred. I attach the thread dump which shows the dead lock. Regards Felix 2015-01-11 15:18:32 Full thread dump Java HotSpot(TM) 64-Bit Server VM (25.25-b02 mixed mode): "Attach Listener" #78 daemon prio=9 os_prio=0 tid=0x7f4f6c001000 nid=0x70fe waiting on condition [0x] java.lang.Thread.State: RUNNABLE "http-nio2-127.0.0.1-auto-5-exec-3" #77 daemon prio=5 os_prio=0 tid=0x7f4f1810 nid=0x7082 waiting for monitor entry [0x7f4f5add9000] java.lang.Thread.State: BLOCKED (on object monitor) at org.apache.tomcat.util.net.Nio2Endpoint$SocketProcessor.run(Nio2Endpoint.java:1548) - waiting to lock <0xf0adaa58> (a org.apache.tomcat.util.net.Nio2Endpoint$Nio2SocketWrapper) at org.apache.tomcat.util.net.Nio2Endpoint.processSocket0(Nio2Endpoint.java:571) at org.apache.tomcat.util.net.Nio2Endpoint.processSocket(Nio2Endpoint.java:556) at org.apache.tomcat.util.net.Nio2Endpoint$Nio2SocketWrapper$4.completed(Nio2Endpoint.java:880) at org.apache.tomcat.util.net.Nio2Endpoint$Nio2SocketWrapper$4.completed(Nio2Endpoint.java:842) at sun.nio.ch.Invoker.invokeUnchecked(Invoker.java:126) at sun.nio.ch.Invoker.invokeDirect(Invoker.java:157) at sun.nio.ch.UnixAsynchronousSocketChannelImpl.implWrite(UnixAsynchronousSocketChannelImpl.java:736) at sun.nio.ch.AsynchronousSocketChannelImpl.write(AsynchronousSocketChannelImpl.java:382) at sun.nio.ch.AsynchronousSocketChannelImpl.write(AsynchronousSocketChannelImpl.java:416) at org.apache.tomcat.util.net.Nio2Channel.write(Nio2Channel.java:167) at org.apache.tomcat.util.net.Nio2Endpoint$Nio2SocketWrapper$4.completed(Nio2Endpoint.java:864) - locked <0xf0adaca8> (a org.apache.tomcat.util.net.Nio2Endpoint$Nio2SocketWrapper$3) at org.apache.tomcat.util.net.Nio2Endpoint$Nio2SocketWrapper$4.completed(Nio2Endpoint.java:842) at sun.nio.ch.Invoker.invokeUnchecked(Invoker.java:126) at sun.nio.ch.Invoker.invokeDirect(Invoker.java:157) at sun.nio.ch.UnixAsynchronousSocketChannelImpl.implWrite(UnixAsynchronousSocketChannelImpl.java:736) at sun.nio.ch.AsynchronousSocketChannelImpl.write(AsynchronousSocketChannelImpl.java:382) at sun.nio.ch.AsynchronousSocketChannelImpl.write(AsynchronousSocketChannelImpl.java:416) at org.apache.tomcat.util.net.Nio2Channel.write(Nio2Channel.java:167) at org.apache.tomcat.util.net.Nio2Endpoint$Nio2SocketWrapper$4.completed(Nio2Endpoint.java:864) - locked <0xf0adaca8> (a org.apache.tomcat.util.net.Nio2Endpoint$Nio2SocketWrapper$3) at org.apache.tomcat.util.net.Nio2Endpoint$Nio2SocketWrapper$4.completed(Nio2Endpoint.java:842) at sun.nio.ch.Invoker.invokeUnchecked(Invoker.java:126) at sun.nio.ch.Invoker.invokeDirect(Invoker.java:157) at sun.nio.ch.UnixAsynchronousSocketChannelImpl.implWrite(UnixAsynchronousSocketChannelImpl.java:736) at sun.nio.ch.AsynchronousSocketChannelImpl.write(AsynchronousSocketChannelImpl.java:382) at sun.nio.ch.AsynchronousSocketChannelImpl.write(AsynchronousSocketChannelImpl.java:416) at org.apache.tomcat.util.net.Nio2Channel.write(Nio2Channel.java:167) at org.apache.tomcat.util.net.Nio2Endpoint$Nio2SocketWrapper$4.completed(Nio2Endpoint.java:864) - locked <0xf0adaca8> (a org.apache.tomcat.util.net.Nio2Endpoint$Nio2SocketWrapper$3) at org.apache.tomcat.util.net.Nio2Endpoint$Nio2SocketWrapper$4.completed(Nio2Endpoint.java:842) at sun.nio.ch.Invoker.invokeUnchecked(Invoker.java:126) at sun.nio.ch.Invoker.invokeDirect(Invoker.java:157) at sun.nio.ch.UnixAsynchronousSocketChannelImpl.implWrite(UnixAsynchronousSocketChannelImpl.java:736) at sun.nio.ch.AsynchronousSocketChannelImpl.write(AsynchronousSocketChannelImpl.java:382) at sun.nio.ch.AsynchronousSocketChannelImpl.write(AsynchronousSocketChannelImpl.java:416) at org.apache.tomcat.util.net.Nio2Channel.write(Nio2Channel.java:167) at org.apache.tomcat.util.net.Nio2Endpoint$Nio2SocketWrapper$4.completed(Nio2Endpoint.java:864) - locked <0xf0adaca8> (a org.apache.tomcat.util.net.Nio2Endpoint$Nio2SocketWrapper$3) at org.apache.tomcat.util.net.Nio2Endpoint$Nio2SocketWrapper$4.completed(Nio2Endpoint.java:842) at sun.nio.ch.Invoker.invokeUnchecked(Invoker.java:126) at sun.nio.ch.Invoker.invokeDirect(Invoker.java:157) at sun.nio.ch.UnixAsynchronousSocketChannelImpl.implWrite(UnixAsynchronousSocketChannelImpl.java:736) at sun.nio.ch.AsynchronousSocketChannelImpl.write(AsynchronousSocketChannelImpl.java:382) at sun.nio.ch.AsynchronousSocketChannelImpl.write(AsynchronousSocketChannelImpl.java:416) at org.apache.tomcat.util.net.Nio2Channel.write(N
[Bug 57432] New: Incorrect values for SSL_OP_NO_TLSv1_1 and SSL_OP_NO_TLSv1_2
https://issues.apache.org/bugzilla/show_bug.cgi?id=57432 Bug ID: 57432 Summary: Incorrect values for SSL_OP_NO_TLSv1_1 and SSL_OP_NO_TLSv1_2 Product: Tomcat Native Version: 1.1.32 Hardware: All OS: All Status: NEW Severity: normal Priority: P2 Component: Library Assignee: dev@tomcat.apache.org Reporter: jpin...@twitter.com Bug 53952 added support for TLS 1.1 and TLS 1.2 and added the following constants (from jni/java/org/apache/tomcat/jni/SSL.java) public static final int SSL_OP_NO_TLSv1_1 = 0x0800; public static final int SSL_OP_NO_TLSv1_2 = 0x1000; that get passed into OpenSSl's SSL_CTX_set_options (see jni/native/src/sslcontext.c). OpenSSL however defines these constants out-of-order (from ssl/ssl.h): #define SSL_OP_NO_TLSv1_2 0x0800L #define SSL_OP_NO_TLSv1_1 0x1000L The result is that defining "SSL_OP_NO_TLSv1_1" instead disables support for TLS 1.2 (and vice-versa). -- 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 57433] New: Double-check locking in ExpressionEvaluatorManager
https://issues.apache.org/bugzilla/show_bug.cgi?id=57433 Bug ID: 57433 Summary: Double-check locking in ExpressionEvaluatorManager Product: Taglibs Version: 1.2.1 Hardware: All OS: All Status: NEW Severity: minor Priority: P2 Component: Standard Taglib Assignee: dev@tomcat.apache.org Reporter: jboy...@apache.org http://svn.apache.org/viewvc/tomcat/taglibs/standard/tags/taglibs-standard-1.2.1/jstlel/src/main/java/org/apache/taglibs/standard/lang/support/ExpressionEvaluatorManager.java?view=markup#l103 The default implementation, org.apache.taglibs.standard.lang.jstl.Evaluator, does not have any instance fields so we may not see issues in the wild. The taglibs code specifies a constant value for the name so it will always use that implementation. However, other implementations stored in the cache may not be safe. -- 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 57433] Double-check locking in ExpressionEvaluatorManager
https://issues.apache.org/bugzilla/show_bug.cgi?id=57433 Jeremy Boynes changed: What|Removed |Added Depends on||25967 -- 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 25967] getEvaluatorByName is synchronized
https://issues.apache.org/bugzilla/show_bug.cgi?id=25967 Jeremy Boynes changed: What|Removed |Added Blocks||57433 -- 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: Performance change
On 09/01/2015 23:57, Rémy Maucherat wrote: > 2015-01-09 22:44 GMT+01:00 Mark Thomas : > >>> I made a mistake, which also made me think that the NIO connector didn't >>> suffer from the NPE. In the end, there's no significant improvement >> there. >> >> That matches my results. NIO is about the same in 8.0.x and 9.0.x for me. >> The other thing to keep in mind is that these performance figures could easily shift a lot further as the code clean-up continues. We should defer any decision about removing an implementation until after the refactoring is complete. Looking further ahead, the HTTP/2 work may impact performance as well. On balance I think we should keep all three implementations since there are always likely to be loads that are better suited to one implementation than the others. >>> No problem with that. >> >> Bingo. The tweaks I made might have provided a few % points but it is >> the buffering that makes all the difference. I have a local hack that >> restores it for NIO2 and performance immediately goes up by ~15%. Rather >> than commit this hack, I am going to work on a more general fix. I >> should have something early next week. >> > Ok, good to know. I wonder if the NIO connector IO is optimal, I'll have > some time to look at it relatively soon, probably. Just for info, I have found that none of the non-blocking IO (including that used by the WebSocket impl) was using the socket write buffer. I'm making good progress refactoring things so everything is buffered by default but it has triggered a lot of bugs that need fixing by inserting a ServletOutputStream.flush() at an appropriate point. This might turn into something that causes apps issues (if indeed any apps at all are using the HTTP upgrade API). If this is the case we can add an option to always flush an upgraded OutputStream after a write but for now I plan to leave this as a TODO. My impressions of performance so far is good but I want to do some side by side comparisons of 8.0.x vs 9.0.x for various cases once I have the refactoring complete to see what the real differences are. If it turns out to be positive, I may see if I can structure an ApacheCon talk out of it. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Deadlock while running tests on tomcat9
On 11/01/2015 15:16, Felix Schumacher wrote: > Hi all, > > while running "ant test" on current trunk from tomcat 9 a deadlock > occurred. > > I attach the thread dump which shows the dead lock. I can see how this happened. I'll include a fix for this in my buffering refactoring. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1650974 - in /tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard: lang/jstl/Evaluator.java lang/support/ExpressionEvaluator.java lang/support/ExpressionEvaluat
Author: jboynes Date: Sun Jan 11 21:36:58 2015 New Revision: 1650974 URL: http://svn.apache.org/r1650974 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57433 Use a ConcurrentMap for the cache. However, as our code always uses the same implementation, use a single instance of that and deprecate public access to the cache. Also includes some Java5 TLC. Modified: tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/Evaluator.java tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/support/ExpressionEvaluator.java tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/support/ExpressionEvaluatorManager.java tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/el/ValidationUtil.java Modified: tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/Evaluator.java URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/Evaluator.java?rev=1650974&r1=1650973&r2=1650974&view=diff == --- tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/Evaluator.java (original) +++ tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/Evaluator.java Sun Jan 11 21:36:58 2015 @@ -76,11 +76,9 @@ public class Evaluator return MessageFormat.format (Constants.ATTRIBUTE_PARSE_EXCEPTION, -new Object[]{ -"" + pAttributeName, -"" + pAttributeValue, -exc.getMessage() -}); +"" + pAttributeName, +"" + pAttributeValue, +exc.getMessage()); } } @@ -109,12 +107,10 @@ public class Evaluator throw new JspException (MessageFormat.format (Constants.ATTRIBUTE_EVALUATION_EXCEPTION, -new Object[]{ -"" + pAttributeName, -"" + pAttributeValue, -exc.getMessage(), -exc.getRootCause() -}), exc.getRootCause()); +"" + pAttributeName, +"" + pAttributeValue, +exc.getMessage(), +exc.getRootCause()), exc.getRootCause()); } } @@ -154,11 +150,9 @@ public class Evaluator throw new JspException (MessageFormat.format (Constants.ATTRIBUTE_PARSE_EXCEPTION, -new Object[]{ -"test", -"" + pAttributeValue, -exc.getMessage() -})); +"test", +"" + pAttributeValue, +exc.getMessage())); } } Modified: tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/support/ExpressionEvaluator.java URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/support/ExpressionEvaluator.java?rev=1650974&r1=1650973&r2=1650974&view=diff == --- tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/support/ExpressionEvaluator.java (original) +++ tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/support/ExpressionEvaluator.java Sun Jan 11 21:36:58 2015 @@ -43,8 +43,7 @@ public interface ExpressionEvaluator { /** * Translation time validation of an expression. - * This method will return a null String if the expression - * is valid; otherwise an error message. + * This method will return a null String if the expression is valid; otherwise an error message. */ public String validate(String attributeName, String expression); Modified: tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/support/ExpressionEvaluatorManager.java URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standar
[Bug 57433] Double-check locking in ExpressionEvaluatorManager
https://issues.apache.org/bugzilla/show_bug.cgi?id=57433 Jeremy Boynes changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Jeremy Boynes --- Fixed in http://svn.apache.org/r1650974 As our code always uses our implementation, use a single instance of that. Deprecate the public method that provides access to the cache in anticipation of removal in a future major version. -- 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 57434] New: Race condition in EL1.0 validation
https://issues.apache.org/bugzilla/show_bug.cgi?id=57434 Bug ID: 57434 Summary: Race condition in EL1.0 validation Product: Taglibs Version: 1.2.1 Hardware: All OS: All Status: NEW Severity: normal Priority: P2 Component: Standard Taglib Assignee: dev@tomcat.apache.org Reporter: jboy...@apache.org http://svn.apache.org/viewvc/tomcat/taglibs/standard/tags/taglibs-standard-1.2.1/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/Evaluator.java?view=markup#l70 Evaluator uses a single static instance of an ELEvaluator. As a result enabling and disabling the cache would apply to all validate and evaluate operations from all threads. This will result in unexpected behaviour if validation is performed on multiple threads concurrently. This is not an issue when the library is included with a web application as multiple copies of the Evaluator will be created for the different ClassLoaders (although that may have other unanticipated consequences). This may be an issue if the library is shared between applications. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-trunk-test-apr (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-apr has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-apr : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 23 mins 45 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150112-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20150112/lib -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150112.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150112-native-src.tar.gz -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest .openssl.path=/srv/gump/public/workspace/openssl/dest-20150112/bin/openssl -Dexecute.test.apr=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/public/workspace/hamcrest/build/hamcrest-all-20150112.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/output/bu ild/lib/tom
svn commit: r1651034 [1/2] - in /tomcat/taglibs/standard/trunk: compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/ compa
Author: jboynes Date: Mon Jan 12 04:20:20 2015 New Revision: 1651034 URL: http://svn.apache.org/r1651034 Log: Add missing tags and TLDs to standard-compat jar Added: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/ tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/BundleTag.java (with props) tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/FormatDateTag.java (with props) tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/FormatNumberTag.java (with props) tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/MessageTag.java (with props) tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/ParamTag.java (with props) tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/ParseDateTag.java (with props) tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/ParseNumberTag.java (with props) tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/RequestEncodingTag.java (with props) tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/SetBundleTag.java (with props) tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/SetLocaleTag.java (with props) tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/SetTimeZoneTag.java (with props) tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/TimeZoneTag.java (with props) tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/ tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/DateParamTag.java (with props) tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/ParamTag.java (with props) tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/QueryTag.java (with props) tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/SetDataSourceTag.java (with props) tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/TransactionTag.java (with props) tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/sql/UpdateTag.java (with props) tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/xml/ tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/xml/ExprTag.java (with props) tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/xml/ParamTag.java (with props) tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/xml/ParseTag.java (with props) tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/xml/TransformTag.java (with props) tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tlv/ tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tlv/compat/ tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tlv/compat/JstlELCoreTLV.java (with props) tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tlv/compat/JstlELFmtTLV.java - copied, changed from r1650930, tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/el/JstlELFmtTLV.java tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tlv/compat/JstlELSqlTLV.java - copied, changed from r1650930, tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/el/JstlELSqlTLV.java tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tlv/compat/JstlELXmlTLV.java - copied, changed from r1650930, tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tlv/el/JstlELXmlTLV.java tomcat/taglibs/standard/trunk/compat/src/main/resources/ tomcat/taglibs/standard/trunk/compat/src/main/resources/META-INF/ tomcat/taglibs/standard/trunk/compat/src/main/resources/META-INF/c-1_0.tld tomcat/taglibs/standard/trunk/compat/src/main/resources/META-INF/fmt-1_0.tld tomcat/taglibs/standard/trunk/compat/src/main/resources/META-INF/sql-1_0.tld tomcat/taglibs/standard/trunk/compat/src/main/resources/META-INF/x-1_0.tld Modified: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/tagli
svn commit: r1651034 [2/2] - in /tomcat/taglibs/standard/trunk: compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ compat/src/main/java/org/apache/taglibs/standard/tag/compat/fmt/ compa
Added: tomcat/taglibs/standard/trunk/compat/src/main/resources/META-INF/c-1_0.tld URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/src/main/resources/META-INF/c-1_0.tld?rev=1651034&view=auto == --- tomcat/taglibs/standard/trunk/compat/src/main/resources/META-INF/c-1_0.tld (added) +++ tomcat/taglibs/standard/trunk/compat/src/main/resources/META-INF/c-1_0.tld Mon Jan 12 04:20:20 2015 @@ -0,0 +1,432 @@ + + +http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd";> + +1.0 +1.2 +c +http://java.sun.com/jstl/core +JSTL core +JSTL 1.0 core library + + + +org.apache.taglibs.standard.tlv.compat.JstlELCoreTLV + + +expressionAttributes + +out:value +out:default +out:escapeXml +if:test +import:url +import:context +import:charEncoding +forEach:items +forEach:begin +forEach:end +forEach:step +forTokens:items +forTokens:begin +forTokens:end +forTokens:step +param:encode +param:name +param:value +redirect:context +redirect:url +set:property +set:target +set:value +url:context +url:value +when:test + + +Whitespace-separated list of colon-separated token pairs +describing tag:attribute combinations that accept expressions. +The validator uses this information to determine which +attributes need their syntax validated. + + + + + +catch + org.apache.taglibs.standard.tag.common.core.CatchTag +JSP + +Catches any Throwable that occurs in its body and optionally +exposes it. + + +var +false +false + + + + +choose + org.apache.taglibs.standard.tag.common.core.ChooseTag +JSP + +Simple conditional tag that establishes a context for +mutually exclusive conditional operations, marked by +and + + + + +out + org.apache.taglibs.standard.tag.compat.core.OutTag +JSP + +Like <%= ... >, but for expressions. + + +value +true +false + + +default +false +false + + +escapeXml +false +false + + + + +if + org.apache.taglibs.standard.tag.compat.core.IfTag +JSP + +Simple conditional tag, which evalutes its body if the +supplied condition is true and optionally exposes a Boolean +scripting variable representing the evaluation of this condition + + +test +true +false + + +var +false +false + + +scope +false +false + + + + +import + org.apache.taglibs.standard.tag.compat.core.ImportTag +org.apache.taglibs.standard.tei.ImportTEI +JSP + +Retrieves an absolute or relative URL and exposes its contents +to either the page, a String in 'var', or a Reader in 'varReader'. + + +url +true +false + + +var +false +false + + +scope +false +false + + +varReader +false +false + + +context +false +false + + +charEncoding +false +false + + + + +forEach + org.apache.taglibs.standard.tag.compat.core.ForEachTag +org.apache.taglibs.standard.tei.ForEachTEI +JSP + +The basic iteration tag, accepting many different +collection types and supporting subsetting and other +functionality + + +items +false +false + + +begin +false +false + + +end +false +false + + +step +false +false + + +var +false +
[Bug 57427] 1.0 TLDs are missing from -compat jar
https://issues.apache.org/bugzilla/show_bug.cgi?id=57427 Jeremy Boynes changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Jeremy Boynes --- Fixed in http://svn.apache.org/r1651034 -- 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