svn commit: r1343153 - in /tomcat/trunk/java/org/apache/catalina: Host.java core/StandardHost.java startup/ContextConfig.java startup/HostConfig.java

2012-05-28 Thread kfujino
Author: kfujino Date: Mon May 28 07:11:43 2012 New Revision: 1343153 URL: http://svn.apache.org/viewvc?rev=1343153&view=rev Log: fix for Konstantin's review. Add new calculation method of host's default config path to Host(StanderdHost). Modified: tomcat/trunk/java/org/apache/catalina/Host.ja

svn commit: r1343155 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java

2012-05-28 Thread kfujino
Author: kfujino Date: Mon May 28 07:18:41 2012 New Revision: 1343155 URL: http://svn.apache.org/viewvc?rev=1343155&view=rev Log: fix for Konstantin's review. Use ContextConfig.getBaseDir() method instead of system property. Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Conte

Re: svn commit: r1341370 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/startup/ContextConfig.java webapps/docs/changelog.xml

2012-05-28 Thread Keiichi Fujino
Thanks for the review. I fixed it. I implemented the calculation method of host's default config path to Host(StanderdHost). just like a Host#getAppBaseFile(). This fix is applied only to trunk. If there is a different implementation idea, feel free to re-fix. 2012/5/25 Konstantin Kolinko : > 20

Re: svn commit: r1343079 - in /tomcat/jk/trunk/native/common: jk_ajp_common.c jk_status.c

2012-05-28 Thread Konstantin Kolinko
2012/5/27 : > Author: mturk > Date: Sun May 27 19:05:26 2012 > New Revision: 1343079 > > URL: http://svn.apache.org/viewvc?rev=1343079&view=rev > Log: > Fix 0.0.0.0:0 address bug for workers. Make sure we force pull and address > resolve > > Modified: >    tomcat/jk/trunk/native/common/jk_ajp_com

svn commit: r1343207 - /tomcat/jk/trunk/native/common/jk_ajp_common.c

2012-05-28 Thread mturk
Author: mturk Date: Mon May 28 11:23:40 2012 New Revision: 1343207 URL: http://svn.apache.org/viewvc?rev=1343207&view=rev Log: Fix typo Modified: tomcat/jk/trunk/native/common/jk_ajp_common.c Modified: tomcat/jk/trunk/native/common/jk_ajp_common.c URL: http://svn.apache.org/viewvc/tomcat/jk

Re: svn commit: r1343079 - in /tomcat/jk/trunk/native/common: jk_ajp_common.c jk_status.c

2012-05-28 Thread Mladen Turk
On 05/28/2012 12:42 PM, Konstantin Kolinko wrote: 2012/5/27: -aw->s->addr_sequence = aw->addr_sequence; +aw->addr_sequence = aw->s->h.sequence; The above line, was it supposed to be aw->addr_sequence = aw->s->addr_sequence; Yeah. Fixed. Thanks :) Cheers -- ^TM

[Bug 53301] Servlet init method called twice with embedded Tomcat

2012-05-28 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=53301 --- Comment #3 from Konstantin Kolinko --- > Don't understand why you claim it is a user error It is your responsibility to provide enough details to prove and reproduce the issue. Your report is lacking and there are several statements in

tagging connectors 1.2.37

2012-05-28 Thread Mladen Turk
Hi, We have regression in 1.2.36 which can cause core in case workers are mixed between balance_members and worker.list thus I plan to create a speedy release focusing on this issue. Hope that's fine with everyone. Regards -- ^TM

svn commit: r1343254 - /tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml

2012-05-28 Thread mturk
Author: mturk Date: Mon May 28 13:45:45 2012 New Revision: 1343254 URL: http://svn.apache.org/viewvc?rev=1343254&view=rev Log: Update changes Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml URL: http://svn.apache.org/vi

svn commit: r1343258 - in /tomcat/jk/trunk: native/common/jk_version.h native/iis/installer/isapi-redirector-win32-msi.ism tools/dist/README.html tools/dist/binaries/windows/README.html

2012-05-28 Thread mturk
Author: mturk Date: Mon May 28 13:49:25 2012 New Revision: 1343258 URL: http://svn.apache.org/viewvc?rev=1343258&view=rev Log: Update versions to pending release Modified: tomcat/jk/trunk/native/common/jk_version.h tomcat/jk/trunk/native/iis/installer/isapi-redirector-win32-msi.ism to

Re: A small question regarding connector.Request.getCoyoteRequest method

2012-05-28 Thread Mark Thomas
On 28/05/2012 14:07, N V Hari Krishna wrote: > Hello all, > > I had few questions regarding > org.apache.connector.Request.getCoyoteRequest() method. > > My questions are: > > Request.getCoyoteRequest() method's corresponding response method > org.apache.catalina.connector.Response.getCoyoteResp

svn commit: r1343301 - /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java

2012-05-28 Thread olamy
Author: olamy Date: Mon May 28 15:53:09 2012 New Revision: 1343301 URL: http://svn.apache.org/viewvc?rev=1343301&view=rev Log: [MTOMCAT-155] allow exec-war war run dependencies that are generated in current mvn execution, but not yet installed to maven repo Submitted by Peter Lynch. Modified:

svn commit: r1343302 - /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java

2012-05-28 Thread olamy
Author: olamy Date: Mon May 28 15:53:23 2012 New Revision: 1343302 URL: http://svn.apache.org/viewvc?rev=1343302&view=rev Log: cleanup a bit patch from previous commit Modified: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractEx

[jira] [Closed] (MTOMCAT-155) allow exec-war war run dependencies that are generated in current mvn execution, but not yet installed to maven repo

2012-05-28 Thread *$^¨%`£
[ https://issues.apache.org/jira/browse/MTOMCAT-155?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Olivier Lamy (*$^¨%`£) closed MTOMCAT-155. -- Resolution: Fixed Fix Version/s: 2.0 Assignee: Olivier Lamy (*$

[GUMP@vmgump]: Project tomcat-trunk-validate (in module tomcat-trunk) failed

2012-05-28 Thread Bill Barker
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-validate has an issue affecting its community integration. Th

svn commit: r1343308 - /tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml

2012-05-28 Thread kkolinko
Author: kkolinko Date: Mon May 28 16:11:03 2012 New Revision: 1343308 URL: http://svn.apache.org/viewvc?rev=1343308&view=rev Log: Correct version number typo Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml URL: http://s

svn commit: r1343313 - in /tomcat/jk/trunk: HOWTO-RELEASE.txt native/iis/README native/netscape/README

2012-05-28 Thread kkolinko
Author: kkolinko Date: Mon May 28 16:45:34 2012 New Revision: 1343313 URL: http://svn.apache.org/viewvc?rev=1343313&view=rev Log: Followup to r1343258 Update version number in two other files mentioned in HOWTO-RELEASE.txt Update HOWTO-RELEASE.txt File "native/common/portable.h.sample" was removed

[GUMP@vmgump]: Project tomcat-tc7.0.x-test (in module tomcat-7.0.x) failed

2012-05-28 Thread Bill Barker
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

Re: svn commit: r1343301 - /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java

2012-05-28 Thread Konstantin Kolinko
2012/5/28 : > Author: olamy > Date: Mon May 28 15:53:09 2012 > New Revision: 1343301 > > URL: http://svn.apache.org/viewvc?rev=1343301&view=rev > Log: > [MTOMCAT-155] allow exec-war war run dependencies that are generated in > current mvn execution, but not yet installed to maven repo > Submitted

[GUMP@vmgump]: Project tomcat-trunk-test (in module tomcat-trunk) failed

2012-05-28 Thread Bill Barker
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 i

[Bug 53139] Prevent showing keystore/truststore passwords via JMX in cleartext (with solution)

2012-05-28 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=53139 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|---

svn commit: r1343333 - /tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java

2012-05-28 Thread kkolinko
Author: kkolinko Date: Mon May 28 17:43:11 2012 New Revision: 134 URL: http://svn.apache.org/viewvc?rev=134&view=rev Log: Fix unused import identified by Checkstyle Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Modified: tomcat/trunk/java/org/apache/catalina

[jira] [Commented] (MTOMCAT-155) allow exec-war war run dependencies that are generated in current mvn execution, but not yet installed to maven repo

2012-05-28 Thread Hudson (JIRA)
[ https://issues.apache.org/jira/browse/MTOMCAT-155?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13284495#comment-13284495 ] Hudson commented on MTOMCAT-155: Integrated in TomcatMavenPlugin-mvn3.x #156 (See [https

svn commit: r1343335 - in /tomcat/trunk/java/org/apache/catalina: core/StandardHost.java startup/HostConfig.java

2012-05-28 Thread kkolinko
Author: kkolinko Date: Mon May 28 17:47:35 2012 New Revision: 1343335 URL: http://svn.apache.org/viewvc?rev=1343335&view=rev Log: Correct broken HTML in Javadoc comment. -> Modified: tomcat/trunk/java/org/apache/catalina/core/StandardHost.java tomcat/trunk/java/org/apache/catali

svn commit: r1343337 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/StandardHost.java java/org/apache/catalina/startup/HostConfig.java

2012-05-28 Thread kkolinko
Author: kkolinko Date: Mon May 28 17:50:14 2012 New Revision: 1343337 URL: http://svn.apache.org/viewvc?rev=1343337&view=rev Log: Merged revision 1343335 from tomcat/trunk: Correct broken HTML in Javadoc comment. -> Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.

svn commit: r1343352 - /tomcat/tc6.0.x/trunk/java/javax/el/ResourceBundleELResolver.java

2012-05-28 Thread kkolinko
Author: kkolinko Date: Mon May 28 18:25:46 2012 New Revision: 1343352 URL: http://svn.apache.org/viewvc?rev=1343352&view=rev Log: CTR: whitespace tabs -> spaces. No functional change. Modified: tomcat/tc6.0.x/trunk/java/javax/el/ResourceBundleELResolver.java Modified: tomcat/tc6.0.x/trunk/ja

svn commit: r1343356 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/javax/el/ResourceBundleELResolver.java webapps/docs/changelog.xml

2012-05-28 Thread kkolinko
Author: kkolinko Date: Mon May 28 18:44:19 2012 New Revision: 1343356 URL: http://svn.apache.org/viewvc?rev=1343356&view=rev Log: 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 (r769336) since the use case d

[Bug 53001] Behaviour of ResourceBundleELResolver

2012-05-28 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=53001 Konstantin Kolinko changed: What|Removed |Added Status|NEW |RESOLVED Resolution|-

svn commit: r1343361 - /tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

2012-05-28 Thread kkolinko
Author: kkolinko Date: Mon May 28 19:22:32 2012 New Revision: 1343361 URL: http://svn.apache.org/viewvc?rev=1343361&view=rev Log: "Webapps" -> "Web applications", like it is in Tomcat 7 changelog file. Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/w

[Bug 53301] Servlet init method called twice with embedded Tomcat

2012-05-28 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=53301 --- Comment #4 from Jeff MAURY --- Sorry, but the intent was not to get support but rather to signal the Tomcat community of the problem. I agree I should have given more materials about the problem: so you should find now a sample Maven pr

[Bug 53301] Servlet init method called twice with embedded Tomcat

2012-05-28 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=53301 --- Comment #5 from Jeff MAURY --- Created attachment 28844 --> https://issues.apache.org/bugzilla/attachment.cgi?id=28844&action=edit Sample Maven project with a test -- You are receiving this mail because: You are the assignee for the

svn commit: r1343369 - in /tomcat/tc6.0.x/trunk/webapps: docs/changelog.xml host-manager/401.jsp host-manager/403.jsp manager/401.jsp manager/403.jsp

2012-05-28 Thread kkolinko
Author: kkolinko Date: Mon May 28 19:30:41 2012 New Revision: 1343369 URL: http://svn.apache.org/viewvc?rev=1343369&view=rev Log: Backport http://svn.apache.org/viewvc?view=revision&revision=1084103 Remove unnecessary code that makes switching to other authentication methods difficult. Fixes http

Re: svn commit: r1343301 - /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java

2012-05-28 Thread Olivier Lamy
2012/5/28 Konstantin Kolinko : > 2012/5/28  : >> Author: olamy >> Date: Mon May 28 15:53:09 2012 >> New Revision: 1343301 >> >> URL: http://svn.apache.org/viewvc?rev=1343301&view=rev >> Log: >> [MTOMCAT-155] allow exec-war war run dependencies that are generated in >> current mvn execution, but no

svn commit: r1343375 - /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java

2012-05-28 Thread olamy
Author: olamy Date: Mon May 28 19:41:03 2012 New Revision: 1343375 URL: http://svn.apache.org/viewvc?rev=1343375&view=rev Log: use File rather than String Modified: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.jav

svn commit: r1343379 - /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java

2012-05-28 Thread kkolinko
Author: kkolinko Date: Mon May 28 19:52:11 2012 New Revision: 1343379 URL: http://svn.apache.org/viewvc?rev=1343379&view=rev Log: Re r1343375 : simplify code. No functional change. Modified: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/r

[Bug 53301] Servlet init method called twice with embedded Tomcat

2012-05-28 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=53301 Konstantin Kolinko changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|I

[Bug 53301] Servlet init method called twice with embedded Tomcat

2012-05-28 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=53301 --- Comment #7 from Konstantin Kolinko --- Created attachment 28845 --> https://issues.apache.org/bugzilla/attachment.cgi?id=28845&action=edit SampleServlet.java SampleServlet.java update. Added stackstace printing in init(). Overwrote d

svn commit: r1343394 - /tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java

2012-05-28 Thread markt
Author: markt Date: Mon May 28 21:16:29 2012 New Revision: 1343394 URL: http://svn.apache.org/viewvc?rev=1343394&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53090 Include superclasses when considering injection targets Patch provided by Borislav Kapukaranov Modified:

svn commit: r1343396 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/DefaultInstanceManager.java webapps/docs/changelog.xml

2012-05-28 Thread markt
Author: markt Date: Mon May 28 21:22:47 2012 New Revision: 1343396 URL: http://svn.apache.org/viewvc?rev=1343396&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53090 Include superclasses when considering injection targets Patch provided by Borislav Kapukaranov Modified:

[Bug 53090] Servlet superclass injection targets are ignored

2012-05-28 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=53090 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|---

svn commit: r1343400 - /tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java

2012-05-28 Thread markt
Author: markt Date: Mon May 28 21:43:31 2012 New Revision: 1343400 URL: http://svn.apache.org/viewvc?rev=1343400&view=rev Log: Better error message if a ClassFormatException is encountered during annotation scanning and do not fail to start the web app in that case. Modified: tomcat/trunk/jav

svn commit: r1343401 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/ContextConfig.java webapps/docs/changelog.xml

2012-05-28 Thread markt
Author: markt Date: Mon May 28 21:46:11 2012 New Revision: 1343401 URL: http://svn.apache.org/viewvc?rev=1343401&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53161 Better error message if a ClassFormatException is encountered during annotation scanning and do not fail to st

[Bug 53161] Need better error message for annotation scanning errors

2012-05-28 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=53161 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|---

svn commit: r1343405 - in /tomcat/tc6.0.x/trunk: ./ webapps/docs/ webapps/host-manager/ webapps/host-manager/WEB-INF/ webapps/host-manager/WEB-INF/jsp/ webapps/manager/ webapps/manager/WEB-INF/ webapp

2012-05-28 Thread kkolinko
Author: kkolinko Date: Mon May 28 22:03:49 2012 New Revision: 1343405 URL: http://svn.apache.org/viewvc?rev=1343405&view=rev Log: Part 2 of fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=52983 Prevent the custom error pages for the Manager and Host Manager applications from being acces

svn commit: r1343406 - in /tomcat/tc6.0.x/trunk/webapps/host-manager/WEB-INF/jsp: 401.jsp 403.jsp

2012-05-28 Thread kkolinko
Author: kkolinko Date: Mon May 28 22:13:14 2012 New Revision: 1343406 URL: http://svn.apache.org/viewvc?rev=1343406&view=rev Log: Correct typos in host-manager error pages. These are already fixed in trunk by r1060486 Modified: tomcat/tc6.0.x/trunk/webapps/host-manager/WEB-INF/jsp/401.jsp

svn commit: r1343410 - in /tomcat/tc6.0.x/trunk: ./ webapps/docs/deployer-howto.xml

2012-05-28 Thread kkolinko
Author: kkolinko Date: Mon May 28 22:25:48 2012 New Revision: 1343410 URL: http://svn.apache.org/viewvc?rev=1343410&view=rev Log: Documentation: s/manager/manager-script/ in deployer-howto.xml All other changes from r1060486 have already been applied to 6.0 so mark it as merged. Modified: t

[Bug 52983] DIGEST auth broken on 6.0.x manager app because of redundant WWW-Authenticate header in 401.jsp

2012-05-28 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=52983 Konstantin Kolinko changed: What|Removed |Added Status|NEW |RESOLVED Resolution|-

svn commit: r1343411 - /tomcat/tc6.0.x/trunk/STATUS.txt

2012-05-28 Thread kkolinko
Author: kkolinko Date: Mon May 28 22:39:41 2012 New Revision: 1343411 URL: http://svn.apache.org/viewvc?rev=1343411&view=rev Log: Formally propose additional patch, that was mentioned in the vote. Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http:

svn propchange: r1343400 - svn:log

2012-05-28 Thread kkolinko
Author: kkolinko Revision: 1343400 Modified property: svn:log Modified: svn:log at Mon May 28 22:46:20 2012 -- --- svn:log (original) +++ svn:log Mon May 28 22:46:20 2012 @@ -1,2 +1,3 @@ +Fix https://issues.apache.org/bugz

[Bug 53090] Servlet superclass injection targets are ignored

2012-05-28 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=53090 --- Comment #2 from Konstantin Kolinko --- Re r1343396 : I wonder whether interfaces should be scanned as well. Can injection-target-class be an interface? -- You are receiving this mail because: You are the assignee for the bug. --

svn commit: r1343431 - in /tomcat: tc5.5.x/trunk/STATUS.txt tc6.0.x/trunk/STATUS.txt

2012-05-28 Thread kkolinko
Author: kkolinko Date: Mon May 28 23:42:00 2012 New Revision: 1343431 URL: http://svn.apache.org/viewvc?rev=1343431&view=rev Log: Propose backport of r1342795 Modified: tomcat/tc5.5.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://