[RESULT] was: [VOTE] Release Apache Tomcat Connectors 1.2.35
With 4 binding +1 votes (Filip, Christopher, Henri and Mladen) and no other votes, I declare this vote as passed. I'll copy the artefacts over the weekend and post ANN on Monday by which time mirrors should sync. On 03/22/2012 02:46 PM, Mladen Turk wrote: Due to one bug that can crash httpd in case someone has typo in JkMount directive, 1.2.34 was cancelled and here is 1.2.35. The VOTE will remain open for at least 48 hours. [1] http://people.apache.org/~mturk/tomcat-connectors/jk-1.2.35/ Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r563 - in /release/tomcat/tomcat-connectors/jk: ./ binaries/windows/ binaries/windows/symbols/
Author: mturk Date: Sat Mar 24 13:53:29 2012 New Revision: 563 Log: Add 1.2.35 artefacts and remove old ones Added: release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.35-windows-i386-symbols.zip (with props) release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.35-windows-i386-symbols.zip.asc release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.35-windows-i386-symbols.zip.md5 release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.35-windows-i386-symbols.zip.sha1 release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.35-windows-x86_64-symbols.zip (with props) release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.35-windows-x86_64-symbols.zip.asc release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.35-windows-x86_64-symbols.zip.md5 release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.35-windows-x86_64-symbols.zip.sha1 release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-i386-httpd-2.0.x.zip (with props) release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-i386-httpd-2.0.x.zip.asc release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-i386-httpd-2.0.x.zip.md5 release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-i386-httpd-2.0.x.zip.sha1 release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-i386-httpd-2.2.x.zip (with props) release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-i386-httpd-2.2.x.zip.asc release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-i386-httpd-2.2.x.zip.md5 release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-i386-httpd-2.2.x.zip.sha1 release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-i386-httpd-2.4.x.zip (with props) release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-i386-httpd-2.4.x.zip.asc release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-i386-httpd-2.4.x.zip.md5 release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-i386-httpd-2.4.x.zip.sha1 release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-i386-iis.zip (with props) release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-i386-iis.zip.asc release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-i386-iis.zip.md5 release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-i386-iis.zip.sha1 release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-i386-iplanet.zip (with props) release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-i386-iplanet.zip.asc release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-i386-iplanet.zip.md5 release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-i386-iplanet.zip.sha1 release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-x86_64-iis.zip (with props) release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-x86_64-iis.zip.asc release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-x86_64-iis.zip.md5 release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-x86_64-iis.zip.sha1 release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.35-src.tar.gz (with props) release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.35-src.tar.gz.asc release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.35-src.tar.gz.md5 release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.35-src.tar.gz.sha1 release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.35-src.zip (with props) release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.35-src.zip.asc release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.35-src.zip.md5 release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.35-src.zip.sha1 Removed: release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.33-windows-i386-symbols.zip release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.33-windows-i386-symbols.zip.asc release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.33-windows-i386-symbols.zip.md5 release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-conne
svn commit: r563 - in /release/tomcat/tomcat-connectors/jk: ./ binaries/windows/ binaries/windows/symbols/
Author: mturk Date: Sat Mar 24 13:53:29 2012 New Revision: 563 Log: Add 1.2.35 artefacts and remove old ones Added: release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.35-windows-i386-symbols.zip (with props) release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.35-windows-i386-symbols.zip.asc release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.35-windows-i386-symbols.zip.md5 release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.35-windows-i386-symbols.zip.sha1 release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.35-windows-x86_64-symbols.zip (with props) release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.35-windows-x86_64-symbols.zip.asc release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.35-windows-x86_64-symbols.zip.md5 release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.35-windows-x86_64-symbols.zip.sha1 release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-i386-httpd-2.0.x.zip (with props) release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-i386-httpd-2.0.x.zip.asc release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-i386-httpd-2.0.x.zip.md5 release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-i386-httpd-2.0.x.zip.sha1 release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-i386-httpd-2.2.x.zip (with props) release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-i386-httpd-2.2.x.zip.asc release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-i386-httpd-2.2.x.zip.md5 release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-i386-httpd-2.2.x.zip.sha1 release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-i386-httpd-2.4.x.zip (with props) release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-i386-httpd-2.4.x.zip.asc release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-i386-httpd-2.4.x.zip.md5 release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-i386-httpd-2.4.x.zip.sha1 release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-i386-iis.zip (with props) release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-i386-iis.zip.asc release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-i386-iis.zip.md5 release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-i386-iis.zip.sha1 release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-i386-iplanet.zip (with props) release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-i386-iplanet.zip.asc release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-i386-iplanet.zip.md5 release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-i386-iplanet.zip.sha1 release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-x86_64-iis.zip (with props) release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-x86_64-iis.zip.asc release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-x86_64-iis.zip.md5 release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-x86_64-iis.zip.sha1 release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.35-src.tar.gz (with props) release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.35-src.tar.gz.asc release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.35-src.tar.gz.md5 release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.35-src.tar.gz.sha1 release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.35-src.zip (with props) release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.35-src.zip.asc release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.35-src.zip.md5 release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.35-src.zip.sha1 Removed: release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.33-windows-i386-symbols.zip release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.33-windows-i386-symbols.zip.asc release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.33-windows-i386-symbols.zip.md5 release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-conne
svn commit: r1304795 - in /tomcat/jk/trunk: native/STATUS.txt native/common/jk_version.h native/configure.in xdocs/index.xml xdocs/news/20120301.xml
Author: mturk
Date: Sat Mar 24 13:59:52 2012
New Revision: 1304795
URL: http://svn.apache.org/viewvc?rev=1304795&view=rev
Log:
Bump the version number
Modified:
tomcat/jk/trunk/native/STATUS.txt
tomcat/jk/trunk/native/common/jk_version.h
tomcat/jk/trunk/native/configure.in
tomcat/jk/trunk/xdocs/index.xml
tomcat/jk/trunk/xdocs/news/20120301.xml
Modified: tomcat/jk/trunk/native/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/STATUS.txt?rev=1304795&r1=1304794&r2=1304795&view=diff
==
--- tomcat/jk/trunk/native/STATUS.txt (original)
+++ tomcat/jk/trunk/native/STATUS.txt Sat Mar 24 13:59:52 2012
@@ -18,7 +18,8 @@ Last modified at [$Date$]
Release:
-1.2.35 : current version
+1.2.36 : in development
+1.2.35 : released March 24, 2012
1.2.34 : not released
1.2.33 : released March 13, 2012
1.2.32 : released July 8, 2011
Modified: tomcat/jk/trunk/native/common/jk_version.h
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_version.h?rev=1304795&r1=1304794&r2=1304795&view=diff
==
--- tomcat/jk/trunk/native/common/jk_version.h (original)
+++ tomcat/jk/trunk/native/common/jk_version.h Sat Mar 24 13:59:52 2012
@@ -26,10 +26,10 @@
/** START OF AREA TO MODIFY BEFORE RELEASING */
#define JK_VERMAJOR 1
#define JK_VERMINOR 2
-#define JK_VERFIX 35
+#define JK_VERFIX 36
/* set JK_VERISRELEASE to 1 when release (do not forget to commit!) */
-#define JK_VERISRELEASE 1
+#define JK_VERISRELEASE 0
/* Beta number */
#define JK_VERBETA 0
#define JK_BETASTRING "0"
Modified: tomcat/jk/trunk/native/configure.in
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/configure.in?rev=1304795&r1=1304794&r2=1304795&view=diff
==
--- tomcat/jk/trunk/native/configure.in (original)
+++ tomcat/jk/trunk/native/configure.in Sat Mar 24 13:59:52 2012
@@ -26,7 +26,7 @@ AC_CANONICAL_SYSTEM
dnl package and version. (synchronization with common/jk_version.h ?)
PACKAGE=mod_jk
-VERSION=1.2.35
+VERSION=1.2.36
AM_INIT_AUTOMAKE(${PACKAGE}, ${VERSION})
Modified: tomcat/jk/trunk/xdocs/index.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/index.xml?rev=1304795&r1=1304794&r2=1304795&view=diff
==
--- tomcat/jk/trunk/xdocs/index.xml (original)
+++ tomcat/jk/trunk/xdocs/index.xml Sat Mar 24 13:59:52 2012
@@ -45,6 +45,17 @@ manual is described in more detail below
+24 March 2012 -
JK-1.2.35 released
+The Apache Tomcat team is proud to announce the immediate availability
+of Tomcat Connectors 1.2.35 Stable. This release contains bug fixes found
in previous release.
+
+Download the http://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.35-src.tar.gz";>JK
1.2.35 release sources
+| http://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.35-src.tar.gz.asc";>PGP
signature
+
+Download the http://www.apache.org/dist/tomcat/tomcat-connectors/jk/binaries/";>binaries
for selected platforms.
+
+
+
19 March
2012 - JK-1.2.33 stability issue
The Apache Tomcat team wishes to draw your attention to stability issues
that have been identified with the recent mod_jk 1.2.33 release. If you
Modified: tomcat/jk/trunk/xdocs/news/20120301.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/news/20120301.xml?rev=1304795&r1=1304794&r2=1304795&view=diff
==
--- tomcat/jk/trunk/xdocs/news/20120301.xml (original)
+++ tomcat/jk/trunk/xdocs/news/20120301.xml Sat Mar 24 13:59:52 2012
@@ -31,6 +31,20 @@
+
+
+
+The Apache Tomcat team is proud to announce the immediate availability
+of Tomcat Connectors 1.2.35. This is a stable release concentrating
mainly on
+bug fixes.
+
+Please see the ChangeLog
for a full list of changes.
+
+If you find any bugs while using this release, please fill in the
+https://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%20Connectors";>Bugzilla
+Bug Report.
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: AJP13: response message with container remote user
On 23.03.2012 13:43, issa.goris...@ext.ec.europa.eu wrote:
Hi All,
I have several web applications running on distinct tomcat instances. Apache
httpd is in front of all the tomcat instances, running as a reverse proxy.
Authentication is realized at the container side. Access log files are active
on the httpd side.
What I am missing in the httpd log files is the remote user information. I know
it is not available via mod_proxy. So I plan to switch to mod_jk. But it is not
available in mod_jk either. And I would like to contribute on this. I know a
possible work around would be to include the remote user information in the
response headers and log this via httpd; but I am not sure I can count on the
software owners to make the changes in a short time.
Can't you just add a custom response header to your Tomcat responses like
X-REMOTE-USER: MY_USER
and then log the user name in your apache access log by adding
%{X-REMOTE-USER}o?
Note that this would mean that the user name is sent out to the internet
(via the header), but it might already be part of the reponse pages anyhow.
If you want to strip a response header at Apache and still want to log
it, you would need to write a very simple Apache module, which copies
the header into an Apache environment variable, then removes the header
and you would log the environment variable instead of the original header.
HTH.
Rainer
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1304509 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/tomcat/jni/Library.java java/org/apache/tomcat/util/net/AprEndpoint.java webapps/docs/apr.xml webapps/docs/changelog.xml
On 23.03.2012 18:25, kkoli...@apache.org wrote: Author: kkolinko Date: Fri Mar 23 17:25:38 2012 New Revision: 1304509 URL: http://svn.apache.org/viewvc?rev=1304509&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51477 Support all SSL/TLS protocol combinations in APR connector. (rjung) Thanks Konstantin. I'm a bit sick right now and only slowly reducing backlog. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1304808 - /tomcat/taglibs/taglibs-parent/trunk/pom.xml
Author: jboynes Date: Sat Mar 24 14:28:56 2012 New Revision: 1304808 URL: http://svn.apache.org/viewvc?rev=1304808&view=rev Log: [maven-release-plugin] prepare release taglibs-parent-2 Modified: tomcat/taglibs/taglibs-parent/trunk/pom.xml Modified: tomcat/taglibs/taglibs-parent/trunk/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/taglibs-parent/trunk/pom.xml?rev=1304808&r1=1304807&r2=1304808&view=diff == --- tomcat/taglibs/taglibs-parent/trunk/pom.xml (original) +++ tomcat/taglibs/taglibs-parent/trunk/pom.xml Sat Mar 24 14:28:56 2012 @@ -25,7 +25,7 @@ org.apache.taglibs taglibs-parent - 2-SNAPSHOT + 2 Apache Taglibs Parent pom @@ -52,9 +52,9 @@ - scm:svn:http://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/trunk - scm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/trunk -http://svn.apache.org/viewvc/tomcat/taglibs/taglibs-parent/trunk + scm:svn:http://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/tags/taglibs-parent-2 + scm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/tags/taglibs-parent-2 + http://svn.apache.org/viewvc/tomcat/taglibs/taglibs-parent/tags/taglibs-parent-2 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1304809 - /tomcat/taglibs/taglibs-parent/tags/taglibs-parent-2/
Author: jboynes Date: Sat Mar 24 14:28:58 2012 New Revision: 1304809 URL: http://svn.apache.org/viewvc?rev=1304809&view=rev Log: [maven-release-plugin] copy for tag taglibs-parent-2 Added: tomcat/taglibs/taglibs-parent/tags/taglibs-parent-2/ - copied from r1304808, tomcat/taglibs/taglibs-parent/trunk/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1304810 - /tomcat/taglibs/taglibs-parent/trunk/pom.xml
Author: jboynes Date: Sat Mar 24 14:28:59 2012 New Revision: 1304810 URL: http://svn.apache.org/viewvc?rev=1304810&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: tomcat/taglibs/taglibs-parent/trunk/pom.xml Modified: tomcat/taglibs/taglibs-parent/trunk/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/taglibs-parent/trunk/pom.xml?rev=1304810&r1=1304809&r2=1304810&view=diff == --- tomcat/taglibs/taglibs-parent/trunk/pom.xml (original) +++ tomcat/taglibs/taglibs-parent/trunk/pom.xml Sat Mar 24 14:28:59 2012 @@ -25,7 +25,7 @@ org.apache.taglibs taglibs-parent - 2 + 3-SNAPSHOT Apache Taglibs Parent pom @@ -52,9 +52,9 @@ - scm:svn:http://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/tags/taglibs-parent-2 - scm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/tags/taglibs-parent-2 - http://svn.apache.org/viewvc/tomcat/taglibs/taglibs-parent/tags/taglibs-parent-2 + scm:svn:http://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/trunk + scm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/trunk +http://svn.apache.org/viewvc/tomcat/taglibs/taglibs-parent/trunk - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE] Release Apache Taglibs Parent POM 2
The proposed 2 release of Apache Taglibs Parent POM is now available for voting. This release addresses issues found during the 1 release process including duplicate LICENSE files and poor site configuration. The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-107/ and SVN tag is: http://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/tags/taglibs-parent-2/ Please vote on whether Apache Taglibs Parent 2 should be: [+1] Released, or [-1] Not released because ... Thanks Jeremy - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1304812 - /tomcat/taglibs/site/pom.xml
Author: jboynes Date: Sat Mar 24 14:48:09 2012 New Revision: 1304812 URL: http://svn.apache.org/viewvc?rev=1304812&view=rev Log: update site after staging release 2 of parent Modified: tomcat/taglibs/site/pom.xml Modified: tomcat/taglibs/site/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/site/pom.xml?rev=1304812&r1=1304811&r2=1304812&view=diff == --- tomcat/taglibs/site/pom.xml (original) +++ tomcat/taglibs/site/pom.xml Sat Mar 24 14:48:09 2012 @@ -23,7 +23,7 @@ org.apache.taglibs taglibs-parent -2-SNAPSHOT +3-SNAPSHOT ../taglibs-parent/pom.xml - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Taglibs Parent POM 2
On 24 March 2012 14:45, Jeremy Boynes wrote: > The proposed 2 release of Apache Taglibs Parent POM is now available for > voting. > > This release addresses issues found during the 1 release process including > duplicate LICENSE files and poor site configuration. > > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-107/ > > and SVN tag is: > http://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/tags/taglibs-parent-2/ NOTICE says Copyright 2009-2012 pom.xml has 2000 These are inconsistent. > Please vote on whether Apache Taglibs Parent 2 should be: > [+1] Released, or > [-1] Not released because ... > > Thanks > Jeremy > > > - > 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
Re: svn commit: r1303338 - /tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
On 21/03/12 10:00, ma...@apache.org wrote:
Author: markt
Date: Wed Mar 21 10:00:52 2012
New Revision: 1303338
URL: http://svn.apache.org/viewvc?rev=1303338&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52953
When using DIGEST auth, digests are always represented using lower case hex
characters
I realise this particular change is trivial, but because I hadn't
updated my sandbox of the trunk for a couple of weeks, I decided to add
a new unit test for bug 52954 in:
org.apache.catalina.authenticator.TestDigestAuthenticator.
No-one should be surprised to hear the new test case is currently
failing on my system with 401 status - it simply confirms the bug exists
in my sandbox:
Last Changed Author: markt
Last Changed Rev: 1297213
Last Changed Date: 2012-03-05 20:20:00 + (Mon, 05 Mar 2012)
I'm not in a hurry to update my sandbox because I am confident svn
commit r1303338 fixes the reported bug.
However, this test class hasn't changed for quite a long time, so before
I submit my change, I intend to look for any other corner-cases that
might also have been missed. If anyone else is planning to do similar
work, please let me know so that I don't waste my time!
Regards,
Brian
Modified:
tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
Modified: tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java?rev=1303338&r1=1303337&r2=1303338&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java Wed Mar 21
10:00:52 2012
@@ -27,6 +27,7 @@ import java.security.NoSuchAlgorithmExce
import java.security.Principal;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
+import java.util.Locale;
import javax.servlet.http.HttpServletResponse;
@@ -381,7 +382,8 @@ public abstract class RealmBase extends
String qop, String realm,
String md5a2) {
-String md5a1 = getDigest(username, realm);
+// In digest auth, digests are always lower case
+String md5a1 = getDigest(username, realm).toLowerCase(Locale.ENGLISH);
if (md5a1 == null)
return null;
String serverDigestValue;
-
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
svn commit: r1304895 - /tomcat/trunk/java/org/apache/tomcat/util/http/parser/AstMediaType.java
Author: markt
Date: Sat Mar 24 19:48:39 2012
New Revision: 1304895
URL: http://svn.apache.org/viewvc?rev=1304895&view=rev
Log:
Cleaner (kkolinko review)
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/parser/AstMediaType.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/http/parser/AstMediaType.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/parser/AstMediaType.java?rev=1304895&r1=1304894&r2=1304895&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/parser/AstMediaType.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/parser/AstMediaType.java Sat
Mar 24 19:48:39 2012
@@ -52,8 +52,8 @@ public class AstMediaType extends Simple
sb.append(children[1].toString());
for (int i = 2; i < children.length; i++) {
AstParameter p = (AstParameter) children[i];
-if (!CHARSET.equals(
-p.children[0].jjtGetValue().toString().toLowerCase())) {
+if (!CHARSET.equalsIgnoreCase(
+p.children[0].jjtGetValue().toString())) {
sb.append(';');
sb.append(p.toString());
}
@@ -64,8 +64,8 @@ public class AstMediaType extends Simple
public String getCharset() {
for (int i = 2; i < children.length; i++) {
AstParameter p = (AstParameter) children[i];
-if (CHARSET.equals(
-p.children[0].jjtGetValue().toString().toLowerCase())) {
+if (CHARSET.equalsIgnoreCase(
+p.children[0].jjtGetValue().toString())) {
return p.children[1].jjtGetValue().toString();
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1304897 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/http/parser/
Author: markt
Date: Sat Mar 24 19:49:10 2012
New Revision: 1304897
URL: http://svn.apache.org/viewvc?rev=1304897&view=rev
Log:
Cleaner (kkolinko review)
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/parser/AstMediaType.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.jjt
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParserConstants.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParserTokenManager.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1304275,1304895
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/parser/AstMediaType.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/parser/AstMediaType.java?rev=1304897&r1=1304896&r2=1304897&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/parser/AstMediaType.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/parser/AstMediaType.java
Sat Mar 24 19:49:10 2012
@@ -21,6 +21,9 @@ package org.apache.tomcat.util.http.pars
* by http://javacc.java.net/doc/JJTree.html";> JJTree.
*/
public class AstMediaType extends SimpleNode {
+
+private static final String CHARSET = "charset";
+
public AstMediaType(int id) {
super(id);
}
@@ -33,10 +36,10 @@ public class AstMediaType extends Simple
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(children[0].toString());
-sb.append("/");
+sb.append('/');
sb.append(children[1].toString());
for (int i = 2; i < children.length; i++) {
-sb.append(";");
+sb.append(';');
sb.append(children[i].toString());
}
return sb.toString();
@@ -45,12 +48,13 @@ public class AstMediaType extends Simple
public String toStringNoCharset() {
StringBuilder sb = new StringBuilder();
sb.append(children[0].toString());
-sb.append("/");
+sb.append('/');
sb.append(children[1].toString());
for (int i = 2; i < children.length; i++) {
AstParameter p = (AstParameter) children[i];
-if (!"charset".equals(p.children[0].jjtGetValue())) {
-sb.append(";");
+if (!CHARSET.equalsIgnoreCase(
+p.children[0].jjtGetValue().toString())) {
+sb.append(';');
sb.append(p.toString());
}
}
@@ -60,7 +64,8 @@ public class AstMediaType extends Simple
public String getCharset() {
for (int i = 2; i < children.length; i++) {
AstParameter p = (AstParameter) children[i];
-if ("charset".equals(p.children[0].jjtGetValue())) {
+if (CHARSET.equalsIgnoreCase(
+p.children[0].jjtGetValue().toString())) {
return p.children[1].jjtGetValue().toString();
}
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java?rev=1304897&r1=1304896&r2=1304897&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
Sat Mar 24 19:49:10 2012
@@ -302,7 +302,7 @@ public class HttpParser/*@bgen(jjtree)*/
/** Generate ParseException. */
public ParseException generateParseException() {
jj_expentries.clear();
-boolean[] la1tokens = new boolean[14];
+boolean[] la1tokens = new boolean[15];
if (jj_kind >= 0) {
la1tokens[jj_kind] = true;
jj_kind = -1;
@@ -316,7 +316,7 @@ public class HttpParser/*@bgen(jjtree)*/
}
}
}
-for (int i = 0; i < 14; i++) {
+for (int i = 0; i < 15; i++) {
if (la1tokens[i]) {
jj_expentry = new int[1];
jj_expentry[0] = i;
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.jjt
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.jjt?rev=1304897&r1=1304896&r2=1304897&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.jjt
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.jjt
Sat Mar 24 19:49:10 2012
@@ -119,7 +119,7 @@ void Value() #Value : { Token t = null;
TOKEN :
{
- < #QUO
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/503 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] 1304897 Blamelist: markt Build succeeded! sincerely, -The Buildbot
svn commit: r1304930 - in /tomcat/trunk/test/org/apache/el: TestMethodExpressionImpl.java TesterBeanEnum.java
Author: markt
Date: Sat Mar 24 21:29:11 2012
New Revision: 1304930
URL: http://svn.apache.org/viewvc?rev=1304930&view=rev
Log:
Add test case for bug 52970. Need to apply coercion rules to method invocation
Added:
tomcat/trunk/test/org/apache/el/TesterBeanEnum.java (with props)
Modified:
tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java
Modified: tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java?rev=1304930&r1=1304929&r2=1304930&view=diff
==
--- tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java (original)
+++ tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java Sat Mar 24
21:29:11 2012
@@ -75,6 +75,10 @@ public class TestMethodExpressionImpl {
TesterBeanC beanC = new TesterBeanC();
context.getVariableMapper().setVariable("beanC",
factory.createValueExpression(beanC, TesterBeanC.class));
+
+TesterBeanEnum beanEnum = new TesterBeanEnum();
+context.getVariableMapper().setVariable("beanEnum",
+factory.createValueExpression(beanEnum, TesterBeanEnum.class));
}
@Test
@@ -413,4 +417,17 @@ public class TestMethodExpressionImpl {
assertEquals("Hello from BB", actual);
}
+@Test
+public void testBug52970() {
+MethodExpression me = factory.createMethodExpression(context,
+"${beanEnum.submit('APPLE')}", null ,
+new Class[] { TesterBeanEnum.class });
+me.invoke(context, null);
+
+ValueExpression ve = factory.createValueExpression(context,
+"#{beanEnum.lastSubmitted}", TesterEnum.class);
+TesterEnum actual = (TesterEnum) ve.getValue(context);
+assertEquals(TesterEnum.APPLE, actual);
+
+}
}
Added: tomcat/trunk/test/org/apache/el/TesterBeanEnum.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TesterBeanEnum.java?rev=1304930&view=auto
==
--- tomcat/trunk/test/org/apache/el/TesterBeanEnum.java (added)
+++ tomcat/trunk/test/org/apache/el/TesterBeanEnum.java Sat Mar 24 21:29:11 2012
@@ -0,0 +1,30 @@
+/*
+ * 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 org.apache.el;
+
+public class TesterBeanEnum {
+
+private volatile TesterEnum lastSubmitted = null;
+
+public void submit(TesterEnum testerEnum) {
+this.lastSubmitted = testerEnum;
+}
+
+public TesterEnum getLastSubmitted() {
+return lastSubmitted;
+}
+}
Propchange: tomcat/trunk/test/org/apache/el/TesterBeanEnum.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: r1304931 - in /tomcat/trunk/java/org/apache/el: parser/AstValue.java util/ReflectionUtil.java
Author: markt
Date: Sat Mar 24 21:30:46 2012
New Revision: 1304931
URL: http://svn.apache.org/viewvc?rev=1304931&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52970
Take account of coercion rules when invoking methods
Modified:
tomcat/trunk/java/org/apache/el/parser/AstValue.java
tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java
Modified: tomcat/trunk/java/org/apache/el/parser/AstValue.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstValue.java?rev=1304931&r1=1304930&r2=1304931&view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/AstValue.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstValue.java Sat Mar 24 21:30:46
2012
@@ -230,7 +230,8 @@ public final class AstValue extends Simp
@SuppressWarnings("rawtypes") Class[] paramTypes)
throws ELException {
Target t = getTarget(ctx);
-Method m = ReflectionUtil.getMethod(t.base, t.property, paramTypes);
+Method m = ReflectionUtil.getMethod(
+t.base, t.property, paramTypes, null);
return new MethodInfo(m.getName(), m.getReturnType(), m
.getParameterTypes());
}
@@ -244,19 +245,20 @@ public final class AstValue extends Simp
Target t = getTarget(ctx);
Method m = null;
Object[] values = null;
+Class[] types = null;
if (isParametersProvided()) {
values = ((AstMethodParameters) this.jjtGetChild(
this.jjtGetNumChildren() - 1)).getParameters(ctx);
-Class[] types = getTypesFromValues(values);
-m = ReflectionUtil.getMethod(t.base, t.property, types);
+types = getTypesFromValues(values);
} else {
-m = ReflectionUtil.getMethod(t.base, t.property, paramTypes);
values = paramValues;
+types = paramTypes;
}
-if (m.isVarArgs()) {
-// May need to convert values
-values = toVarArgs(values, m);
-}
+m = ReflectionUtil.getMethod(t.base, t.property, types, values);
+
+// Handle varArgs and any co-ercion required
+values = convertArgs(values, m);
+
Object result = null;
try {
result = m.invoke(t.base, values);
@@ -277,17 +279,34 @@ public final class AstValue extends Simp
return result;
}
-private Object[] toVarArgs(Object[] src, Method m) {
-int paramCount = m.getParameterTypes().length;
+private Object[] convertArgs(Object[] src, Method m) {
+Class[] types = m.getParameterTypes();
+if (types.length == 0) {
+return new Object[0];
+}
+
+int paramCount = types.length;
Object[] dest = new Object[paramCount];
-Object[] varArgs = (Object[]) Array.newInstance(
-m.getParameterTypes()[paramCount - 1].getComponentType(),
-src.length - (paramCount - 1));
-System.arraycopy(src, 0, dest, 0, paramCount - 1);
-System.arraycopy(src, paramCount - 1, varArgs, 0,
-src.length - (paramCount - 1));
-dest[paramCount - 1] = varArgs;
+
+for (int i = 0; i < paramCount - 1; i++) {
+dest[i] = ELSupport.coerceToType(src[i], types[i]);
+}
+
+if (m.isVarArgs()) {
+Object[] varArgs = (Object[]) Array.newInstance(
+m.getParameterTypes()[paramCount - 1].getComponentType(),
+src.length - (paramCount - 1));
+for (int i = 0; i < src.length - (paramCount - 1); i ++) {
+varArgs[i] = ELSupport.coerceToType(src[paramCount - 1 + i],
+types[paramCount - 1].getComponentType());
+}
+dest[paramCount - 1] = varArgs;
+} else {
+dest[paramCount - 1] = ELSupport.coerceToType(
+src[paramCount - 1], types[paramCount - 1]);
+}
+
return dest;
}
Modified: tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java?rev=1304931&r1=1304930&r2=1304931&view=diff
==
--- tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java (original)
+++ tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java Sat Mar 24
21:30:46 2012
@@ -23,8 +23,11 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Set;
+import javax.el.ELException;
import javax.el.MethodNotFoundException;
+import org.apache.el.lang.ELSupport;
+
/**
* Utilities for Managing Serialization and Reflection
@@ -106,12 +109,14 @@ public class ReflectionUtil {
* @param base the object that owns the method
* @param property the name of the method
* @param paramTypes the parameter ty
svn commit: r1304932 - /tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java
Author: markt
Date: Sat Mar 24 21:31:20 2012
New Revision: 1304932
URL: http://svn.apache.org/viewvc?rev=1304932&view=rev
Log:
Correct test since null should be coerced to "" not "null"
Modified:
tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java
Modified: tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java?rev=1304932&r1=1304931&r2=1304932&view=diff
==
--- tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java (original)
+++ tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java Sat Mar 24
21:31:20 2012
@@ -124,7 +124,7 @@ public class TestMethodExpressionImpl {
me3.invoke(context, new Object[] { "JUnit2" }));
assertEquals("Hello JUnit from B",
me2.invoke(context, new Object[] { null }));
-assertEquals("Hello null from B",
+assertEquals("Hello from B",
me3.invoke(context, new Object[] { null }));
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1304933 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/el/parser/AstValue.java java/org/apache/el/util/ReflectionUtil.java test/org/apache/el/TestMethodExpressionImpl.java test/org/apache
Author: markt
Date: Sat Mar 24 21:33:47 2012
New Revision: 1304933
URL: http://svn.apache.org/viewvc?rev=1304933&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52970
Take account of coercion rules when invoking methods
Added:
tomcat/tc7.0.x/trunk/test/org/apache/el/TesterBeanEnum.java
- copied unchanged from r1304930,
tomcat/trunk/test/org/apache/el/TesterBeanEnum.java
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/el/parser/AstValue.java
tomcat/tc7.0.x/trunk/java/org/apache/el/util/ReflectionUtil.java
tomcat/tc7.0.x/trunk/test/org/apache/el/TestMethodExpressionImpl.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1304930-1304932
Modified: tomcat/tc7.0.x/trunk/java/org/apache/el/parser/AstValue.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/el/parser/AstValue.java?rev=1304933&r1=1304932&r2=1304933&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/el/parser/AstValue.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/el/parser/AstValue.java Sat Mar 24
21:33:47 2012
@@ -230,7 +230,8 @@ public final class AstValue extends Simp
@SuppressWarnings("rawtypes") Class[] paramTypes)
throws ELException {
Target t = getTarget(ctx);
-Method m = ReflectionUtil.getMethod(t.base, t.property, paramTypes);
+Method m = ReflectionUtil.getMethod(
+t.base, t.property, paramTypes, null);
return new MethodInfo(m.getName(), m.getReturnType(), m
.getParameterTypes());
}
@@ -244,19 +245,20 @@ public final class AstValue extends Simp
Target t = getTarget(ctx);
Method m = null;
Object[] values = null;
+Class[] types = null;
if (isParametersProvided()) {
values = ((AstMethodParameters) this.jjtGetChild(
this.jjtGetNumChildren() - 1)).getParameters(ctx);
-Class[] types = getTypesFromValues(values);
-m = ReflectionUtil.getMethod(t.base, t.property, types);
+types = getTypesFromValues(values);
} else {
-m = ReflectionUtil.getMethod(t.base, t.property, paramTypes);
values = paramValues;
+types = paramTypes;
}
-if (m.isVarArgs()) {
-// May need to convert values
-values = toVarArgs(values, m);
-}
+m = ReflectionUtil.getMethod(t.base, t.property, types, values);
+
+// Handle varArgs and any co-ercion required
+values = convertArgs(values, m);
+
Object result = null;
try {
result = m.invoke(t.base, values);
@@ -277,17 +279,34 @@ public final class AstValue extends Simp
return result;
}
-private Object[] toVarArgs(Object[] src, Method m) {
-int paramCount = m.getParameterTypes().length;
+private Object[] convertArgs(Object[] src, Method m) {
+Class[] types = m.getParameterTypes();
+if (types.length == 0) {
+return new Object[0];
+}
+int paramCount = types.length;
+
Object[] dest = new Object[paramCount];
-Object[] varArgs = (Object[]) Array.newInstance(
-m.getParameterTypes()[paramCount - 1].getComponentType(),
-src.length - (paramCount - 1));
-System.arraycopy(src, 0, dest, 0, paramCount - 1);
-System.arraycopy(src, paramCount - 1, varArgs, 0,
-src.length - (paramCount - 1));
-dest[paramCount - 1] = varArgs;
+
+for (int i = 0; i < paramCount - 1; i++) {
+dest[i] = ELSupport.coerceToType(src[i], types[i]);
+}
+
+if (m.isVarArgs()) {
+Object[] varArgs = (Object[]) Array.newInstance(
+m.getParameterTypes()[paramCount - 1].getComponentType(),
+src.length - (paramCount - 1));
+for (int i = 0; i < src.length - (paramCount - 1); i ++) {
+varArgs[i] = ELSupport.coerceToType(src[paramCount - 1 + i],
+types[paramCount - 1].getComponentType());
+}
+dest[paramCount - 1] = varArgs;
+} else {
+dest[paramCount - 1] = ELSupport.coerceToType(
+src[paramCount - 1], types[paramCount - 1]);
+}
+
return dest;
}
Modified: tomcat/tc7.0.x/trunk/java/org/apache/el/util/ReflectionUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/el/util/ReflectionUtil.java?rev=1304933&r1=1304932&r2=1304933&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/el/util/Reflectio
DO NOT REPLY [Bug 52970] MethodNotFoundException when using enum as one of method arguments
https://issues.apache.org/bugzilla/show_bug.cgi?id=52970 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #6 from Mark Thomas 2012-03-24 21:34:10 UTC --- This has been fixed in trunk and 7.0.x and will be included in 7.0.27 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52971] javax.servlet.context.tempdir return directory that do not exist, and finish with a _ underscore
https://issues.apache.org/bugzilla/show_bug.cgi?id=52971 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Comment #2 from Mark Thomas 2012-03-24 21:41:30 UTC --- Tomcat only sets this in one place and if the directory can't be created there will be a warning in the logs. There are multiple reasons why it might not be possible for Tomcat to create the directory and the users list is the place to seek further assistance. -- 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 50019] Adding JNDI "lookup-name" support In XML and Resource Annotations
https://issues.apache.org/bugzilla/show_bug.cgi?id=50019 Mark Thomas changed: What|Removed |Added Attachment #26095|0 |1 is patch|| -- 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
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/2890 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1304932 Blamelist: markt Build succeeded! sincerely, -The Buildbot
[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, and has been outstanding for 3 runs. 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: 21 mins 47 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-25032012.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-25032012-native-src.tar.gz -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-25032012-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-25032012.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-25032012.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-25032012.jar:/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-25032012.jar:
Re: SPDY support
Hi,
I did a first round of backporting to tomcat7 - only the hooks. Please take
a look and let me know:
https://github.com/costinm/tomcat/blob/trunk/tomcat7.diff
I've also submitted to git the changes to support SPDY/NPN for NIO and JIO
connectors - almost same diff, but the important change is:
https://github.com/costinm/tomcat/commit/698f4105a818e872877f3e8d9c50e003e2e706f0
The problem is that it add a compile dep on
http://wiki.eclipse.org/Jetty/Feature/NPN
the classes are modified from openjdk7 - it'll also need to be added at
runtime ( if spdy support with nio/jio is needed ), but I assume users can
download the jar until it gets merged into jdk7.
Alternative is to move all the coyote/spdy/{nio,jio} classes to a separate
repository, outside tomcat tree. I guess we could also move all spdy impl
to a separate repo and only leave the hooks.
Costin
On Mon, Mar 19, 2012 at 11:31 AM, Costin Manolache wrote:
>
>
> On Mon, Mar 19, 2012 at 10:43 AM, Gus Heck wrote:
>
>> I just bumped into the whole concept of SPDY this morning, and it sounds
>> fabulous, and I'm quite happy to see that it's already underway in trunk.
>> I'm quite likely to be using a lot of development using Vaadin framework in
>> the near future, which I expect probably stands to benefit significantly
>> from SPDY. However, it seems that SPDY support in java is a wee tad
>> nascent. As I understand it, there's an issue with oracle JDK support for
>> NPN that is forcing tomcat to use APR. I also notice that Jetty has just
>> released a version that supports SPDY using the NPN that is apparently in
>> OpenJDK 7 already (will it appear in an oracle java update?). Clearly this
>> is a key innovation, and it looks like between Apache Hhttpd and
>> Chrome/Firefox/Safari, more than 50% of the web will support it on both
>> client and server merely by staying up to date with their current software.
>>
>
> I have Jetty NPN working with tomcat - so NIO/BIO will also support SPDY.
> You will have to download/install the jetty implementation of npn jar
> yourself until it's merged into JDK7, don't know what are their plans.
>
> The APR seems faster - but not by a huge margin, I haven't tested the
> limits yet ( I want to find out what's the max number of kept-alive spdy
> connections - need more machines because of the 64k limit on local ports).
>
>
>
>> My question is this: will SPDY support be released in some form before
>> Tomcat 8 (in who's branch it seems to currently live)? JSR 340 (servlet
>> 3.1) seems to be targeting Q3 2012 and I would presume that that means
>> tomcat 8 is no sooner than Q3 or Q4 - 2012. Seems a shame to make this wait
>> until that time (assuming it's anywhere near ready).
>>
>
> I have a patch for tomcat7 to add only the NPN hooks - it's pretty small
> and clean, I'll get a discussion started, but it should be possible.
>
> Then it's up to tomcat-dev on whether to backport the spdy packages, or
> have tomcat7 download the spdy jars separately ( i.e. release them as a
> 'plugin' / add-on ).
>
> It'll take a bit of time until it's done - not easy to find free time to
> work on this.
>
> Costin
>
>
>>
>> -Gus
>>
>
>
[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 3 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 17 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-25032012.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-25032012-native-src.tar.gz -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-25032012-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-25032012.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-25032012.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-25032012.jar:/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-25032012.jar:/srv/gump/public
[Tomcat Wiki] Update of "PoweredBy" by MarioKleinsasser
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change
notification.
The "PoweredBy" page has been changed by MarioKleinsasser:
http://wiki.apache.org/tomcat/PoweredBy?action=diff&rev1=399&rev2=400
{{http://www.neuromice.org/images/banner_neuro_02.gif}}
[[http://www.neuromice.org|NeuroMice]] has their own nice
[[http://www.neuromice.org/poweredBy.sc|PoweredBy]] page.
=== n0r1sk.com ===
- {{http://www.n0r1sk.com/_NON_WIKI_CONTENT/n0r1sk_logo.png}}
[[http://www.n0r1sk.com|n0r1sk.com]] - some nice open source projects! (SMS
Gateway / PDF Split / ...)
+ {{http://www.n0r1sk.com/images/6/6c/Homepage-icon-100x100.png}}
[[http://www.n0r1sk.com|n0r1sk.com]] - some nice open source projects! (SMS
Gateway / PDF Split / ...)
=== OfferMe.com.au ===
{{http://www.offerme.com.au/images/layout/logo_home.gif}}
[[http://www.offerme.com.au|www.offerme.com.au]] - OfferMe.com.au is an all new
B2C trading platform in Australia using the Web2.0 concept.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
