svn commit: r1156978 - /tomcat/tc5.5.x/trunk/STATUS.txt

2011-08-11 Thread kfujino
Author: kfujino
Date: Fri Aug 12 06:31:56 2011
New Revision: 1156978

URL: http://svn.apache.org/viewvc?rev=1156978&view=rev
Log:
vote

Modified:
tomcat/tc5.5.x/trunk/STATUS.txt

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1156978&r1=1156977&r2=1156978&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Fri Aug 12 06:31:56 2011
@@ -80,7 +80,7 @@ PATCHES PROPOSED TO BACKPORT:
 * https://issues.apache.org/bugzilla/show_bug.cgi?id=51403
   Avoid NPE in JULI FileHandler if formatter is misconfigured
   http://svn.apache.org/viewvc?rev=1137996&view=rev
-  +1: kkolinko, markt
+  +1: kkolinko, markt, kfujino
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=36362
@@ -89,7 +89,7 @@ PATCHES PROPOSED TO BACKPORT:
   http://svn.apache.org/viewvc?rev=1138953&view=rev
   http://svn.apache.org/viewvc?rev=1140693&view=rev
   http://svn.apache.org/viewvc?rev=1142043&view=rev
-  +1: markt, kkolinko
+  +1: markt, kkolinko, kfujino
   -1:
 
 * Multiple improvements to the Windows Installer
@@ -121,7 +121,7 @@ PATCHES PROPOSED TO BACKPORT:
   Fix concatenation of values in SecurityConfig.setSecurityProperty()
   when the value provided by JRE is null.
   http://svn.apache.org/viewvc?rev=1142904&view=rev
-  +1: kkolinko, markt
+  +1: kkolinko, markt, kfujino
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51324
@@ -129,24 +129,24 @@ PATCHES PROPOSED TO BACKPORT:
   ensure that the doFlush flag does not get stuck in the enabled state.
   Patch by Jeremy Norris.
   http://svn.apache.org/viewvc?rev=1133014&view=rev
-  +1: kkolinko, markt
+  +1: kkolinko, markt, kfujino
   -1:
 
 * Fix various sendfile issues. CVE-2011-2526
   This is a port of r1145380, r1145694 and r1146005
   http://people.apache.org/~markt/patches/2011-07-13-cve-2011-2526-tc5.patch
-  +1: markt
+  +1: markt, kfujino
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41179
   Return 404 rather than 400 if no ROOT context is deployed
   http://people.apache.org/~markt/patches/2011-07-22-bug41179-tc5.patch
-  +1: markt
+  +1: markt, kfujino
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51647
   Session replication fails with ClassNotFoundException when session attribute
   is Java dynamic proxy
   https://issues.apache.org/bugzilla/attachment.cgi?id=27375
-  +1: markt
+  +1: markt, kfujino
   -1:



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: ServletRequestListener.requestDestroyed is called before request leaves a webapp

2011-08-11 Thread Volodymyr Sobotovich
I submitted BUG51653
(https://issues.apache.org/bugzilla/show_bug.cgi?id=51653) for this
issue.

On Wed, Aug 10, 2011 at 4:47 PM, Christopher Schultz
 wrote:
> Mark,
>
> On 8/9/2011 4:35 PM, Mark Thomas wrote:
>> Addressing this would mean either:
>> a) moving the error handling to the context (inside the calls to the
>> ServletRequestListener) or
>
> +1
>
> This just feels like the right state management level to me. Certainly
> the default error handler can be called just as easily from this level
> of the code.
>
> -chris
>
>

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 51653] New: ServletRequestListener.requestDestroyed is called before request leaves a webapp

2011-08-11 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51653

 Bug #: 51653
   Summary: ServletRequestListener.requestDestroyed is called
before request leaves a webapp
   Product: Tomcat 7
   Version: 7.0.19
  Platform: PC
OS/Version: Linux
Status: NEW
  Severity: major
  Priority: P2
 Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: whel...@gmail.com
Classification: Unclassified


Created attachment 27379
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=27379
Sample webapp demonstrating the issue

I use Tomcat 7.0.19, jdk 1.7.0-b147, Ubuntu Linux 11.04.

Steps to reproduce:
1. declare error page for 404 code in web.xml
2. Set location of that page to some servlet (let's call it ErrorServlet)
3. go to any invalid URL in webapp (to cause 404)
4. ErrorServlet is called after requestDestroyed on any registered listener.
This kind of behaviour is not correct in my opinion because it
contradicts to contract of ServletRequestListener.
Also it breaks org.springframework.web.context.request.RequestContextListener
if ErrorServlet uses session-scoped beans.

Description of the attached war file:
1. wheleph.RequestContextListener sets a local variable in requestInitialized
and resets it in requestDestroyed
2. wheleph.SecondServlet writes to System.out the value of that variable thus
showing whether it was called between requestInitialized and requestDestroyed
or not. It's registered as 404 handler.
3. To reproduce the bug go to any invalid url (like
http://localhost:8080/SpringListenerPOC/abcd) and see the message in log: 
"SecondServlet
in scope: false"

The relevant thread from dev.tomcat.apache.org:

On 09/08/2011 20:55, Volodymyr Sobotovich wrote:
> Hello, everyone.
>
> I think I have found a bug in Tomcat's lifecycle handling of
> ServletRequestListener. I'd like to discuss it here before posting.
> Tomcat 7.0.19, jdk 1.7.0-b147, Ubuntu Linux 11.04
> Steps to reproduce:
> 1. declare error page for 404 code in web.xml
> 2. Set location of that page to some servlet (let's call it ErrorServlet)
> 3. go to any invalid URL in webapp (to cause 404)
> 4. ErrorServlet is called after requestDestroyed on any registered listener.
> This kind of behaviour is not correct in my opinion because it
> contradicts to contract of ServletRequestListener.
> Also it breaks org.springframework.web.context.request.RequestContextListener
> if ErrorServlet uses session-scoped beans.
>
> What do you think about that. Should I post in to Bugzilla?

Hmm.

The error page handling is currently at the host level. One could argue
the listeners are being fired in the right place (when processing
enters/leaves the context). However, custom error pages defined by the
web app are currently outside the listener calls and that doesn't seem
right.

Addressing this would mean either:
a) moving the error handling to the context (inside the calls to the
ServletRequestListener) or
b) moving the calls to ServletRequestListener to the host level

I am leaning towards a) but wondering why things are the way the are
currently.

I'd suggest leaving this on the dev list for other folks to comment and
then add it to BZ in a couple of days unless the consensus is that it is
not a bug. The next 7.0.x release won;t be until early Sept so there is
plenty of time to get this right.

Mark

===
Mark,

On 8/9/2011 4:35 PM, Mark Thomas wrote:
> Addressing this would mean either:
> a) moving the error handling to the context (inside the calls to the
> ServletRequestListener) or

+1

This just feels like the right state management level to me. Certainly
the default error handler can be called just as easily from this level
of the code.

-chris

-- 
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 51650] possible nullpointer exception in RequestUtil.parseParameters

2011-08-11 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51650

Felix Schumacher  changed:

   What|Removed |Added

  Attachment #27376|0   |1
is obsolete||

--- Comment #2 from Felix Schumacher  
2011-08-12 04:50:31 UTC ---
Created attachment 27378
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=27378
document that encoding must not be null and remove check

-- 
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 51652] Saxon JAR in the application's WEB-INF/lib will cause javax.xml.parsers.ParserConfigurationException: AElfred parser is namespace-aware

2011-08-11 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51652

Vlad  changed:

   What|Removed |Added

   Priority|P2  |P4
 OS/Version||Windows 7

-- 
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 51652] New: Saxon JAR in the application's WEB-INF/lib will cause javax.xml.parsers.ParserConfigurationException: AElfred parser is namespace-aware

2011-08-11 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51652

 Bug #: 51652
   Summary: Saxon JAR in the application's WEB-INF/lib will cause
javax.xml.parsers.ParserConfigurationException:
AElfred parser is namespace-aware
   Product: Tomcat 7
   Version: 7.0.16
  Platform: PC
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: v...@aviarc.com.au
Classification: Unclassified


Created attachment 27377
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=27377
Extraction from log with error trace

I have an application which includes saxon6.5.5.jar into its WEB-INF/lib
directory which seems to be causing the exception specified as soon as I start
the Tomcat.

The OS is Win7x64, Tomcat only has default webapps and no additional
configuration.

That looks like a similar issue to
https://issues.apache.org/bugzilla/show_bug.cgi?id=29936.

Please note that I can't just upgrade the saxon library as this is an old
application for which we still providing the support.

Strangely enough running the exact same app on the Tomcat 5.5.15 (although
WinXPx32) seems to be working without problems.

The trace from the log is attached.

-- 
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



[Tomcat Wiki] Update of "HowTo" by ChristopherSchultz

2011-08-11 Thread Apache Wiki
Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change 
notification.

The "HowTo" page has been changed by ChristopherSchultz:
http://wiki.apache.org/tomcat/HowTo?action=diff&rev1=113&rev2=114

  
  To send a SIGQUIT, use ''kill -3 '' from the command line.
  
+ === If you are running on Microsoft Windows ===
+ You can try to use SendSignal, developed specifically for this purpose. Make 
sure you read the comments for certain sitautions (e.g. running as a service, 
RDP connections, etc.). 
http://www.latenighthacking.com/projects/2003/sendSignal/
+ 
+ 
  === If you are running Tomcat as a service on Microsoft Windows ===
  Edit your service to add the "//MS//" option to the command line. This 
enabled the "Monitor Service" which puts an icon in the system tray while 
Tomcat is running. Right-clicking the Tomcat monitor in the system tray allows 
you to produce a thread dump in stdout.
  

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: Hosting the current Tomcat Maven Plugin from mojo codehaus

2011-08-11 Thread Olivier Lamy
Hello,
For folks who don't follow incubator@, some update available for this
thread here : http://markmail.org/message/xtsrzwyrosxdcina .

--
Olivier

2011/8/9 Olivier Lamy :
> In the same page, I can read a note about lazy consensus.
> FYI I have asked in this thread [1].
>
> Thanks,
> --
> Olivier
>
> [1] http://markmail.org/message/guvbec2h7hdj3zps
>
> 2011/8/9 Mark Thomas :
>> On 08/08/2011 13:15, Olivier Lamy wrote:
>>> Hello,
>>> So Ip clearance committed [1]
>>> Web site need sync.
>>> Let me know how do move forward now ?
>>
>> According to http://incubator.apache.org/ip-clearance/index.html the
>> incubator PMC needs to approve this then we are free to import the code.
>>
>> Mark
>>
>> -
>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>> For additional commands, e-mail: dev-h...@tomcat.apache.org
>>
>>
>
>
>
> --
> Olivier Lamy
> Talend : http://talend.com
> http://twitter.com/olamy | http://linkedin.com/in/olamy
>

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 50140] Silent installation into wrong target directory

2011-08-11 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50140

--- Comment #8 from Chris LeCompte  2011-08-11 
18:30:44 UTC ---
This issue does not seem to address the case when the JRE is provided by a JDK
installation.  In that case the HKLM "SOFTWARE\JavaSoft\Java Runtime
Environment" key is not present, only a Java Development Environment key.  I
found this whilst trying to perform a silent install using a 64-bit JDK
(1.5.0_14) on windows 2008 server.  

A manual install is still possible but it does not auto detect the location
there as well. The other work around is to install a JRE but that doesn't quite
mesh well with the app I'm installing.

-- 
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 51650] possible nullpointer exception in RequestUtil.parseParameters

2011-08-11 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51650

--- Comment #1 from Mark Thomas  2011-08-11 17:20:33 UTC ---
Rather than adding NPE protection, the null check in that method can be
removed. Tomcat always calls those methods with an encoding.

-- 
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 51650] New: possible nullpointer exception in RequestUtil.parseParameters

2011-08-11 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51650

 Bug #: 51650
   Summary: possible nullpointer exception in
RequestUtil.parseParameters
   Product: Tomcat 7
   Version: trunk
  Platform: All
OS/Version: All
Status: NEW
  Severity: trivial
  Priority: P2
 Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: felix.schumac...@internetallee.de
Classification: Unclassified


Created attachment 27376
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=27376
set default encoding, if none is given

When encoding is null, RequestUtil.parseParameters will throw a NPE at
B2CConverter.getCharset.

-- 
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 51649] New: Web documentation about listeners should mention ThreadLocalLeakPreventionListener

2011-08-11 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51649

 Bug #: 51649
   Summary: Web documentation about listeners should mention
ThreadLocalLeakPreventionListener
   Product: Tomcat 7
   Version: unspecified
  Platform: PC
OS/Version: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Documentation
AssignedTo: dev@tomcat.apache.org
ReportedBy: d.tonho...@m-plify.com
Classification: Unclassified


Page 

http://tomcat.apache.org/tomcat-7.0-doc/config/listeners.html

does not say anything about the

http://tomcat.apache.org/tomcat-7.0-doc/api/org/apache/catalina/core/ThreadLocalLeakPreventionListener.html

I guess it should?

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1156608 - /tomcat/trunk/res/ide-support/eclipse/java-compiler-errors-warnings.txt

2011-08-11 Thread kkolinko
Author: kkolinko
Date: Thu Aug 11 13:17:20 2011
New Revision: 1156608

URL: http://svn.apache.org/viewvc?rev=1156608&view=rev
Log:
Document two new compiler warnings added in Eclipse 3.7 Indigo.
These could be Warnings, but more experience is needed first. "Ignore" are 
their default values.

Modified:
tomcat/trunk/res/ide-support/eclipse/java-compiler-errors-warnings.txt

Modified: tomcat/trunk/res/ide-support/eclipse/java-compiler-errors-warnings.txt
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/ide-support/eclipse/java-compiler-errors-warnings.txt?rev=1156608&r1=1156607&r2=1156608&view=diff
==
--- tomcat/trunk/res/ide-support/eclipse/java-compiler-errors-warnings.txt 
(original)
+++ tomcat/trunk/res/ide-support/eclipse/java-compiler-errors-warnings.txt Thu 
Aug 11 13:17:20 2011
@@ -15,7 +15,7 @@
   limitations under the License.
 

 
-The following settings are for Helios Service Release 1
+The following settings are for Indigo Release
 W = Warning
 I = Ignore
 E = Error
@@ -29,6 +29,8 @@ Code style
  - Method with a constructor name   - W
  - Parameter assignment - I
  - Non-externalized strings - I
+ - Method can be static - I (Eclipse 3.7+)
+ - Method can potentially be static - I (Eclipse 3.7+)
 Potential programming errors
  - All  - W
 Name shadowing and conflicts



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1156607 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

2011-08-11 Thread markt
Author: markt
Date: Thu Aug 11 13:13:12 2011
New Revision: 1156607

URL: http://svn.apache.org/viewvc?rev=1156607&view=rev
Log:
Add release date

Modified:
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1156607&r1=1156606&r2=1156607&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Aug 11 13:13:12 2011
@@ -90,7 +90,7 @@
 
   
 
-
+
   
 
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1156606 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

2011-08-11 Thread markt
Author: markt
Date: Thu Aug 11 13:12:06 2011
New Revision: 1156606

URL: http://svn.apache.org/viewvc?rev=1156606&view=rev
Log:
Add missing tags

Modified:
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1156606&r1=1156605&r2=1156606&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Aug 11 13:12:06 2011
@@ -75,8 +75,10 @@
   
   
 
-  51641: Use correct key when removing processor instances from
-  the connections map during clean-up. Patch provided by zhh. (mark)
+  
+51641: Use correct key when removing processor instances 
from
+the connections map during clean-up. Patch provided by zhh. (mark)
+  
 
   
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1156605 - in /tomcat/site/trunk: docs/ xdocs/

2011-08-11 Thread markt
Author: markt
Date: Thu Aug 11 13:07:59 2011
New Revision: 1156605

URL: http://svn.apache.org/viewvc?rev=1156605&view=rev
Log:
Update for 7.0.20 release

Modified:
tomcat/site/trunk/docs/doap_Tomcat.rdf
tomcat/site/trunk/docs/download-70.html
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/migration.html
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/xdocs/doap_Tomcat.rdf
tomcat/site/trunk/xdocs/download-70.xml
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/migration.xml
tomcat/site/trunk/xdocs/oldnews.xml
tomcat/site/trunk/xdocs/whichversion.xml

Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=1156605&r1=1156604&r2=1156605&view=diff
==
--- tomcat/site/trunk/docs/doap_Tomcat.rdf (original)
+++ tomcat/site/trunk/docs/doap_Tomcat.rdf Thu Aug 11 13:07:59 2011
@@ -56,7 +56,7 @@
   
 Latest Stable 7.0.x Release
 2011-07-19
-7.0.19
+7.0.20
   
 
 

Modified: tomcat/site/trunk/docs/download-70.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-70.html?rev=1156605&r1=1156604&r2=1156605&view=diff
==
--- tomcat/site/trunk/docs/download-70.html (original)
+++ tomcat/site/trunk/docs/download-70.html Thu Aug 11 13:07:59 2011
@@ -241,8 +241,8 @@
 
 
 http://www.apache.org/dist/tomcat/tomcat-7/KEYS";>KEYS |
-7.0.19 |
-Browse 
|
+7.0.20 |
+Browse 
|
 http://archive.apache.org/dist/tomcat/tomcat-7";>Archives
   
 
@@ -342,8 +342,8 @@
 
 
 
-
-7.0.19
+
+7.0.20
 
 
 
@@ -353,8 +353,8 @@
 
 
   
-  Please see the 
-  README
+  Please see the 
+  README
   file for packaging information.  It explains what every distribution 
contains.
   
 
@@ -378,95 +378,95 @@
 Core:
   
   
-zip 
-(http://www.apache.org/dist/tomcat/tomcat-7/v7.0.19/bin/apache-tomcat-7.0.19.zip.asc";>pgp,
 
-http://www.apache.org/dist/tomcat/tomcat-7/v7.0.19/bin/apache-tomcat-7.0.19.zip.md5";>md5)
+zip 
+(http://www.apache.org/dist/tomcat/tomcat-7/v7.0.20/bin/apache-tomcat-7.0.20.zip.asc";>pgp,
 
+http://www.apache.org/dist/tomcat/tomcat-7/v7.0.20/bin/apache-tomcat-7.0.20.zip.md5";>md5)
   
   
-tar.gz 
-(http://www.apache.org/dist/tomcat/tomcat-7/v7.0.19/bin/apache-tomcat-7.0.19.tar.gz.asc";>pgp,
 
-http://www.apache.org/dist/tomcat/tomcat-7/v7.0.19/bin/apache-tomcat-7.0.19.tar.gz.md5";>md5)
+tar.gz 
+(http://www.apache.org/dist/tomcat/tomcat-7/v7.0.20/bin/apache-tomcat-7.0.20.tar.gz.asc";>pgp,
 
+http://www.apache.org/dist/tomcat/tomcat-7/v7.0.20/bin/apache-tomcat-7.0.20.tar.gz.md5";>md5)
   
   
-32-bit Windows zip 
-(http://www.apache.org/dist/tomcat/tomcat-7/v7.0.19/bin/apache-tomcat-7.0.19-windows-x86.zip.asc";>pgp,
 
-http://www.apache.org/dist/tomcat/tomcat-7/v7.0.19/bin/apache-tomcat-7.0.19-windows-x86.zip.md5";>md5)
+32-bit Windows zip 
+(http://www.apache.org/dist/tomcat/tomcat-7/v7.0.20/bin/apache-tomcat-7.0.20-windows-x86.zip.asc";>pgp,
 
+http://www.apache.org/dist/tomcat/tomcat-7/v7.0.20/bin/apache-tomcat-7.0.20-windows-x86.zip.md5";>md5)
   
   
-64-bit Windows zip 
-(http://www.apache.org/dist/tomcat/tomcat-7/v7.0.19/bin/apache-tomcat-7.0.19-windows-x64.zip.asc";>pgp,
 
-http://www.apache.org/dist/tomcat/tomcat-7/v7.0.19/bin/apache-tomcat-7.0.19-windows-x64.zip.md5";>md5)
+64-bit Windows zip 
+(http://www.apache.org/dist/tomcat/tomcat-7/v7.0.20/bin/apache-tomcat-7.0.20-windows-x64.zip.asc";>pgp,
 
+http://www.apache.org/dist/tomcat/tomcat-7/v7.0.20/bin/apache-tomcat-7.0.20-windows-x64.zip.md5";>md5)
   
   
-64-bit Itanium Windows zip 
-(http://www.apache.org/dist/tomcat/tomcat-7/v7.0.19/bin/apache-tomcat-7.0.19-windows-i64.zip.asc";>pgp,
 
-http://www.apache.org/dist/tomcat/tomcat-7/v7.0.19/bin/apache-tomcat-7.0.19-windows-i64.zip.md5";>md5)
+64-bit Itanium Windows zip 
+(http://www.apache.org/dist/tomcat/tomcat-7/v7.0.20/bin/apache-tomcat-7.0.20-windows-i64.zip.asc";>pgp,
 
+http://www.apache.org/dist/tomcat/tomcat-7/v7.0.20/bin/apache-tomcat-7.0.20-windows-i64.zip.md5";>md5)
   
   
-32-bit/64-bit Windows Service Installer 
-(http://www.apache.org/dist/tomcat/tomcat-7/v7.0.19/bin/apache-tomcat-7.0.19.exe.asc";>pgp,
 
-http://www.apache.org/dist/tomcat/tomcat-7/

[RESULT] [VOTE] Release Apache Tomcat 7.0.20

2011-08-11 Thread Mark Thomas
The were five binding votes for stable and no other votes.

I'll start moving the files now and announce once the mirrors have
sync'd (probably in 4 to 8 hours time).

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1156603 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/connector/Response.java

2011-08-11 Thread markt
Author: markt
Date: Thu Aug 11 12:48:16 2011
New Revision: 1156603

URL: http://svn.apache.org/viewvc?rev=1156603&view=rev
Log:
Follow up to r1156533. Filter URL (mainly in case of &).

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Response.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 11 12:48:16 2011
@@ -1 +1 @@
-/tomcat/trunk:1156171,1156276,1156304,1156530
+/tomcat/trunk:1156171,1156276,1156304,1156530,1156602

Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Response.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Response.java?rev=1156603&r1=1156602&r2=1156603&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Response.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Response.java Thu 
Aug 11 12:48:16 2011
@@ -49,6 +49,7 @@ import org.apache.catalina.core.Applicat
 import org.apache.catalina.security.SecurityUtil;
 import org.apache.catalina.util.CharsetMapper;
 import org.apache.catalina.util.DateTool;
+import org.apache.catalina.util.RequestUtil;
 import org.apache.tomcat.util.buf.CharChunk;
 import org.apache.tomcat.util.buf.UEncoder;
 import org.apache.tomcat.util.http.FastHttpDateFormat;
@@ -1335,8 +1336,8 @@ public class Response
 setStatus(SC_FOUND);
 setHeader("Location", absolute);
 PrintWriter writer = getWriter();
-writer.print(
-sm.getString("coyoteResponse.sendRedirect.note", 
absolute));
+writer.print(sm.getString("coyoteResponse.sendRedirect.note",
+RequestUtil.filter(absolute)));
 flushBuffer();
 } catch (IllegalArgumentException e) {
 setStatus(SC_NOT_FOUND);



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1156602 - /tomcat/trunk/java/org/apache/catalina/connector/Response.java

2011-08-11 Thread markt
Author: markt
Date: Thu Aug 11 12:46:27 2011
New Revision: 1156602

URL: http://svn.apache.org/viewvc?rev=1156602&view=rev
Log:
Follow up to r1156530. Filter URL (mainly in case of &).

Modified:
tomcat/trunk/java/org/apache/catalina/connector/Response.java

Modified: tomcat/trunk/java/org/apache/catalina/connector/Response.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Response.java?rev=1156602&r1=1156601&r2=1156602&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Response.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Response.java Thu Aug 11 
12:46:27 2011
@@ -49,6 +49,7 @@ import org.apache.catalina.core.Applicat
 import org.apache.catalina.security.SecurityUtil;
 import org.apache.catalina.util.CharsetMapper;
 import org.apache.catalina.util.DateTool;
+import org.apache.catalina.util.RequestUtil;
 import org.apache.tomcat.util.buf.CharChunk;
 import org.apache.tomcat.util.buf.UEncoder;
 import org.apache.tomcat.util.http.FastHttpDateFormat;
@@ -1335,8 +1336,8 @@ public class Response
 setStatus(SC_FOUND);
 setHeader("Location", absolute);
 PrintWriter writer = getWriter();
-writer.print(
-sm.getString("coyoteResponse.sendRedirect.note", 
absolute));
+writer.print(sm.getString("coyoteResponse.sendRedirect.note",
+RequestUtil.filter(absolute)));
 flushBuffer();
 } catch (IllegalArgumentException e) {
 setStatus(SC_NOT_FOUND);



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1156579 - /tomcat/tc5.5.x/trunk/STATUS.txt

2011-08-11 Thread markt
Author: markt
Date: Thu Aug 11 11:50:15 2011
New Revision: 1156579

URL: http://svn.apache.org/viewvc?rev=1156579&view=rev
Log:
Proposal

Modified:
tomcat/tc5.5.x/trunk/STATUS.txt

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1156579&r1=1156578&r2=1156579&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Aug 11 11:50:15 2011
@@ -143,3 +143,10 @@ PATCHES PROPOSED TO BACKPORT:
   http://people.apache.org/~markt/patches/2011-07-22-bug41179-tc5.patch
   +1: markt
   -1:
+
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51647
+  Session replication fails with ClassNotFoundException when session attribute
+  is Java dynamic proxy
+  https://issues.apache.org/bugzilla/attachment.cgi?id=27375
+  +1: markt
+  -1:



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 51647] Session replication fails with ClassNotFoundException when session attribute is Java dynamic proxy (java.lang.reflect.Proxy).

2011-08-11 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51647

--- Comment #1 from Mark Thomas  2011-08-11 11:49:22 UTC ---
Created attachment 27375
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=27375
Expanded patch

This expanded patch covers both cluster implementations in 5.5.x and slightly
simplifies the proposed 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



Re: svn commit: r1156530 - in /tomcat/trunk/java/org/apache/catalina/connector: LocalStrings.properties Response.java

2011-08-11 Thread Mark Thomas
On 11/08/2011 12:18, Konstantin Kolinko wrote:
> 2011/8/11 Mark Thomas :
>> On 11/08/2011 11:53, Tim Funk wrote:
>>> It may be overkill ... but should "absolute" be XML escaped?
>>
>> I don't think so. It is meant to be a valid, encoded URL. It it isn't,
>> it will cause problems in the location header too.
> 
> & -> &

That does seem to cause display issues. I'll add some escaping.

> In general, I do not like this new feature. Does Apache HTTPD have it?

Yes. I checked before applying the patch.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 50326] Problem with DBCP 1.3 /jdk 6 and oracle spatial

2011-08-11 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50326

--- Comment #13 from Nils Hildebrand  2011-08-11 
11:40:42 UTC ---
Follow the DBCP-link... Hybernate uses DBCP not vice versa. Hybernate is not
part of Tomcat.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: svn commit: r1156530 - in /tomcat/trunk/java/org/apache/catalina/connector: LocalStrings.properties Response.java

2011-08-11 Thread Konstantin Kolinko
2011/8/11 Mark Thomas :
> On 11/08/2011 11:53, Tim Funk wrote:
>> It may be overkill ... but should "absolute" be XML escaped?
>
> I don't think so. It is meant to be a valid, encoded URL. It it isn't,
> it will cause problems in the location header too.

& -> &

In general, I do not like this new feature. Does Apache HTTPD have it?


Best regards,
Konstantin Kolinko

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: svn commit: r1156530 - in /tomcat/trunk/java/org/apache/catalina/connector: LocalStrings.properties Response.java

2011-08-11 Thread Mark Thomas
On 11/08/2011 11:53, Tim Funk wrote:
> It may be overkill ... but should "absolute" be XML escaped?

I don't think so. It is meant to be a valid, encoded URL. It it isn't,
it will cause problems in the location header too.

Mark

> 
> -Tim
> 
> 
> On Thu, Aug 11, 2011 at 4:13 AM,  wrote:
> 
>> Modified: tomcat/trunk/java/org/apache/catalina/connector/Response.java
>> URL:
>> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Response.java?rev=1156530&r1=1156529&r2=1156530&view=diff
>>
>> ==
>> +PrintWriter writer = getWriter();
>> +writer.print(
>> +sm.getString("coyoteResponse.sendRedirect.note",
>> absolute));
>> +flushBuffer();
>> } catch (IllegalArgumentException e) {
>> setStatus(SC_NOT_FOUND);
>> }
>>
>>
> 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: svn commit: r1156530 - in /tomcat/trunk/java/org/apache/catalina/connector: LocalStrings.properties Response.java

2011-08-11 Thread Tim Funk
It may be overkill ... but should "absolute" be XML escaped?

-Tim


On Thu, Aug 11, 2011 at 4:13 AM,  wrote:

> Modified: tomcat/trunk/java/org/apache/catalina/connector/Response.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Response.java?rev=1156530&r1=1156529&r2=1156530&view=diff
>
> ==
> +PrintWriter writer = getWriter();
> +writer.print(
> +sm.getString("coyoteResponse.sendRedirect.note",
> absolute));
> +flushBuffer();
> } catch (IllegalArgumentException e) {
> setStatus(SC_NOT_FOUND);
> }
>
>


DO NOT REPLY [Bug 51647] New: Session replication fails with ClassNotFoundException when session attribute is Java dynamic proxy (java.lang.reflect.Proxy).

2011-08-11 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51647

 Bug #: 51647
   Summary: Session replication fails with ClassNotFoundException
when session attribute is Java dynamic proxy
(java.lang.reflect.Proxy).
   Product: Tomcat 5
   Version: 5.5.33
  Platform: PC
OS/Version: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina:Cluster
AssignedTo: dev@tomcat.apache.org
ReportedBy: scoo...@e-point.pl
Classification: Unclassified


Created attachment 27372
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=27372
Fix (patch), problem description, test case source code.

== Summary:

Session replication fails with ClassNotFoundException when session
attribute is Java dynamic proxy (java.lang.reflect.Proxy).

== Description:

In my application I'm storing serializable object in HTTP session
attribute. One of object references is (serializable) Java dynamic
proxy (java.lang.reflect.Proxy). Object is properly serializable
(including proxy) but HTTP session fails to migrate between cluster
nodes. Receiving node throws ClassNotFoundException on session
deserialization.

This bug is reproducible if session attribute is dynamic proxy itself,
not only as part of serialized object graph.

== Cause

Tomcat for session migration uses specialized ObjectInputStream
implementation:
org.apache.catalina.cluster.session.ReplicationStream. This class
properly overrides #resolveClass(ObjectStreamClass) method to resolve
deserialized classes using web application class loader.

However deserializing dynamic proxy calls #resolveProxyClass(String[])
method, not #resolveClass(ObjectStreamClass) method. Default
implementation of #resolveProxyClass(String[]) in ObjectStreamClass
can't see web application classloader that was used to load interfaces
used by dynamic proxy and deserialization fails with
ClassNotFoundException.

== Solution

ReplicationStream#resolveProxyClass(String[]) method should be
overridden in the same way that #resolveClass(ObjectStreamClass) was.

This problem was already fixed in Tomcat 6 and Tomcat 7.

Attached patch is modified solution taken from Tomcat 6.0.32.

== Test case

(See attached sample web application for source code, configurations
and build scripts)

I've got session counter (Counter interface) with two
implementations. One is direct implementation (CounterImpl) the other
is dynamic proxy that uses invocation handler
(CounterInvocationHandler) that delegates all proxy methods to the
instance of direct implementation.

There are two servlets with single implementation (CounterServlet),
mapped two different uris. First (mapped to /counter/) creates session
that uses direct implementation, second (mapped to
/counter-with-proxy/) used dynamic proxy implementation.

When application is run in the cluster restarting all servers and
accessing application via /counter/ URL makes session migrate
properly.

When application is accessed via /counter-with-proxy/ on receiving
node ClassNotFoundException is throw:

2011-08-11 09:32:18
org.apache.catalina.cluster.session.SimpleTcpReplicationManager readSession
SEVERE: Failed to deserialize the session!
java.lang.ClassNotFoundException: test.Counter
at java.net.URLClassLoader$1.run(URLClassLoader.java:202)
at java.security.AccessController.doPrivileged(Native Method)
at java.net.URLClassLoader.findClass(URLClassLoader.java:190)
at java.lang.ClassLoader.loadClass(ClassLoader.java:306)
at java.lang.ClassLoader.loadClass(ClassLoader.java:247)
at java.lang.Class.forName0(Native Method)
at java.lang.Class.forName(Class.java:247)
at java.io.ObjectInputStream.resolveProxyClass(ObjectInputStream.java:675)
at java.io.ObjectInputStream.readProxyDesc(ObjectInputStream.java:1530)
at java.io.ObjectInputStream.readClassDesc(ObjectInputStream.java:1492)
at
java.io.ObjectInputStream.readOrdinaryObject(ObjectInputStream.java:1731)
at java.io.ObjectInputStream.readObject0(ObjectInputStream.java:1328)
at java.io.ObjectInputStream.readObject(ObjectInputStream.java:350)
at
org.apache.catalina.session.StandardSession.readObject(StandardSession.java:1459)
at
org.apache.catalina.session.StandardSession.readObjectData(StandardSession.java:983)
at
org.apache.catalina.cluster.session.ReplicatedSession.readObjectData(ReplicatedSession.java:172)
at
org.apache.catalina.cluster.session.SimpleTcpReplicationManager.readSession(SimpleTcpReplicationManager.java:399)
at
org.apache.catalina.cluster.session.SimpleTcpReplicationManager.messageReceived(SimpleTcpReplicationManager.java:583)
at
org.apache.catalina.cluster.session.SimpleTcpReplicationManager.messageDataReceived(SimpleTcpReplicationManager.java:622)
at
org.apache.catalina.cluster.session.ClusterSessionListener.messageReceived(ClusterSessionListener.java:86)
at
org.apache.catalina.clu

DO NOT REPLY [Bug 50326] Problem with DBCP 1.3 /jdk 6 and oracle spatial

2011-08-11 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50326

Mark Thomas  changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||INVALID

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 50326] Problem with DBCP 1.3 /jdk 6 and oracle spatial

2011-08-11 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50326

--- Comment #12 from Nils Hildebrand  2011-08-11 
09:49:03 UTC ---
p.s.

I know you don't want to concentrate on 5.5 any longer - but I think this
important for the stability of Tomcat.

-- 
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 36837] Looking for ProxyHandler implementation of Http request

2011-08-11 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=36837

Mark Thomas  changed:

   What|Removed |Added

 Status|NEEDINFO|RESOLVED
 Resolution||WONTFIX

--- Comment #3 from Mark Thomas  2011-08-11 09:48:57 UTC ---
This enhancement request has been open for a number of years without any sign
of progress.

Requests for this feature do crop up occasionally on the users list but clearly
no-one has felt the urge to scratch this particular itch. I am therefore
closing this as WONTFIX.

If you would like to see this feature implemented and have a patch or start of
a patch then please feel free to re-open this issue and attach your proposed
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



DO NOT REPLY [Bug 50326] Problem with DBCP 1.3 /jdk 6 and oracle spatial

2011-08-11 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50326

Nils Hildebrand  changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|INVALID |

--- Comment #11 from Nils Hildebrand  2011-08-11 
09:44:42 UTC ---
We have been through this. This is a bug in tomcat because tomcat uses dbcp and
dbcp uses hibernate. So you can set this to confirmed and to "depends on" the
dbcp-bug associated with this. I will keep an eye on the dbcp-side as well and
keep you updated with this bug-id. When it gets fixed in dbcp you can fix it in
tomcat as well.

"Resolved" means there is no bug in tomcat any more. This is not true.
tomcat.dbcp is affected. This is a standard tomcat component (derived from
commons.dbcp).

-- 
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 50949] Allow configuration of service name, AJP port, server port.

2011-08-11 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50949

Mark Thomas  changed:

   What|Removed |Added

  Component|Packaging   |Native:Packaging
Version|trunk   |5.5.33
Product|Tomcat 7|Tomcat 5

--- Comment #4 from Mark Thomas  2011-08-11 09:40:18 UTC ---
This has been applied to 6.0.x and will be included in 6.0.33 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 47880] Lack of +x permissions on script files results cryptic and confusing error messages

2011-08-11 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=47880

Mark Thomas  changed:

   What|Removed |Added

  Component|Native:Packaging|Native:Packaging
Version|6.0.20  |5.5.33
Product|Tomcat 6|Tomcat 5
   Target Milestone|default |---

-- 
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 50326] Problem with DBCP 1.3 /jdk 6 and oracle spatial

2011-08-11 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50326

Mark Thomas  changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||INVALID

--- Comment #10 from Mark Thomas  2011-08-11 09:27:10 UTC ---
The analysis shows this is a hibernate issue, not a Tomcat or a DBCP issue.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 50326] Problem with DBCP 1.3 /jdk 6 and oracle spatial

2011-08-11 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50326

Nils Hildebrand  changed:

   What|Removed |Added

Version|5.5.30  |5.5.33

--- Comment #9 from Nils Hildebrand  2011-08-11 
09:23:20 UTC ---
Updated Version to 5.5.33 - the problem still exists there.

-- 
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 50326] Problem with DBCP 1.3 /jdk 6 and oracle spatial

2011-08-11 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50326

Nils Hildebrand  changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|REMIND  |

--- Comment #8 from Nils Hildebrand  2011-08-11 
09:21:19 UTC ---
http://gis.stackexchange.com/questions/13105/any-known-problems-after-tomcat-upgrade-using-oracle-locator

I updated the case with the DBCP-developers as well.

This looks like a problem in hibernate.

-- 
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 51588] Change access modifiers in AccessLogValve to make it easier to extend

2011-08-11 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51588

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #5 from Mark Thomas  2011-08-11 09:17:36 UTC ---
This has been fixed in 6.0.x and will be included in 6.0.33 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



svn commit: r1156552 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/valves/AccessLogValve.java webapps/docs/changelog.xml

2011-08-11 Thread markt
Author: markt
Date: Thu Aug 11 09:17:29 2011
New Revision: 1156552

URL: http://svn.apache.org/viewvc?rev=1156552&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51588
Make it easier to extend the AccessLogValve to add support for custom elements

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 11 09:17:29 2011
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77
 
0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901
 
39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,943112,944409,944416,945231,945808,945835,945841
 
,946686,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,961948,962865,962872,962881,962900,963106,963865,963868,964614,966177-966178,966292,966692,966863,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004393,1004409,1004415,1004868-1004869,1004912,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767,1033415,1033448,1033842,1033897,1037715,1037794,1037887,1037924,1038041,1042022,1042029,1042447,1042452,1042494,1044944,1044987,1050249,1055055,1055236,1055458,1055975,1056264,1056828,1056889,1059881,1061412,1061442,1061446,1062398,1064652,1066244,1067039,1067139,1069824,1070139,1070420,1070609,1072042,1073393,1075458,1076212,1078409,1078412,1079801,1081334,1088179,1088460,1090022,1094069,1094089,1095138,1097899,1099575,1099586
 
,1099772,1099789,1100145,1100822,1101094,1101144,1124680,1130774,1133014,1137862,1137996,1138950,1138953,1140693,1141104,1141441,1142043,1142904,1143134,1143150,1148216,1148471
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,68940

DO NOT REPLY [Bug 51509] Csrf Prevention Filter's LruCache is not thread save

2011-08-11 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51509

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #2 from Mark Thomas  2011-08-11 09:15:16 UTC ---
The fix has been applied to 6.0.x and will be included in 6.0.33 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



svn commit: r1156550 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/filters/CsrfPreventionFilter.java webapps/docs/changelog.xml

2011-08-11 Thread markt
Author: markt
Date: Thu Aug 11 09:14:11 2011
New Revision: 1156550

URL: http://svn.apache.org/viewvc?rev=1156550&view=rev
Log:
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51509
Correct concurrency issue in CSRF prevention filter

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt

tomcat/tc6.0.x/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 11 09:14:11 2011
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77
 
0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901
 
39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,943112,944409,944416,945231,945808,945835,945841
 
,946686,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,961948,962865,962872,962881,962900,963106,963865,963868,964614,966177-966178,966292,966692,966863,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004393,1004409,1004415,1004868-1004869,1004912,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767,1033415,1033448,1033842,1033897,1037715,1037794,1037887,1037924,1038041,1042022,1042029,1042447,1042452,1042494,1044944,1044987,1050249,1055055,1055236,1055458,1055975,1056264,1056828,1056889,1059881,1061412,1061442,1061446,1062398,1064652,1066244,1067039,1067139,1069824,1070139,1070420,1070609,1072042,1073393,1075458,1076212,1078409,1078412,1079801,1081334,1088179,1088460,1090022,1094069,1094089,1095138,1097899,1099575,1099586
 
,1099772,1099789,1100145,1100822,1101094,1101144,1124680,1130774,1133014,1137862,1137996,1138950,1138953,1140693,1141104,1141441,1142043,1142904,1143134,1143150,1148216
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,69

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

2011-08-11 Thread markt
Author: markt
Date: Thu Aug 11 09:07:46 2011
New Revision: 1156549

URL: http://svn.apache.org/viewvc?rev=1156549&view=rev
Log:
Vote

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1156549&r1=1156548&r2=1156549&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Aug 11 09:07:46 2011
@@ -138,6 +138,6 @@ PATCHES PROPOSED TO BACKPORT:
 
 * Unregisters MBean of DataSource when web application stops. (backport 
r1156519.)
   http://svn.apache.org/viewvc?view=revision&revision=1156519
-  +1: kfujino
+  +1: kfujino, markt
   -1:
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1156548 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/coyote/ajp/AjpAprProcessor.java webapps/docs/changelog.xml

2011-08-11 Thread markt
Author: markt
Date: Thu Aug 11 09:07:17 2011
New Revision: 1156548

URL: http://svn.apache.org/viewvc?rev=1156548&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49595
Protect against crashes when using the APR/native connector.

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 11 09:07:17 2011
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77
 
0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901
 
39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,943112,944409,944416,945231,945808,945835,945841
 
,946686,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,961948,962865,962872,962881,962900,963106,963865,963868,964614,966177-966178,966292,966692,966863,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004393,1004409,1004415,1004868-1004869,1004912,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767,1033415,1033448,1033842,1033897,1037715,1037794,1037887,1037924,1038041,1042022,1042029,1042447,1042452,1042494,1044944,1044987,1050249,1055055,1055236,1055458,1055975,1056264,1056828,1056889,1059881,1061412,1061442,1061446,1062398,1064652,1066244,1067039,1067139,1069824,1070139,1070420,1070609,1072042,1073393,1075458,1076212,1078409,1078412,1079801,1081334,1088179,1088460,1090022,1094069,1094089,1095138,1097899,1099575,1099586
 
,1099772,1099789,1100145,1100822,1101094,1101144,1124680,1130774,1133014,1137862,1137996,1138950,1138953,1140693,1141104,1141441,1142043,1142904,1143134,1143150
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,6

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

2011-08-11 Thread kfujino
Author: kfujino
Date: Thu Aug 11 09:05:43 2011
New Revision: 1156547

URL: http://svn.apache.org/viewvc?rev=1156547&view=rev
Log:
Proposal

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1156547&r1=1156546&r2=1156547&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Aug 11 09:05:43 2011
@@ -140,3 +140,9 @@ PATCHES PROPOSED TO BACKPORT:
   http://svn.apache.org/viewvc?rev=1152601&view=rev
   +1: markt, kkolinko,kfujino
   -1:
+
+* Unregisters MBean of DataSource when web application stops. (backport 
r1156519.)
+  http://svn.apache.org/viewvc?view=revision&revision=1156519
+  +1: kfujino
+  -1:
+



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



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

2011-08-11 Thread markt
Author: markt
Date: Thu Aug 11 08:59:13 2011
New Revision: 1156546

URL: http://svn.apache.org/viewvc?rev=1156546&view=rev
Log:
Vote

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1156546&r1=1156545&r2=1156546&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Aug 11 08:59:13 2011
@@ -119,7 +119,7 @@ PATCHES PROPOSED TO BACKPORT:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49595
   http://svn.apache.org/viewvc?rev=1148216&view=rev
-  +1: jfclere, kkolinko
+  +1: jfclere, kkolinko, markt
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51509



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 36362] missing check for Java reserved keywords in tag file processing

2011-08-11 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=36362

--- Comment #8 from Mark Thomas  2011-08-11 08:56:31 UTC ---
Fixed in 6.0.x and will be included in 6.0.33 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



svn commit: r1156545 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/jasper/compiler/Generator.java java/org/apache/jasper/compiler/JspUtil.java webapps/docs/changelog.xml

2011-08-11 Thread markt
Author: markt
Date: Thu Aug 11 08:56:09 2011
New Revision: 1156545

URL: http://svn.apache.org/viewvc?rev=1156545&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=36362
Handle tag files with attribute names that are not valid Java identifiers

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspUtil.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 11 08:56:09 2011
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77
 
0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901
 
39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,943112,944409,944416,945231,945808,945835,945841
 
,946686,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,961948,962865,962872,962881,962900,963106,963865,963868,964614,966177-966178,966292,966692,966863,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004393,1004409,1004415,1004868-1004869,1004912,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767,1033415,1033448,1033842,1033897,1037715,1037794,1037887,1037924,1038041,1042022,1042029,1042447,1042452,1042494,1044944,1044987,1050249,1055055,1055236,1055458,1055975,1056264,1056828,1056889,1059881,1061412,1061442,1061446,1062398,1064652,1066244,1067039,1067139,1069824,1070139,1070420,1070609,1072042,1073393,1075458,1076212,1078409,1078412,1079801,1081334,1088179,1088460,1090022,1094069,1094089,1095138,1097899,1099575,1099586
 
,1099772,1099789,1100145,1100822,1101094,1101144,1124680,1130774,1133014,1137862,1137996,1141104,1141441,1142904,1143134,1143150
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,

svn commit: r1156537 - /tomcat/tc5.5.x/trunk/STATUS.txt

2011-08-11 Thread markt
Author: markt
Date: Thu Aug 11 08:36:14 2011
New Revision: 1156537

URL: http://svn.apache.org/viewvc?rev=1156537&view=rev
Log:
Vote

Modified:
tomcat/tc5.5.x/trunk/STATUS.txt

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1156537&r1=1156536&r2=1156537&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Aug 11 08:36:14 2011
@@ -80,7 +80,7 @@ PATCHES PROPOSED TO BACKPORT:
 * https://issues.apache.org/bugzilla/show_bug.cgi?id=51403
   Avoid NPE in JULI FileHandler if formatter is misconfigured
   http://svn.apache.org/viewvc?rev=1137996&view=rev
-  +1: kkolinko
+  +1: kkolinko, markt
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=36362
@@ -121,7 +121,7 @@ PATCHES PROPOSED TO BACKPORT:
   Fix concatenation of values in SecurityConfig.setSecurityProperty()
   when the value provided by JRE is null.
   http://svn.apache.org/viewvc?rev=1142904&view=rev
-  +1: kkolinko
+  +1: kkolinko, markt
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51324
@@ -129,7 +129,7 @@ PATCHES PROPOSED TO BACKPORT:
   ensure that the doFlush flag does not get stuck in the enabled state.
   Patch by Jeremy Norris.
   http://svn.apache.org/viewvc?rev=1133014&view=rev
-  +1: kkolinko
+  +1: kkolinko, markt
   -1:
 
 * Fix various sendfile issues. CVE-2011-2526



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 41718] Status 302 response to GET request has no body when calling sendRedirect

2011-08-11 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=41718

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #2 from Mark Thomas  2011-08-11 08:32:15 UTC ---
Fixed in trunk and 7.0.x and will be included in 7.0.21 onwards.

I do not plan on back-porting this to 5.5.x and 6.0.x.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1156533 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/connector/LocalStrings.properties java/org/apache/catalina/connector/Response.java webapps/docs/changelog.xml

2011-08-11 Thread markt
Author: markt
Date: Thu Aug 11 08:31:38 2011
New Revision: 1156533

URL: http://svn.apache.org/viewvc?rev=1156533&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41718
RFC2616 says redirects should include a response body.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Response.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 11 08:31:38 2011
@@ -1 +1 @@
-/tomcat/trunk:1156171,1156276,1156304
+/tomcat/trunk:1156171,1156276,1156304,1156530

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/LocalStrings.properties?rev=1156533&r1=1156532&r2=1156533&view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/LocalStrings.properties 
(original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/LocalStrings.properties 
Thu Aug 11 08:31:38 2011
@@ -47,6 +47,7 @@ coyoteResponse.reset.ise=Cannot call res
 coyoteResponse.resetBuffer.ise=Cannot reset buffer after response has been 
committed
 coyoteResponse.sendError.ise=Cannot call sendError() after the response has 
been committed
 coyoteResponse.sendRedirect.ise=Cannot call sendRedirect() after the response 
has been committed
+coyoteResponse.sendRedirect.note=Redirecting to {0}
 coyoteResponse.setBufferSize.ise=Cannot change buffer size after data has been 
written
 
 #

Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Response.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Response.java?rev=1156533&r1=1156532&r2=1156533&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Response.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Response.java Thu 
Aug 11 08:31:38 2011
@@ -1327,13 +1327,17 @@ public class Response
 return; 
 
 // Clear any data content that has been buffered
-resetBuffer();
+resetBuffer(true);
 
 // Generate a temporary redirect to the specified location
 try {
 String absolute = toAbsolute(location);
 setStatus(SC_FOUND);
 setHeader("Location", absolute);
+PrintWriter writer = getWriter();
+writer.print(
+sm.getString("coyoteResponse.sendRedirect.note", 
absolute));
+flushBuffer();
 } catch (IllegalArgumentException e) {
 setStatus(SC_NOT_FOUND);
 }

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1156533&r1=1156532&r2=1156533&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Aug 11 08:31:38 2011
@@ -57,6 +57,10 @@
   
 
   
+41718: Include a response body when sending a redirect.
+(markt)
+  
+  
 51640: Improve the memory leak prevention for leaks 
triggered
 by java.sql.DriverManager. (markt)
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1156530 - in /tomcat/trunk/java/org/apache/catalina/connector: LocalStrings.properties Response.java

2011-08-11 Thread markt
Author: markt
Date: Thu Aug 11 08:13:56 2011
New Revision: 1156530

URL: http://svn.apache.org/viewvc?rev=1156530&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41718
RFC2616 says redirects should include a response body.

Modified:
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/connector/Response.java

Modified: 
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties?rev=1156530&r1=1156529&r2=1156530&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties Thu 
Aug 11 08:13:56 2011
@@ -47,6 +47,7 @@ coyoteResponse.reset.ise=Cannot call res
 coyoteResponse.resetBuffer.ise=Cannot reset buffer after response has been 
committed
 coyoteResponse.sendError.ise=Cannot call sendError() after the response has 
been committed
 coyoteResponse.sendRedirect.ise=Cannot call sendRedirect() after the response 
has been committed
+coyoteResponse.sendRedirect.note=Redirecting to {0}
 coyoteResponse.setBufferSize.ise=Cannot change buffer size after data has been 
written
 
 #

Modified: tomcat/trunk/java/org/apache/catalina/connector/Response.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Response.java?rev=1156530&r1=1156529&r2=1156530&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Response.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Response.java Thu Aug 11 
08:13:56 2011
@@ -1327,13 +1327,17 @@ public class Response
 return; 
 
 // Clear any data content that has been buffered
-resetBuffer();
+resetBuffer(true);
 
 // Generate a temporary redirect to the specified location
 try {
 String absolute = toAbsolute(location);
 setStatus(SC_FOUND);
 setHeader("Location", absolute);
+PrintWriter writer = getWriter();
+writer.print(
+sm.getString("coyoteResponse.sendRedirect.note", 
absolute));
+flushBuffer();
 } catch (IllegalArgumentException e) {
 setStatus(SC_NOT_FOUND);
 }



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



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

2011-08-11 Thread Mark Thomas
On 11/08/2011 08:47, Keiichi Fujino wrote:
> 2011/8/11 Mark Thomas :
>> On 11/08/2011 08:35, kfuj...@apache.org wrote:
>>> Author: kfujino
>>> Date: Thu Aug 11 07:35:39 2011
>>> New Revision: 1156518
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1156518&view=rev
>>> Log:
>>> Unregisters MBean of DataSource when web application stops.
>>
>> This needs to be applied to trunk too.
>>
>> Normally, patches are applied to trunk and then back-ported to 7.0.x,
>> 6.0.x and 5.5.x as required.
>>
>> Mark
>>
> Thanks.
> I applied to trunk.

Great. Saw the commit. Looks good.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



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

2011-08-11 Thread Keiichi Fujino
2011/8/11 Mark Thomas :
> On 11/08/2011 08:35, kfuj...@apache.org wrote:
>> Author: kfujino
>> Date: Thu Aug 11 07:35:39 2011
>> New Revision: 1156518
>>
>> URL: http://svn.apache.org/viewvc?rev=1156518&view=rev
>> Log:
>> Unregisters MBean of DataSource when web application stops.
>
> This needs to be applied to trunk too.
>
> Normally, patches are applied to trunk and then back-ported to 7.0.x,
> 6.0.x and 5.5.x as required.
>
> Mark
>
Thanks.
I applied to trunk.


-- 
Keiichi.Fujino

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1156519 - /tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java

2011-08-11 Thread kfujino
Author: kfujino
Date: Thu Aug 11 07:39:44 2011
New Revision: 1156519

URL: http://svn.apache.org/viewvc?rev=1156519&view=rev
Log:
Unregisters MBean of DataSource when web application stops.

Modified:
tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java

Modified: tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java?rev=1156519&r1=1156518&r2=1156519&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java Thu 
Aug 11 07:39:44 2011
@@ -23,6 +23,7 @@ import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.Iterator;
@@ -296,6 +297,13 @@ public class NamingContextListener
 }
 
 ContextAccessController.unsetSecurityToken(getName(), container);
+
+// unregister mbeans.
+Collection names = objectNames.values();
+for (ObjectName objectName : names) {
+Registry.getRegistry(null, 
null).unregisterComponent(objectName);
+}
+objectNames.clear();
 
 namingContext = null;
 envCtx = null;



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



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

2011-08-11 Thread Mark Thomas
On 11/08/2011 08:35, kfuj...@apache.org wrote:
> Author: kfujino
> Date: Thu Aug 11 07:35:39 2011
> New Revision: 1156518
> 
> URL: http://svn.apache.org/viewvc?rev=1156518&view=rev
> Log:
> Unregisters MBean of DataSource when web application stops.

This needs to be applied to trunk too.

Normally, patches are applied to trunk and then back-ported to 7.0.x,
6.0.x and 5.5.x as required.

Mark

> 
> Modified:
> 
> tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java
> tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
> 
> Modified: 
> tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java
> URL: 
> http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java?rev=1156518&r1=1156517&r2=1156518&view=diff
> ==
> --- 
> tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java 
> (original)
> +++ 
> tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java 
> Thu Aug 11 07:35:39 2011
> @@ -23,6 +23,7 @@ import java.beans.PropertyChangeEvent;
>  import java.beans.PropertyChangeListener;
>  import java.net.MalformedURLException;
>  import java.net.URL;
> +import java.util.Collection;
>  import java.util.HashMap;
>  import java.util.Hashtable;
>  import java.util.Iterator;
> @@ -296,6 +297,13 @@ public class NamingContextListener
>  }
>  
>  ContextAccessController.unsetSecurityToken(getName(), container);
> +
> +// unregister mbeans.
> +Collection names = objectNames.values();
> +for (ObjectName objectName : names) {
> +Registry.getRegistry(null, 
> null).unregisterComponent(objectName);
> +}
> +objectNames.clear();
>  
>  namingContext = null;
>  envCtx = null;
> 
> Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
> URL: 
> http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1156518&r1=1156517&r2=1156518&view=diff
> ==
> --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
> +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Aug 11 07:35:39 2011
> @@ -64,6 +64,9 @@
>  51644: Fix annotation scanning for contexts with a
>  multi-level context path such as /a/b. (markt)
>
> +  
> +Unregisters MBean of DataSource when web application stops. (kfujino)
> +  
>  
>
>
> 
> 
> 
> -
> 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: r1156518 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/core/NamingContextListener.java webapps/docs/changelog.xml

2011-08-11 Thread kfujino
Author: kfujino
Date: Thu Aug 11 07:35:39 2011
New Revision: 1156518

URL: http://svn.apache.org/viewvc?rev=1156518&view=rev
Log:
Unregisters MBean of DataSource when web application stops.

Modified:

tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java?rev=1156518&r1=1156517&r2=1156518&view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java 
(original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java 
Thu Aug 11 07:35:39 2011
@@ -23,6 +23,7 @@ import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.Iterator;
@@ -296,6 +297,13 @@ public class NamingContextListener
 }
 
 ContextAccessController.unsetSecurityToken(getName(), container);
+
+// unregister mbeans.
+Collection names = objectNames.values();
+for (ObjectName objectName : names) {
+Registry.getRegistry(null, 
null).unregisterComponent(objectName);
+}
+objectNames.clear();
 
 namingContext = null;
 envCtx = null;

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1156518&r1=1156517&r2=1156518&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Aug 11 07:35:39 2011
@@ -64,6 +64,9 @@
 51644: Fix annotation scanning for contexts with a
 multi-level context path such as /a/b. (markt)
   
+  
+Unregisters MBean of DataSource when web application stops. (kfujino)
+  
 
   
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org