Re: Hosting the current Tomcat Maven Plugin from mojo codehaus
2011/1/18 Olivier Lamy ol...@apache.org: Hi Folks, As you probably know there is a Tomcat Maven plugin available @codehaus [1] which provide various maven goals to use tomcat during dev process. So the probably best and more natural place to host is (IMHO) the ASF repo (in the tomcat path). The two main contributors Mark Hobson (asf id : markh) and myself (asf id : olamy) are already ASF committers. So WDYT ? (Note : if this goes well, I will have to start an other vote in the codehaus mojo dev ml). Thanks, I recently provide a little patch to Olivier to this plugin, code is small and easy to understand. +1. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50615] New: High count of Close_Wait
https://issues.apache.org/bugzilla/show_bug.cgi?id=50615 Summary: High count of Close_Wait Product: Tomcat 6 Version: 6.0.14 Platform: All OS/Version: Linux Status: NEW Severity: critical Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: johnchin...@gmail.com We are facing High count of Close_Wait which is used for Avaya IVR application. -- 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 50615] High count of Close_Wait
https://issues.apache.org/bugzilla/show_bug.cgi?id=50615 --- Comment #1 from johnchin...@gmail.com 2011-01-19 05:58:00 EST --- Kindly help us to resolve the high count of close_wait -- 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 50615] High count of Close_Wait
https://issues.apache.org/bugzilla/show_bug.cgi?id=50615 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Comment #2 from Mark Thomas ma...@apache.org 2011-01-19 06:37:53 EST --- Bugzilla is not a support forum. Please use the users mailing list. Before you post there you might want to read http://www.catb.org/~esr/faqs/smart-questions.html -- 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: r1060772 - in /tomcat/trunk: res/findbugs/filter-post-7.0.x-fixes.xml webapps/examples/WEB-INF/classes/async/Stockticker.java
Author: markt
Date: Wed Jan 19 11:39:06 2011
New Revision: 1060772
URL: http://svn.apache.org/viewvc?rev=1060772view=rev
Log:
Findbugs
Modified:
tomcat/trunk/res/findbugs/filter-post-7.0.x-fixes.xml
tomcat/trunk/webapps/examples/WEB-INF/classes/async/Stockticker.java
Modified: tomcat/trunk/res/findbugs/filter-post-7.0.x-fixes.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/findbugs/filter-post-7.0.x-fixes.xml?rev=1060772r1=1060771r2=1060772view=diff
==
--- tomcat/trunk/res/findbugs/filter-post-7.0.x-fixes.xml (original)
+++ tomcat/trunk/res/findbugs/filter-post-7.0.x-fixes.xml Wed Jan 19 11:39:06
2011
@@ -38,10 +38,18 @@
Method name=writeObject /
Bug code=Se /
/Match
- !-- Refactor Integer constants to an enum --
+ !-- Re-factor Integer constants to an enum --
Match
Class name=org.apache.catalina.startup.ClassLoaderFactory /
Method name=createClassLoader /
Bug code=RC /
/Match
+ !-- Re-factor to only have the thread running when an instance of the
--
+ !-- handler is active --
+ Match
+Class name=org.apache.juli.AsyncFileHandler$LoggerThread/
+Method name=run/
+Bug code=IL/
+ /Match
+
/FindBugsFilter
\ No newline at end of file
Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/async/Stockticker.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/async/Stockticker.java?rev=1060772r1=1060771r2=1060772view=diff
==
--- tomcat/trunk/webapps/examples/WEB-INF/classes/async/Stockticker.java
(original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/async/Stockticker.java Wed
Jan 19 11:39:06 2011
@@ -99,7 +99,7 @@ public class Stockticker implements Runn
public void tick(Stock stock);
}
-public static class Stock {
+public static final class Stock implements Cloneable {
protected static DecimalFormat df = new DecimalFormat(0.00);
protected String symbol = ;
protected double value = 0.0d;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of David by David
Dear Wiki user,
You have subscribed to a wiki page or wiki category on Tomcat Wiki for change
notification.
The David page has been changed by David.
The comment on this change is: We offer Cheap Shared Web Hosting, Reliable
Reseller Web Hosting, Quality VPS Hosting, Powerful Dedicated Servers, Cheap
Domain Names.
http://wiki.apache.org/tomcat/David
--
New page:
##language:en
== Infrenion Networks ==
.
{{/tomcat/None?action=content|None|width=290px,height=24px,type=text/html}}
Email: MailTo(david AT SPAMFREE infrenion DOT com)
...
[[CategoryHomepage|Web Hosting]]
[[http://www.infrenion.com/us-reseller-web-hosting|Our Reseller Plans Offer –]]
* Free WHMCS Billing Software
* Free Enom Reseller Account
* FFMPEG Reselling
* 99.99% Uptime Guarantee
[[http://www.infrenion.com/us-vps-servers|Our VPS Plans Offer –]]
* Fully Managed VPS
* Free WHM/cPanel
* FFMPEG Ready VPS
* Full Root Access
[[http://www.infrenion.com/us-dedicated-servers|Our Dedicated Servers Offer –]]
* Free Control Panel WHM/cPanel
* Free 100 MBPS Uplink Port
* FFMPEG Ready Servers
* US and UK Datacenters
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of David by David
Dear Wiki user,
You have subscribed to a wiki page or wiki category on Tomcat Wiki for change
notification.
The David page has been changed by David.
http://wiki.apache.org/tomcat/David?action=diffrev1=1rev2=2
--
##language:en
== Infrenion Networks ==
- .
{{/tomcat/None?action=content|None|width=290px,height=24px,type=text/html}}
+ .
{{/tomcat//tomcat/None?action=content?action=content|None|width=290px,height=24px,type=text/html}}
Email: MailTo(david AT SPAMFREE infrenion DOT com)
...
+ {{None||width=843px,height=52px}}
+
[[CategoryHomepage|Web Hosting]]
[[http://www.infrenion.com/us-reseller-web-hosting|Our Reseller Plans Offer
–]]
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of David/http:/www.infrenion.com/ring-the-christmas-bells-with-infrenion-networks-50-discount.html by David
Dear Wiki user, You have subscribed to a wiki page or wiki category on Tomcat Wiki for change notification. The David/http:/www.infrenion.com/ring-the-christmas-bells-with-infrenion-networks-50-discount.html page has been changed by David. http://wiki.apache.org/tomcat/David/http%3A/www.infrenion.com/ring-the-christmas-bells-with-infrenion-networks-50-discount.html -- New page: ##master-page:HomepageReadPageTemplate ##master-date:Unknown-Date #format wiki #language en ... - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Page David/http:/www.infrenion.com/ring-the-christmas-bells-with-infrenion-networks-50-discount.html deleted from Tomcat Wiki
Dear wiki user, You have subscribed to a wiki page Tomcat Wiki for change notification. The page David/http:/www.infrenion.com/ring-the-christmas-bells-with-infrenion-networks-50-discount.html has been deleted by TimFunk. The comment on this change is: spam removal. http://wiki.apache.org/tomcat/David/http%3A/www.infrenion.com/ring-the-christmas-bells-with-infrenion-networks-50-discount.html - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Page David deleted from Tomcat Wiki
Dear wiki user, You have subscribed to a wiki page Tomcat Wiki for change notification. The page David has been deleted by TimFunk. The comment on this change is: spam removal. http://wiki.apache.org/tomcat/David - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tomcat 7.0.x. still CTR?
I'd prefer to stay CTR for a while. Chances are there are still much to be fixed given all the changes that have taken place. Filip On 1/18/2011 11:41 AM, Christopher Schultz wrote: All, Since Tomcat 7.0.x went stable, does that change the commit policy, or are we still doing commit-them-review? Thanks, -chris - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1060891 - /tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java
Author: markt
Date: Wed Jan 19 18:14:51 2011
New Revision: 1060891
URL: http://svn.apache.org/viewvc?rev=1060891view=rev
Log:
Remove reflection part of stack trace when Catalina throws an Exception - makes
it easier to see what went wrong
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java?rev=1060891r1=1060890r2=1060891view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java Wed Jan 19
18:14:51 2011
@@ -21,6 +21,7 @@ package org.apache.catalina.startup;
import java.io.File;
import java.lang.management.ManagementFactory;
+import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.net.MalformedURLException;
import java.net.URL;
@@ -442,6 +443,11 @@ public final class Bootstrap {
}
} catch (Throwable t) {
handleThrowable(t);
+// Unwrap the Exception for clearer error reporting
+if (t instanceof InvocationTargetException
+t.getCause() != null) {
+t = t.getCause();
+}
t.printStackTrace();
System.exit(1);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 22405] warn if not deploy with umask 0077 or if deployed as root and provide tutorial URL Secure deployment
https://issues.apache.org/bugzilla/show_bug.cgi?id=22405 --- Comment #5 from Mark Thomas ma...@apache.org 2011-01-19 13:45:40 EST --- Created an attachment (id=26519) -- (https://issues.apache.org/bugzilla/attachment.cgi?id=26519) Proposed patch for Tomcat 7 This patch adds a new listener that checks the user Tomcat is running as and the umask being used. -- 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: DO NOT REPLY [Bug 22405] warn if not deploy with umask 0077 or if deployed as root and provide tutorial URL Secure deployment
On 19/01/2011 18:45, bugzi...@apache.org wrote: https://issues.apache.org/bugzilla/show_bug.cgi?id=22405 --- Comment #5 from Mark Thomas ma...@apache.org 2011-01-19 13:45:40 EST --- Created an attachment (id=26519) -- (https://issues.apache.org/bugzilla/attachment.cgi?id=26519) Proposed patch for Tomcat 7 This patch adds a new listener that checks the user Tomcat is running as and the umask being used. I didn't apply this directly as it stops Tomcat from starting (not on Windows) as root or if the umask is not at least as restrictive as 0007. WDYT? Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1060627 - in /tomcat/trunk/webapps: docs/changelog.xml host-manager/META-INF/context.xml manager/META-INF/context.xml
On 19/01/2011 01:18, Tim Funk wrote:
+1 - It might be nice to match 127.0.0.[0-9]{1,3} so it is more virtual
machine friendly for those who map localhost to an alternate loopback
address.
+1 to having it as a comment, or +1 to removing the comment and having
it there for real?
Either way I'll update the regex (I'll also see what the IPv6 equivalent is)
Mark
-Tim
On 1/18/2011 7:04 PM, Mark Thomas wrote:
On 19/01/2011 00:00, ma...@apache.org wrote:
Author: markt
Date: Wed Jan 19 00:00:59 2011
New Revision: 1060627
URL: http://svn.apache.org/viewvc?rev=1060627view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=22278
Add a commented out RemoteAddrValve that limits access to the Manager
and Host Manager applications to localhost.
Based on a patch by Yann Cébron.
I thought about extending this and enabling the Valve by default along
with adding additional information to the 403 error page.
Whilst I like to from a security point of view, I do wonder how much
stuff it would break for users and how much traffic it would generate on
the users list.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: DO NOT REPLY [Bug 22405] warn if not deploy with umask 0077 or if deployed as root and provide tutorial URL Secure deployment
On 01/19/11 13:47, Mark Thomas wrote: On 19/01/2011 18:45, bugzi...@apache.org wrote: https://issues.apache.org/bugzilla/show_bug.cgi?id=22405 --- Comment #5 from Mark Thomas ma...@apache.org 2011-01-19 13:45:40 EST --- Created an attachment (id=26519) -- (https://issues.apache.org/bugzilla/attachment.cgi?id=26519) Proposed patch for Tomcat 7 This patch adds a new listener that checks the user Tomcat is running as and the umask being used. I didn't apply this directly as it stops Tomcat from starting (not on Windows) as root or if the umask is not at least as restrictive as 0007. WDYT? I'd like that to be a warning, not a fatal error. Thinking you know all about what is right for every deployment is a bit of hubris that will not serve us well. If you're going to go down the road of saving the user from their own actions,please at least provide an override in the config file or even -Dignore-runas-error=true - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1060627 - in /tomcat/trunk/webapps: docs/changelog.xml host-manager/META-INF/context.xml manager/META-INF/context.xml
My bad - I meant +1 to having it for real.
-Tim
On 1/19/2011 1:48 PM, Mark Thomas wrote:
On 19/01/2011 01:18, Tim Funk wrote:
+1 - It might be nice to match 127.0.0.[0-9]{1,3} so it is more virtual
machine friendly for those who map localhost to an alternate loopback
address.
+1 to having it as a comment, or +1 to removing the comment and having
it there for real?
Either way I'll update the regex (I'll also see what the IPv6 equivalent is)
Mark
-Tim
On 1/18/2011 7:04 PM, Mark Thomas wrote:
On 19/01/2011 00:00, ma...@apache.org wrote:
Author: markt
Date: Wed Jan 19 00:00:59 2011
New Revision: 1060627
URL: http://svn.apache.org/viewvc?rev=1060627view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=22278
Add a commented out RemoteAddrValve that limits access to the Manager
and Host Manager applications to localhost.
Based on a patch by Yann Cébron.
I thought about extending this and enabling the Valve by default along
with adding additional information to the 403 error page.
Whilst I like to from a security point of view, I do wonder how much
stuff it would break for users and how much traffic it would generate on
the users list.
-
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
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: DO NOT REPLY [Bug 22405] warn if not deploy with umask 0077 or if deployed as root and provide tutorial URL Secure deployment
On 19/01/2011 18:53, Ian Darwin wrote: On 01/19/11 13:47, Mark Thomas wrote: On 19/01/2011 18:45, bugzi...@apache.org wrote: https://issues.apache.org/bugzilla/show_bug.cgi?id=22405 --- Comment #5 from Mark Thomas ma...@apache.org 2011-01-19 13:45:40 EST --- Created an attachment (id=26519) -- (https://issues.apache.org/bugzilla/attachment.cgi?id=26519) Proposed patch for Tomcat 7 This patch adds a new listener that checks the user Tomcat is running as and the umask being used. I didn't apply this directly as it stops Tomcat from starting (not on Windows) as root or if the umask is not at least as restrictive as 0007. WDYT? I'd like that to be a warning, not a fatal error. It is a fine line. Some things are sufficiently dangerous that the user should have to actively choose to do them. Running as root is probably one of them but then again jsvc is designed to run as root to use privileged ports. Maybe there is a way to tell the difference such as move the check until the point where jsvc would have changed to a lower privileged user. The umask is less serious and a warning probably does make more sense there. Thinking you know all about what is right for every deployment is a bit of hubris that will not serve us well. If you're going to go down the road of saving the user from their own actions,please at least provide an override in the config file or even -Dignore-runas-error=true It is configurable. I even included in the doc changes in the patch. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1060901 - in /tomcat/trunk/webapps: host-manager/META-INF/context.xml manager/META-INF/context.xml
Author: markt
Date: Wed Jan 19 19:02:22 2011
New Revision: 1060901
URL: http://svn.apache.org/viewvc?rev=1060901view=rev
Log:
Update the ipv4 loopback regex to cover 127.0.0.1/8. Fortunately, ipv6 only has
a single explicit loopback address.
Modified:
tomcat/trunk/webapps/host-manager/META-INF/context.xml
tomcat/trunk/webapps/manager/META-INF/context.xml
Modified: tomcat/trunk/webapps/host-manager/META-INF/context.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/host-manager/META-INF/context.xml?rev=1060901r1=1060900r2=1060901view=diff
==
--- tomcat/trunk/webapps/host-manager/META-INF/context.xml (original)
+++ tomcat/trunk/webapps/host-manager/META-INF/context.xml Wed Jan 19 19:02:22
2011
@@ -22,6 +22,6 @@
--
!--
Valve className=org.apache.catalina.valves.RemoteAddrValve
- allow=127\.0\.0\.1|::1 /
+ allow=127\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}|::1 /
--
/Context
\ No newline at end of file
Modified: tomcat/trunk/webapps/manager/META-INF/context.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/manager/META-INF/context.xml?rev=1060901r1=1060900r2=1060901view=diff
==
--- tomcat/trunk/webapps/manager/META-INF/context.xml (original)
+++ tomcat/trunk/webapps/manager/META-INF/context.xml Wed Jan 19 19:02:22 2011
@@ -22,6 +22,6 @@
--
!--
Valve className=org.apache.catalina.valves.RemoteAddrValve
- allow=127\.0\.0\.1|::1 /
+ allow=127\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}|::1 /
--
/Context
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1060907 - in /tomcat/trunk: java/org/apache/catalina/core/ java/org/apache/catalina/deploy/ java/org/apache/catalina/tribes/tipis/ java/org/apache/el/parser/ java/org/apache/naming/ java/
Author: markt
Date: Wed Jan 19 19:08:36 2011
New Revision: 1060907
URL: http://svn.apache.org/viewvc?rev=1060907view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50601
Code clean-up
Patch provided by sebb
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationTaglibDescriptor.java
tomcat/trunk/java/org/apache/catalina/deploy/LoginConfig.java
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/trunk/java/org/apache/el/parser/SimpleNode.java
tomcat/trunk/java/org/apache/naming/NamingEntry.java
tomcat/trunk/java/org/apache/tomcat/util/net/URL.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationTaglibDescriptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationTaglibDescriptor.java?rev=1060907r1=1060906r2=1060907view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationTaglibDescriptor.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationTaglibDescriptor.java
Wed Jan 19 19:08:36 2011
@@ -54,9 +54,6 @@ public class ApplicationTaglibDescriptor
if (this == obj) {
return true;
}
-if (obj == null) {
-return false;
-}
if (!(obj instanceof ApplicationTaglibDescriptor)) {
return false;
}
Modified: tomcat/trunk/java/org/apache/catalina/deploy/LoginConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/LoginConfig.java?rev=1060907r1=1060906r2=1060907view=diff
==
--- tomcat/trunk/java/org/apache/catalina/deploy/LoginConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/LoginConfig.java Wed Jan 19
19:08:36 2011
@@ -195,8 +195,6 @@ public class LoginConfig implements Seri
public boolean equals(Object obj) {
if (this == obj)
return true;
-if (obj == null)
-return false;
if (!(obj instanceof LoginConfig))
return false;
LoginConfig other = (LoginConfig) obj;
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1060907r1=1060906r2=1060907view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Wed Jan 19 19:08:36 2011
@@ -353,7 +353,6 @@ public abstract class AbstractReplicated
@Override
public boolean equals(Object o) {
-if ( o == null ) return false;
if ( !(o instanceof AbstractReplicatedMap)) return false;
if ( !(o.getClass().equals(this.getClass())) ) return false;
AbstractReplicatedMap other = (AbstractReplicatedMap)o;
Modified: tomcat/trunk/java/org/apache/el/parser/SimpleNode.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/SimpleNode.java?rev=1060907r1=1060906r2=1060907view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/SimpleNode.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/SimpleNode.java Wed Jan 19 19:08:36
2011
@@ -180,9 +180,6 @@ public abstract class SimpleNode extends
if (this == obj) {
return true;
}
-if (obj == null) {
-return false;
-}
if (!(obj instanceof SimpleNode)) {
return false;
}
Modified: tomcat/trunk/java/org/apache/naming/NamingEntry.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/NamingEntry.java?rev=1060907r1=1060906r2=1060907view=diff
==
--- tomcat/trunk/java/org/apache/naming/NamingEntry.java (original)
+++ tomcat/trunk/java/org/apache/naming/NamingEntry.java Wed Jan 19 19:08:36
2011
@@ -66,7 +66,7 @@ public class NamingEntry {
@Override
public boolean equals(Object obj) {
-if ((obj != null) (obj instanceof NamingEntry)) {
+if (obj instanceof NamingEntry) {
return name.equals(((NamingEntry) obj).name);
} else {
return false;
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/URL.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/URL.java?rev=1060907r1=1060906r2=1060907view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/URL.java (original)
+++
DO NOT REPLY [Bug 50601] Redundant null checks before instanceof in equals()
https://issues.apache.org/bugzilla/show_bug.cgi?id=50601 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mark Thomas ma...@apache.org 2011-01-19 14:08:44 EST --- Fixed in 7.0.x and will be included in 7.0.7 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: r1060927 - in /tomcat/trunk/java/org/apache: catalina/Context.java catalina/core/StandardContext.java catalina/startup/ContextConfig.java naming/resources/BaseDirContext.java
Author: markt
Date: Wed Jan 19 19:36:58 2011
New Revision: 1060927
URL: http://svn.apache.org/viewvc?rev=1060927view=rev
Log:
Rename in preparation for
https://issues.apache.org/bugzilla/show_bug.cgi?id=50535
Modified:
tomcat/trunk/java/org/apache/catalina/Context.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java
Modified: tomcat/trunk/java/org/apache/catalina/Context.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Context.java?rev=1060927r1=1060926r2=1060927view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Context.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Context.java Wed Jan 19 19:36:58 2011
@@ -1214,11 +1214,11 @@ public interface Context extends Contain
/**
- * Add a URL for a JAR that contains static resources in a
- * META-INF/resources directory that should be included in the static
+ * Add a URL for a location (usually a JAR) that contains static resources
+ * in a META-INF/resources directory that should be included in the static
* resources for this context.
*/
-public void addResourceJarUrl(URL url);
+public void addAltResourceUrl(URL url);
/**
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1060927r1=1060926r2=1060927view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Wed Jan 19
19:36:58 2011
@@ -1046,14 +1046,14 @@ public class StandardContext extends Con
/**
- * Add a URL for a JAR that contains static resources in a
- * META-INF/resources directory that should be included in the static
+ * Add a URL for a location (usually a JAR) that contains static resources
+ * in a META-INF/resources directory that should be included in the static
* resources for this context.
*/
@Override
-public void addResourceJarUrl(URL url) {
+public void addAltResourceUrl(URL url) {
if (webappResources instanceof BaseDirContext) {
-((BaseDirContext) webappResources).addResourcesJar(url);
+((BaseDirContext) webappResources).addAltResources(url);
} else {
log.error(sm.getString(standardContext.noResourceJar, url,
getName()));
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1060927r1=1060926r2=1060927view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Wed Jan 19
19:36:58 2011
@@ -1502,7 +1502,7 @@ public class ContextConfig
jarFile = conn.getJarFile();
ZipEntry entry = jarFile.getEntry(META-INF/resources/);
if (entry != null) {
-context.addResourceJarUrl(url);
+context.addAltResourceUrl(url);
}
}
} catch (IOException ioe) {
Modified: tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java?rev=1060927r1=1060926r2=1060927view=diff
==
--- tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java Wed Jan
19 19:36:58 2011
@@ -153,7 +153,7 @@ public abstract class BaseDirContext imp
* Add a resources JAR. The contents of /META-INF/resources/ will be used
if
* a requested resource can not be found in the main context.
*/
-public void addResourcesJar(URL url) {
+public void addAltResources(URL url) {
try {
JarURLConnection conn = (JarURLConnection) url.openConnection();
JarFile jarFile = conn.getJarFile();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: DO NOT REPLY [Bug 22405] warn if not deploy with umask 0077 or if deployed as root and provide tutorial URL Secure deployment
On 19.01.2011 20:00, Mark Thomas wrote: On 19/01/2011 18:53, Ian Darwin wrote: On 01/19/11 13:47, Mark Thomas wrote: On 19/01/2011 18:45, bugzi...@apache.org wrote: https://issues.apache.org/bugzilla/show_bug.cgi?id=22405 --- Comment #5 from Mark Thomasma...@apache.org 2011-01-19 13:45:40 EST --- Created an attachment (id=26519) -- (https://issues.apache.org/bugzilla/attachment.cgi?id=26519) Proposed patch for Tomcat 7 This patch adds a new listener that checks the user Tomcat is running as and the umask being used. I didn't apply this directly as it stops Tomcat from starting (not on Windows) as root or if the umask is not at least as restrictive as 0007. WDYT? I'd like that to be a warning, not a fatal error. It is a fine line. Some things are sufficiently dangerous that the user should have to actively choose to do them. Running as root is probably one of them but then again jsvc is designed to run as root to use privileged ports. Maybe there is a way to tell the difference such as move the check until the point where jsvc would have changed to a lower privileged user. Not tested with Java 6, but at least for Java 5 user.name still seems to return the real uid, not the effective one. So I expect under jsvc you will still get root as the result. See: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4290712 But it should be verified using jsvc. Not sure whether my simple perl+Java bsed test is valid. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tomcat 7.0.x. still CTR?
On 19.01.2011 18:23, Filip Hanik - Dev Lists wrote: I'd prefer to stay CTR for a while. Chances are there are still much to be fixed given all the changes that have taken place. +1 On 1/18/2011 11:41 AM, Christopher Schultz wrote: All, Since Tomcat 7.0.x went stable, does that change the commit policy, or are we still doing commit-them-review? Thanks, -chris - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: DO NOT REPLY [Bug 22405] warn if not deploy with umask 0077 or if deployed as root and provide tutorial URL Secure deployment
On 19/01/2011 19:37, Rainer Jung wrote: Not tested with Java 6, but at least for Java 5 user.name still seems to return the real uid, not the effective one. So I expect under jsvc you will still get root as the result. See: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4290712 But it should be verified using jsvc. Not sure whether my simple perl+Java bsed test is valid. The bug has only been open for 11 years. I'm sure it will get fixed soon. As additional ways this might break emerge, I'm beginning to think an optional life-cycle listener that uses Runtime.Exec to get the info is a better way to go. Slower, but more reliable. For jsvc I think it would have to be on the Engine or similar. There is no rush for this feature. The discussion so far has been useful so I plan to wait a little while to see what else emerges before doing anything. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50613] ConnectionPool.size corruption when evictions enabled:
https://issues.apache.org/bugzilla/show_bug.cgi?id=50613 Filip Hanik fha...@apache.org changed: What|Removed |Added Status|NEEDINFO|NEW --- Comment #3 from Filip Hanik fha...@apache.org 2011-01-19 15:12:03 EST --- Thanks for the test case. Looking at it now. -- 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 50620] New: Session related errors prevent clean recycle of Request and Response objects by CoyoteAdapter
https://issues.apache.org/bugzilla/show_bug.cgi?id=50620 Summary: Session related errors prevent clean recycle of Request and Response objects by CoyoteAdapter Product: Tomcat 6 Version: unspecified Platform: All OS/Version: All Status: NEW Severity: major Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: c1vams...@gmail.com Created an attachment (id=26521) -- (https://issues.apache.org/bugzilla/attachment.cgi?id=26521) Patch created against tomcat/tc6.0.x/trunk Session related errors prevent clean recycle of org.apache.catalina.connector.Request and org.apache.catalina.connector.Response objects by CoyoteAdapter. In org.apache.catalina.connector.Request.recycle() method, if an exception is thrown by session.endAccess() call, request object recycling aborts failing to cleanup fully and leaving the request object in inconsistent state. Further requests processed by CoyoteAdapter.service() using this inconsistent request object result in request being redirected to the last url that resulted in inconsistent request object which is still holding on to wrong session and contexts. -- 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: r1060998 - in /tomcat/trunk/modules/jdbc-pool: java/org/apache/tomcat/jdbc/pool/ConnectionPool.java test/org/apache/tomcat/jdbc/test/TestSizePreservation.java
Author: fhanik
Date: Wed Jan 19 21:25:08 2011
New Revision: 1060998
URL: http://svn.apache.org/viewvc?rev=1060998view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=50613
Fix concurrency bug around size calculation for the pool
Added:
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestSizePreservation.java
(with props)
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java?rev=1060998r1=1060997r2=1060998view=diff
==
---
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
Wed Jan 19 21:25:08 2011
@@ -545,7 +545,7 @@ public class ConnectionPool {
// we could have threads stuck in idle.poll(timeout) that will never be
// notified
if (waitcount.get() 0) {
-idle.offer(new PooledConnection(poolProperties, this));
+idle.offer(create(true));
}
}
@@ -637,7 +637,7 @@ public class ConnectionPool {
*/
protected PooledConnection createConnection(long now, PooledConnection
notUsed, String username, String password) throws SQLException {
//no connections where available we'll create one
-PooledConnection con = create();
+PooledConnection con = create(false);
if (username!=null) con.getAttributes().put(con.PROP_USER, username);
if (password!=null) con.getAttributes().put(con.PROP_PASSWORD,
password);
boolean error = false;
@@ -984,7 +984,8 @@ public class ConnectionPool {
* Create a new pooled connection object. Not connected nor validated.
* @return a pooled connection object
*/
-protected PooledConnection create() {
+protected PooledConnection create(boolean incrementCounter) {
+if (incrementCounter) size.incrementAndGet();
PooledConnection con = new PooledConnection(getPoolProperties(), this);
return con;
}
Added:
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestSizePreservation.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestSizePreservation.java?rev=1060998view=auto
==
---
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestSizePreservation.java
(added)
+++
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestSizePreservation.java
Wed Jan 19 21:25:08 2011
@@ -0,0 +1,127 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomcat.jdbc.test;
+
+import java.sql.Connection;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import junit.framework.TestCase;
+
+import org.apache.tomcat.jdbc.pool.DataSource;
+import org.apache.tomcat.jdbc.pool.PoolConfiguration;
+import org.apache.tomcat.jdbc.test.driver.Driver;
+/**
+ *
+ * @author Jeremy Norris
+ * https://issues.apache.org/bugzilla/show_bug.cgi?id=50613
+ *
+ */
+public class TestSizePreservation extends TestCase {
+
+protected volatile DataSource ds = null;
+
+public TestSizePreservation() {
+}
+
+private void initSimplePoolProperties() {
+PoolConfiguration p = new DefaultProperties();
+ds = new org.apache.tomcat.jdbc.pool.DataSource();
+ds.setPoolProperties(p);
+
+ds.getPoolProperties().setDriverClassName(Driver.class.getName());
+ds.getPoolProperties().setUrl(Driver.url);
+ds.getPoolProperties().setFairQueue(true);
+ds.getPoolProperties().setJmxEnabled(false);
+ds.getPoolProperties().setTestWhileIdle(true);
+ds.getPoolProperties().setTestOnBorrow(false);
+ds.getPoolProperties().setTestOnReturn(false);
+ds.getPoolProperties().setValidationInterval(3);
+
DO NOT REPLY [Bug 50613] ConnectionPool.size corruption when evictions enabled:
https://issues.apache.org/bugzilla/show_bug.cgi?id=50613 Filip Hanik fha...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #4 from Filip Hanik fha...@apache.org 2011-01-19 16:25:47 EST --- Bug fixed in r1060998 Thank you for the report and the test case. -- 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: r1061017 - /tomcat/trunk/modules/jdbc-pool/doc/changelog.xml
Author: fhanik Date: Wed Jan 19 21:45:20 2011 New Revision: 1061017 URL: http://svn.apache.org/viewvc?rev=1061017view=rev Log: doco update Modified: tomcat/trunk/modules/jdbc-pool/doc/changelog.xml Modified: tomcat/trunk/modules/jdbc-pool/doc/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/doc/changelog.xml?rev=1061017r1=1061016r2=1061017view=diff == --- tomcat/trunk/modules/jdbc-pool/doc/changelog.xml (original) +++ tomcat/trunk/modules/jdbc-pool/doc/changelog.xml Wed Jan 19 21:45:20 2011 @@ -28,6 +28,20 @@ /properties body +section name=Tomcat JDBC Connection Pool 1.0.9.3 + subsection name=pool +changelog + fixrev1060998/rev bug50613/bug Fix concurrency issue around pool size calculation.(fhanik)/fix +/changelog + /subsection +/section +section name=Tomcat JDBC Connection Pool 1.0.9.2 + subsection name=pool +changelog + fixrev1057743/rev Make sure passwords are masked.(fhanik)/fix +/changelog + /subsection +/section section name=Tomcat JDBC Connection Pool 1.0.9.0 subsection name=pool changelog - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1061023 - in /tomcat/trunk/modules/jdbc-pool: build.properties.default sign.sh
Author: fhanik Date: Wed Jan 19 21:54:08 2011 New Revision: 1061023 URL: http://svn.apache.org/viewvc?rev=1061023view=rev Log: update version Modified: tomcat/trunk/modules/jdbc-pool/build.properties.default tomcat/trunk/modules/jdbc-pool/sign.sh Modified: tomcat/trunk/modules/jdbc-pool/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.properties.default?rev=1061023r1=1061022r2=1061023view=diff == --- tomcat/trunk/modules/jdbc-pool/build.properties.default (original) +++ tomcat/trunk/modules/jdbc-pool/build.properties.default Wed Jan 19 21:54:08 2011 @@ -28,7 +28,7 @@ version.major=1 version.minor=0 version.build=9 -version.patch=2 +version.patch=3 version.suffix= # - Default Base Path for Dependent Packages - Modified: tomcat/trunk/modules/jdbc-pool/sign.sh URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/sign.sh?rev=1061023r1=1061022r2=1061023view=diff == --- tomcat/trunk/modules/jdbc-pool/sign.sh (original) +++ tomcat/trunk/modules/jdbc-pool/sign.sh Wed Jan 19 21:54:08 2011 @@ -15,7 +15,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -VERSION=v1.0.9.2 +VERSION=v1.0.9.3 for i in $(find output/release/$VERSION -name *.zip -o -name *.tar.gz); do echo Signing $i echo $1|gpg --passphrase-fd 0 -a -b $i - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1061025 - /tomcat/tags/JDBC_POOL_1_0_9_3/
Author: fhanik Date: Wed Jan 19 21:58:00 2011 New Revision: 1061025 URL: http://svn.apache.org/viewvc?rev=1061025view=rev Log: Tag 1.0.9.3 Bug fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=50613 Added: tomcat/tags/JDBC_POOL_1_0_9_3/ (props changed) - copied from r1061024, tomcat/trunk/modules/jdbc-pool/ Propchange: tomcat/tags/JDBC_POOL_1_0_9_3/ -- --- svn:ignore (added) +++ svn:ignore Wed Jan 19 21:58:00 2011 @@ -0,0 +1,3 @@ +build.properties +includes +output Propchange: tomcat/tags/JDBC_POOL_1_0_9_3/ -- svn:mergeinfo = /tomcat/tc6.0.x/trunk/modules/jdbc-pool:742915 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1061047 - in /tomcat/trunk/java/org/apache: catalina/Context.java catalina/core/StandardContext.java catalina/startup/ContextConfig.java naming/resources/BaseDirContext.java
Author: markt
Date: Wed Jan 19 22:51:59 2011
New Revision: 1061047
URL: http://svn.apache.org/viewvc?rev=1061047view=rev
Log:
Revert r1060927. It changed the API (which would have been fine if it the
eventual solution needed it but it doesn't)
Modified:
tomcat/trunk/java/org/apache/catalina/Context.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java
Modified: tomcat/trunk/java/org/apache/catalina/Context.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Context.java?rev=1061047r1=1061046r2=1061047view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Context.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Context.java Wed Jan 19 22:51:59 2011
@@ -1214,11 +1214,11 @@ public interface Context extends Contain
/**
- * Add a URL for a location (usually a JAR) that contains static resources
- * in a META-INF/resources directory that should be included in the static
+ * Add a URL for a JAR that contains static resources in a
+ * META-INF/resources directory that should be included in the static
* resources for this context.
*/
-public void addAltResourceUrl(URL url);
+public void addResourceJarUrl(URL url);
/**
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1061047r1=1061046r2=1061047view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Wed Jan 19
22:51:59 2011
@@ -1046,14 +1046,14 @@ public class StandardContext extends Con
/**
- * Add a URL for a location (usually a JAR) that contains static resources
- * in a META-INF/resources directory that should be included in the static
+ * Add a URL for a JAR that contains static resources in a
+ * META-INF/resources directory that should be included in the static
* resources for this context.
*/
@Override
-public void addAltResourceUrl(URL url) {
+public void addResourceJarUrl(URL url) {
if (webappResources instanceof BaseDirContext) {
-((BaseDirContext) webappResources).addAltResources(url);
+((BaseDirContext) webappResources).addResourcesJar(url);
} else {
log.error(sm.getString(standardContext.noResourceJar, url,
getName()));
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1061047r1=1061046r2=1061047view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Wed Jan 19
22:51:59 2011
@@ -1502,7 +1502,7 @@ public class ContextConfig
jarFile = conn.getJarFile();
ZipEntry entry = jarFile.getEntry(META-INF/resources/);
if (entry != null) {
-context.addAltResourceUrl(url);
+context.addResourceJarUrl(url);
}
}
} catch (IOException ioe) {
Modified: tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java?rev=1061047r1=1061046r2=1061047view=diff
==
--- tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java Wed Jan
19 22:51:59 2011
@@ -153,7 +153,7 @@ public abstract class BaseDirContext imp
* Add a resources JAR. The contents of /META-INF/resources/ will be used
if
* a requested resource can not be found in the main context.
*/
-public void addAltResources(URL url) {
+public void addResourcesJar(URL url) {
try {
JarURLConnection conn = (JarURLConnection) url.openConnection();
JarFile jarFile = conn.getJarFile();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50613] ConnectionPool.size corruption when evictions enabled:
https://issues.apache.org/bugzilla/show_bug.cgi?id=50613 --- Comment #5 from Jeremy Norris jnorri...@gmail.com 2011-01-19 19:11:26 EST --- Thanks for the quick fix! It's working well. -- 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
