DO NOT REPLY [Bug 50285] Standard HTTP and AJP connectors silently ignore attribute typos
https://issues.apache.org/bugzilla/show_bug.cgi?id=50285 Tim Whittington changed: What|Removed |Added Priority|P3 |P4 Component|Common |Connectors Version|unspecified |6.0.29 Product|Tomcat Connectors |Tomcat 6 Target Milestone|--- |default --- Comment #1 from Tim Whittington 2010-11-24 03:00:50 EST --- This only affects the older connectors in Tomcat 6 (they had a catchall setProperty() method that the configuration digester hits). All the connectors in Tomcat 7 work as expected and produce a warning. -- 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 50325] New: Update Tomcat to use JRE provided solutions for CVE-2009-3555 if available
https://issues.apache.org/bugzilla/show_bug.cgi?id=50325 Summary: Update Tomcat to use JRE provided solutions for CVE-2009-3555 if available Product: Tomcat 7 Version: trunk Platform: All OS/Version: All Status: NEW Severity: enhancement Priority: P2 Component: Connectors AssignedTo: dev@tomcat.apache.org ReportedBy: ma...@apache.org See http://www.oracle.com/technetwork/java/javase/documentation/tlsreadme2-176330.html for information on the Oracle provided features. Need to review this to see what - if anything - we can do in 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 50326] New: Problem with DBCP 1.3 /jdk 6 and oracle spatial
https://issues.apache.org/bugzilla/show_bug.cgi?id=50326 Summary: Problem with DBCP 1.3 /jdk 6 and oracle spatial Product: Tomcat 5 Version: 5.5.30 Platform: Other OS/Version: All Status: NEW Severity: normal Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: nils.hildebr...@bamf.bund.de Hi, we have a GIS-application running on Tomcat 5.5. As webserver we are using Apache httpd 2.2 connected to tomcat via ajp (mod_proxy_ajp). OS is Linux (CentOS 5.5 x86_64). As database we use a oracle-db release 10.2. Connection works fine with ojdbc5/6.jar - even the old ojdbc14.jar works. The application worked fine with Tomcat 5.5.28, sun jdk 1.5_22 and oracle jdk 6u22 until we tried to upgrade to tomcat 5.5.31. After the upgrade we get - in certain situations a: java.io.IOException: org.hibernatespatial.helper.FinderException: Couldn't get at the OracleSpatial Connection object from the PreparedStatement. After looking through the Tomcat 5.5 changelogs we stumbled across a change made in 5.5.30: Upgrade to DBCP 1.3. We tried to narrow down the problem by downgrading to Tomcat 5.5.29 - the error was gone. Then Upgrade to 5.5.30: The error is back. We took a closer look at the db-connector: oracle.jdbc.driver.OracleDriver was in use, so we changed this to oracle.jdbc.OracleDriver - nevertheless - the error remains. When looking at DBCP we found on http://commons.apache.org/dbcp/: DBCP 1.4 binaries should be used by applications running under JDK 1.6. DBCP 1.3 should be used when running under JDK 1.4 or 1.5." Now Tomcat should run with jdk 1.5 and jdk 1.6 (and worked fine with the dbcp 1.2.x as it seems). This seems to be a bug here. Since jdk 1.5 has reached EoL I think a proper solution would be to update dbcp to 1.4 in Tomcat 5.5 - or fix dbcp 1.3 so it is compatible with jdk 1.6. Else the statement that 5.5 runs with jdk 1.5 or higher is no longer true. I could not test our current application with Tomcat 5.5.31 and jdk 1.5 since it is compiled now against jdk 1.6 and won't work with jdk 1.5 any longer. Kind regards Nils -- 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
https://issues.apache.org/bugzilla/show_bug.cgi?id=50326 Nils Hildebrand changed: What|Removed |Added CC||nils.hildebr...@bamf.bund.d ||e -- 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
https://issues.apache.org/bugzilla/show_bug.cgi?id=50326 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Comment #1 from Mark Thomas 2010-11-24 07:24:10 EST --- (In reply to comment #0) > DBCP 1.4 binaries should be used by applications running under JDK 1.6. > DBCP 1.3 should be used when running under JDK 1.4 or 1.5." > > Now Tomcat should run with jdk 1.5 and jdk 1.6 (and worked fine with the dbcp > 1.2.x as it seems). This seems to be a bug here. This analysis is incorrect since the JDK limitations of DBCP 1.2 are identical to DBCP 1.3 (it is related to the JDBC version supported by the JRE). > Since jdk 1.5 has reached EoL I think a proper solution would be to update > dbcp > to 1.4 in Tomcat 5.5 That is not possible since DBCP 1.4 requires Java 6 but the minimum Java version for Tomcat 5.5.x is Java 1.4 and that will not be changed. > - or fix dbcp 1.3 so it is compatible with jdk 1.6. That is simply not possible. Hence why there is DBCP 1.3 and DBCP 1.4. > Else the statement that 5.5 runs with jdk 1.5 or higher is no longer true. The statement that 5.5 runs on a 1.4 or higher jre is perfectly true. There is nothing stopping DBCP 1.2 or 1.3 running on Java 6. However, JDBC 4 features will not be available and any attempt to use them will result in an exception. > I could not test our current application with Tomcat 5.5.31 and jdk 1.5 since > it is compiled now against jdk 1.6 and won't work with jdk 1.5 any longer. That shouldn't stop you testing it with 5.5.31 running on a 1.6 jre. I suspect you have hit either a DBCP bug or a hibernate bug around the relationship between physical and pooled connections and what is exposed via prepared statement objects. The Commons users list is probably the best place to get help debugging this. It certainly isn't a Tomcat bug. -- 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
https://issues.apache.org/bugzilla/show_bug.cgi?id=50326 --- Comment #2 from Konstantin Kolinko 2010-11-24 07:46:17 EST --- Note, that if you are unsatisfied by DBCP version bundled in Tomcat, you can use any other version of DBCP libraries directly, as well as any other pool implementation. Hint: use "factory" attribute on the element. For DBCP the value will be "org.apache.commons.dbcp.BasicDataSourceFactory". Ask on the users mailing list if you have further questions. -- 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
https://issues.apache.org/bugzilla/show_bug.cgi?id=50326 --- Comment #3 from Nils Hildebrand 2010-11-24 08:35:13 EST --- (In reply to comment #1) > (In reply to comment #0) > > DBCP 1.4 binaries should be used by applications running under JDK 1.6. > > DBCP 1.3 should be used when running under JDK 1.4 or 1.5." > > > > Now Tomcat should run with jdk 1.5 and jdk 1.6 (and worked fine with the > > dbcp > > 1.2.x as it seems). This seems to be a bug here. > [...] > That is simply not possible. Hence why there is DBCP 1.3 and DBCP 1.4. > > > Else the statement that 5.5 runs with jdk 1.5 or higher is no longer true. > > The statement that 5.5 runs on a 1.4 or higher jre is perfectly true. There is > nothing stopping DBCP 1.2 or 1.3 running on Java 6. However, JDBC 4 features > will not be available and any attempt to use them will result in an exception. Why did it work then with DBCP 1.2 and not DBCP 1.3? Yes - this might be a DBCP 1.3 bug (as you hinted). > > I could not test our current application with Tomcat 5.5.31 and jdk 1.5 > > since > > it is compiled now against jdk 1.6 and won't work with jdk 1.5 any longer. > > That shouldn't stop you testing it with 5.5.31 running on a 1.6 jre. That's what I did first - and got the error. > I suspect you have hit either a DBCP bug or a hibernate bug around the > relationship between physical and pooled connections and what is exposed via > prepared statement objects. Propably a DBCP 1.3. bug - the prepared-statement was there with dbcp 1.2, too - and there is no bug with 5.5.29. > The Commons users list is probably the best place > to get help debugging this. It certainly isn't a Tomcat bug. Not directly - but somehow this is related to 5.5. > 29, so Tomcat needs feedback when this is resolved. I will try to track this down... Why not include DBCP 1.3 and DBCP 1.4 with Tomcat 5.5? The next comment hinted that one could do that and change the factory-setting... -- 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
https://issues.apache.org/bugzilla/show_bug.cgi?id=50326 --- Comment #4 from Nils Hildebrand 2010-11-24 08:37:10 EST --- (In reply to comment #2) > Note, that if you are unsatisfied by DBCP version bundled in Tomcat, you can > use any other version of DBCP libraries directly, as well as any other pool > implementation. Hint: use "factory" attribute on the element. For > DBCP the value will be "org.apache.commons.dbcp.BasicDataSourceFactory". > > Ask on the users mailing list if you have further questions. Great - I will try that next - after upgrading to Tomcat 5.5.31 again. Kind regards Nils -- 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: Invitation to become a Tomcat committer
Mark, On 11/23/2010 5:24 PM, Mark Thomas wrote: > On 23/11/2010 22:10, Christopher Schultz wrote: >> Done: I modified whoweare.xml, generated whoweare.html from that, >> logged-into people.apache.org, did 'cd /www/tomcat.apache.org && scn up' >> and saw the whoweare.html file updated. > > Hmm. I don't see the commit. Doh! I forgot to add your a.o e-mail to the > dev allow list. Fixed. Okay, what do I do, now? svn says I have no differences in those files. That is, my initial commit seems to have succeeded. Is my working copy in some weird state, now? >> Visiting the site doesn't seem >> to reflect the change, though. Different server? Delay for worldwide >> mirrors? > > people.a.o is not the public server. The content is rsync'd hourly to > two servers - one in the US, one in the EU. Deletes are once per 24 hours. Okay, good to know. >> On the other hand, I see a lot of stuff about proposing and nominating >> patches, voting, etc. Is there some "howto" I can read for doing that, >> or is it more of an etiquette that I just need to absorb from the others? > > tomcat/trunk is commit-then-review (CTR) Okay, so that means that commits happen and then anyone who wants to review and/or complain is free to do so? > tomcat/site/trunk is CTR > tomcat/tc6.0.x/trunk is review-then-commit (RTC) > tomcat/tc5.5.x/trunk is RTC So the RTC policy is due to the "stable" nature of those branches, or because they aren't seeing much in the way or new development (other than backports from the 7.x branch)? > Documentation is always CTR. > > For the releases using RTC there is a status file in the root of that > part of the repo. Patches are added there and need at least 3 +1 votes > (with no vetos) before they can be applied. > > BTW, it would have been fine to ask all of this on the dev list. Noted. -chris signature.asc Description: OpenPGP digital signature
Re: Invitation to become a Tomcat committer
On 24/11/2010 15:05, Christopher Schultz wrote: > Mark, > > On 11/23/2010 5:24 PM, Mark Thomas wrote: >> On 23/11/2010 22:10, Christopher Schultz wrote: >>> Done: I modified whoweare.xml, generated whoweare.html from that, >>> logged-into people.apache.org, did 'cd /www/tomcat.apache.org && scn up' >>> and saw the whoweare.html file updated. >> >> Hmm. I don't see the commit. Doh! I forgot to add your a.o e-mail to the >> dev allow list. Fixed. > > Okay, what do I do, now? svn says I have no differences in those files. > That is, my initial commit seems to have succeeded. Is my working copy > in some weird state, now? No. It all worked. The only issue is that the commit e-mail that ws sent to the dev list is lost. It is possible to re-create it but I don't think it is worth it. If others disagree, I'll dig through the infra docs and remind myself how to do that. >>> On the other hand, I see a lot of stuff about proposing and nominating >>> patches, voting, etc. Is there some "howto" I can read for doing that, >>> or is it more of an etiquette that I just need to absorb from the others? >> >> tomcat/trunk is commit-then-review (CTR) > > Okay, so that means that commits happen and then anyone who wants to > review and/or complain is free to do so? Exactly. >> tomcat/site/trunk is CTR >> tomcat/tc6.0.x/trunk is review-then-commit (RTC) >> tomcat/tc5.5.x/trunk is RTC > > So the RTC policy is due to the "stable" nature of those branches, or > because they aren't seeing much in the way or new development (other > than backports from the 7.x branch)? The main reason those branches when to RTC was to reduce 'complications' when committers disagreed about what should go in those branches and/or how it should be implemented. RTC helps promote consensus. It does also aid stability. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Invitation to become a Tomcat committer
> No. It all worked. The only issue is that the commit e-mail that ws sent > to the dev list is lost. It is possible to re-create it but I don't > think it is worth it. If others disagree, I'll dig through the infra > docs and remind myself how to do that. I see no need for you to spend time digging through docs just to fabricate an automatic e-mail the commit log for a "where am i" commit. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1038656 - in /tomcat/trunk/java/org/apache/catalina/core: LocalStrings.properties StandardEngine.java
Author: markt
Date: Wed Nov 24 15:58:46 2010
New Revision: 1038656
URL: http://svn.apache.org/viewvc?rev=1038656&view=rev
Log:
Don't swallow error
Modified:
tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java
Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1038656&r1=1038655&r2=1038656&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties Wed Nov
24 15:58:46 2010
@@ -152,6 +152,7 @@ standardContext.workPath=Exception obtai
standardContext.wrapper.error=JSP file {0} must start with a ''/'
standardContext.wrapper.warning=WARNING: JSP file {0} must start with a ''/''
in Servlet 2.4
standardEngine.alreadyStarted=Engine has already been started
+standardEngine.jvmRouteFail=Failed to set Engine's jvmRoute attribute from
system property
standardEngine.mappingError=MAPPING configuration error for server name {0}
standardEngine.noHost=No Host matches server name {0}
standardEngine.noHostHeader=HTTP/1.1 request with no Host: header
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java?rev=1038656&r1=1038655&r2=1038656&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java Wed Nov 24
15:58:46 2010
@@ -62,6 +62,7 @@ public class StandardEngine extends Cont
try {
setJvmRoute(System.getProperty("jvmRoute"));
} catch(Exception ex) {
+log.warn(sm.getString("standardEngine.jvmRouteFail"));
}
// By default, the engine will hold the reloading thread
backgroundProcessorDelay = 10;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Invitation to become a Tomcat committer
Hi, Chris, and others on d...@! 2010/11/24 Christopher Schultz : >> Documentation is always CTR. Besides Documentation there are also several types of code changes that are CTR as well, http://markmail.org/thread/2fgydrrhn4qjye3r Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1038711 - /tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java
Author: markt
Date: Wed Nov 24 17:28:55 2010
New Revision: 1038711
URL: http://svn.apache.org/viewvc?rev=1038711&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50201
Track changes that require an update to the default access log.
It isn't perfect but should cover normal usage
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java?rev=1038711&r1=1038710&r2=1038711&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java Wed Nov 24
17:28:55 2010
@@ -16,15 +16,22 @@
*/
package org.apache.catalina.core;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
import java.util.Locale;
import org.apache.catalina.AccessLog;
import org.apache.catalina.Container;
+import org.apache.catalina.ContainerEvent;
+import org.apache.catalina.ContainerListener;
import org.apache.catalina.Context;
import org.apache.catalina.Engine;
import org.apache.catalina.Globals;
import org.apache.catalina.Host;
+import org.apache.catalina.Lifecycle;
+import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleException;
+import org.apache.catalina.LifecycleListener;
import org.apache.catalina.Realm;
import org.apache.catalina.Service;
import org.apache.catalina.connector.Request;
@@ -321,12 +328,24 @@ public class StandardEngine extends Cont
if (host != null && host.getState().isAvailable()) {
defaultAccessLog = host.getAccessLog();
-if (defaultAccessLog == null) {
+if (defaultAccessLog != null) {
+AccessLogListener l = new AccessLogListener(this);
+host.addPropertyChangeListener(l);
+host.addContainerListener(l);
+host.addLifecycleListener(l);
+} else {
// Try the ROOT context of default host
Context context = (Context) host.findChild("");
if (context != null &&
context.getState().isAvailable()) {
defaultAccessLog = context.getAccessLog();
+
+if (defaultAccessLog != null) {
+AccessLogListener l =
+new AccessLogListener(this);
+context.addPropertyChangeListener(l);
+context.addLifecycleListener(l);
+}
}
}
}
@@ -369,4 +388,62 @@ public class StandardEngine extends Cont
// NOOP
}
}
+
+protected static final class AccessLogListener
+implements PropertyChangeListener, LifecycleListener,
+ContainerListener {
+
+private StandardEngine engine;
+private volatile boolean disabled = false;
+
+public AccessLogListener(StandardEngine engine) {
+this.engine = engine;
+}
+
+@Override
+public void lifecycleEvent(LifecycleEvent event) {
+if (disabled) return;
+
+String type = event.getType();
+if (Lifecycle.AFTER_START_EVENT.equals(type) ||
+Lifecycle.BEFORE_STOP_EVENT.equals(type)) {
+// Container is being started/stopped
+// Force re-calculation but do not disable listener since it
+// might be re-used
+engine.defaultAccessLog = null;
+} else if (Lifecycle.BEFORE_DESTROY_EVENT.endsWith(type)) {
+// Container is being removed
+// Force re-calculation and disable listener since it won't
+// be re-used
+engine.defaultAccessLog = null;
+disabled = true;
+}
+}
+
+@Override
+public void propertyChange(PropertyChangeEvent evt) {
+if (disabled) return;
+if ("defaultHost".equals(evt.getPropertyName())) {
+// Force re-calculation and disable listener since it won't
+// be re-used
+engine.defaultAccessLog = null;
+disabled = true;
+}
+}
+
+@Override
+public void containerEvent(ContainerEvent event) {
+// Only useful for hosts
+if (disabled) return;
+
+if (Container.ADD_CHILD_EVENT.equals(event.getType())) {
+Context context = (Context) event.getData();
+
DO NOT REPLY [Bug 50201] StandardEngine.defaultAccessLog may become stale when ROOT webapp is redeployed
https://issues.apache.org/bugzilla/show_bug.cgi?id=50201 --- Comment #1 from Mark Thomas 2010-11-24 12:30:35 EST --- Fixed in 7.0.x and will be included in 7.0.5 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: r1038713 - in /tomcat/trunk/java/org/apache/catalina/startup: HostConfig.java LocalStrings.properties LocalStrings_es.properties
Author: markt
Date: Wed Nov 24 17:36:28 2010
New Revision: 1038713
URL: http://svn.apache.org/viewvc?rev=1038713&view=rev
Log:
host.removeChild() already calls context.destroy(). Don't call it twice.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties
Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1038713&r1=1038712&r2=1038713&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Wed Nov 24
17:36:28 2010
@@ -1103,13 +1103,6 @@ public class HostConfig
log.warn(sm.getString
("hostConfig.context.remove", app.name), t);
}
-try {
-context.destroy();
-} catch (Throwable t) {
-ExceptionUtils.handleThrowable(t);
-log.warn(sm.getString
- ("hostConfig.context.destroy", app.name), t);
-}
// Delete other redeploy resources
for (int j = i + 1; j < resources.length; j++) {
try {
@@ -1161,13 +1154,6 @@ public class HostConfig
log.warn(sm.getString
("hostConfig.context.remove", app.name), t);
}
-try {
-context.destroy();
-} catch (Throwable t) {
-ExceptionUtils.handleThrowable(t);
-log.warn(sm.getString
- ("hostConfig.context.destroy", app.name), t);
-}
// Delete all redeploy resources
for (int j = i + 1; j < resources.length; j++) {
try {
Modified: tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties?rev=1038713&r1=1038712&r2=1038713&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties Wed
Nov 24 17:36:28 2010
@@ -72,7 +72,6 @@ expandWar.illegalPath=The archive [{0}]
hostConfig.appBase=Application base directory {0} does not exist
hostConfig.canonicalizing=Error delete redeploy resources from context [{0}]
hostConfig.cce=Lifecycle event data object {0} is not a Host
-hostConfig.context.destroy=Error during context [{0}] destroy
hostConfig.context.remove=Error while removing context [{0}]
hostConfig.context.restart=Error during context [{0}] restart
hostConfig.createDirs=Unable to create directory for deployment: {0}
Modified:
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties?rev=1038713&r1=1038712&r2=1038713&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties
Wed Nov 24 17:36:28 2010
@@ -44,7 +44,6 @@ expandWar.copy = Error copiando {0} a {1
hostConfig.appBase = No existe el directorio base de la aplicaci\u00F3n {0}
hostConfig.canonicalizing = Error al borrar redespliegue de recursos desde
contexto [{0}]
hostConfig.cce = El objeto de los datos de evento de ciclo de vida (Lifecycle
event data object) {0} no es una m\u00E1quina (host)
-hostConfig.context.destroy = Error al destruir contexto [{0}]
hostConfig.context.remove = Error al quitar contexto [{0}]
hostConfig.context.restart = Error durante el arranque del contexto {0}
hostConfig.deploy = Desplieque del directorio {0} de la aplicaci\u00F3n web
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1038717 - in /tomcat/tc7.0.x/tags/TOMCAT_7_0_5: ./ java/org/apache/catalina/core/ java/org/apache/catalina/startup/
Author: markt Date: Wed Nov 24 17:41:29 2010 New Revision: 1038717 URL: http://svn.apache.org/viewvc?rev=1038717&view=rev Log: Tag Tomcat 7.0.5 Added: tomcat/tc7.0.x/tags/TOMCAT_7_0_5/ (props changed) - copied from r1038654, tomcat/trunk/ tomcat/tc7.0.x/tags/TOMCAT_7_0_5/java/org/apache/catalina/core/LocalStrings.properties - copied unchanged from r1038656, tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties tomcat/tc7.0.x/tags/TOMCAT_7_0_5/java/org/apache/catalina/core/StandardEngine.java - copied unchanged from r1038711, tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java tomcat/tc7.0.x/tags/TOMCAT_7_0_5/java/org/apache/catalina/startup/HostConfig.java - copied unchanged from r1038713, tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java tomcat/tc7.0.x/tags/TOMCAT_7_0_5/java/org/apache/catalina/startup/LocalStrings.properties - copied unchanged from r1038713, tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties tomcat/tc7.0.x/tags/TOMCAT_7_0_5/java/org/apache/catalina/startup/LocalStrings_es.properties - copied unchanged from r1038713, tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties Modified: tomcat/tc7.0.x/tags/TOMCAT_7_0_5/build.properties.default Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_5/ -- --- svn:ignore (added) +++ svn:ignore Wed Nov 24 17:41:29 2010 @@ -0,0 +1,6 @@ +.settings +.classpath +.project +output +build.properties +.checkstyle Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_5/ -- svn:mergeinfo = /tomcat/tc6.0.x/trunk:742915 Modified: tomcat/tc7.0.x/tags/TOMCAT_7_0_5/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/tags/TOMCAT_7_0_5/build.properties.default?rev=1038717&r1=1038654&r2=1038717&view=diff == --- tomcat/tc7.0.x/tags/TOMCAT_7_0_5/build.properties.default (original) +++ tomcat/tc7.0.x/tags/TOMCAT_7_0_5/build.properties.default Wed Nov 24 17:41:29 2010 @@ -29,7 +29,7 @@ version.major=7 version.minor=0 version.build=5 version.patch=0 -version.suffix=-dev +version.suffix= # - Build control flags - # Note enabling validation uses Checkstyle which is LGPL licensed - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "TomcatVersions" by TimFunk
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The "TomcatVersions" page has been changed by TimFunk. The comment on this change is: CTR / RTC clarification. http://wiki.apache.org/tomcat/TomcatVersions?action=diff&rev1=14&rev2=15 -- * Tomcat 4.1.x * Tomcat 5.0.x + + = RTC Exceptions = + Via http://markmail.org/thread/2fgydrrhn4qjye3r + + * Allow C-T-R for trivial fixes to English messages that are in resource files and those that are inline in the code. This includes typos and rephrasing, but does not include adding/removing message parameters. + * Allow C-T-R for any fixes for non-English resource files. The files must use 7-bit characters only. Other symbols must be escaped with \u, as does native2ascii. + * Require some indication in the commit message for code that usually is covered by RTC, that this commit was done using C-T-R rule. + [[CategoryFAQ|CategoryFAQ]] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE] Release Apache Tomcat 7.0.5
The proposed Apache Tomcat 7.0.5 release is now available for voting. It can be obtained from: http://people.apache.org/~markt/dev/tomcat-7/v7.0.5/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_5/ As with previous votes, I have included a stable option below although my personal inclination is still to vote beta. The proposed 7.0.5 release is: [ ] Broken - do not release [ ] Alpha - go ahead and release as 7.0.5 Alpha [ ] Beta - go ahead and release as 7.0.5 Beta [ ] Stable - go ahead and release as 7.0.5 Stable This vote will run until 18.00 UTC Monday 29th November (3 working days). Cheers, Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1038762 - /tomcat/trunk/build.properties.default
Author: markt Date: Wed Nov 24 18:52:34 2010 New Revision: 1038762 URL: http://svn.apache.org/viewvc?rev=1038762&view=rev Log: Increment version number ready for next release Modified: tomcat/trunk/build.properties.default Modified: tomcat/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1038762&r1=1038761&r2=1038762&view=diff == --- tomcat/trunk/build.properties.default (original) +++ tomcat/trunk/build.properties.default Wed Nov 24 18:52:34 2010 @@ -27,7 +27,7 @@ # - Version Control Flags - version.major=7 version.minor=0 -version.build=5 +version.build=6 version.patch=0 version.suffix=-dev - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1038789 - in /tomcat/trunk/webapps/docs: changelog.xml config/index.xml
Author: markt
Date: Wed Nov 24 19:59:19 2010
New Revision: 1038789
URL: http://svn.apache.org/viewvc?rev=1038789&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50294
Add more information to documentation regarding format of configuration files.
Patch provided by Luke Meyer.
Modified:
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/index.xml
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1038789&r1=1038788&r2=1038789&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Nov 24 19:59:19 2010
@@ -37,6 +37,16 @@
+
+
+
+
+50294: Add more information to documentation regarding
format
+of configuration files. Patch provided by Luke Meyer. (markt)
+
+
+
+
Modified: tomcat/trunk/webapps/docs/config/index.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/index.xml?rev=1038789&r1=1038788&r2=1038789&view=diff
==
--- tomcat/trunk/webapps/docs/config/index.xml (original)
+++ tomcat/trunk/webapps/docs/config/index.xml Wed Nov 24 19:59:19 2010
@@ -39,8 +39,9 @@ attempt to describe which configuration
specific tasks - for that, see the various HOW-TO documents on the
main index page.
-The Tomcat configuration files support Apache Ant style variable
-substitution. A system property with the name propname may be
+Tomcat configuration files are formatted as schemaless XML; elements and
+attributes are case-sensitive. Apache Ant-style variable substitution
+is supported; a system property with the name propname may be
used in a configuration file using the syntax ${propname}. All
system properties are available including those set using the -D
syntax, those automatically made available by the JVM and those configured in
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1038790 - in /tomcat/tc6.0.x/trunk/webapps/docs: changelog.xml config/index.xml
Author: markt
Date: Wed Nov 24 19:59:46 2010
New Revision: 1038790
URL: http://svn.apache.org/viewvc?rev=1038790&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50294
Add more information to documentation regarding format of configuration files.
Patch provided by Luke Meyer.
Modified:
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/index.xml
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1038790&r1=1038789&r2=1038790&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Nov 24 19:59:46 2010
@@ -315,6 +315,10 @@
CVE-2010-4172: Multiple XSS in Manager application. (markt/kkolinko)
+
+50294: Add more information to documentation regarding
format
+of configuration files. Patch provided by Luke Meyer. (markt)
+
Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/index.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/index.xml?rev=1038790&r1=1038789&r2=1038790&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/config/index.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/index.xml Wed Nov 24 19:59:46 2010
@@ -39,8 +39,9 @@ attempt to describe which configuration
specific tasks - for that, see the various HOW-TO documents on the
main index page.
-The Tomcat configuration files support Apache Ant style variable
-substitution. A system property with the name propname may be
+Tomcat configuration files are formatted as schemaless XML; elements and
+attributes are case-sensitive. Apache Ant-style variable substitution
+is supported; a system property with the name propname may be
used in a configuration file using the syntax ${propname}. All
system properties are available including those set using the -D
syntax, those automatically made available by the JVM and those configured in
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1038791 - in /tomcat/tc5.5.x/trunk/container/webapps/docs: changelog.xml config/index.xml
Author: markt
Date: Wed Nov 24 20:00:12 2010
New Revision: 1038791
URL: http://svn.apache.org/viewvc?rev=1038791&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50294
Add more information to documentation regarding format of configuration files.
Patch provided by Luke Meyer.
Modified:
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
tomcat/tc5.5.x/trunk/container/webapps/docs/config/index.xml
Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=1038791&r1=1038790&r2=1038791&view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Wed Nov 24
20:00:12 2010
@@ -93,6 +93,14 @@
+
+
+
+50294: Add more information to documentation regarding
format
+of configuration files. Patch provided by Luke Meyer. (markt)
+
+
+
Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/config/index.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/config/index.xml?rev=1038791&r1=1038790&r2=1038791&view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/config/index.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/config/index.xml Wed Nov 24
20:00:12 2010
@@ -39,8 +39,9 @@ attempt to describe which configuration
specific tasks - for that, see the various HOW-TO documents on the
main index page.
-The Tomcat configuration files support Apache Ant style variable
-substitution. A system property with the name propname may be
+Tomcat configuration files are formatted as schemaless XML; elements and
+attributes are case-sensitive. Apache Ant-style variable substitution
+is supported; a system property with the name propname may be
used in a configuration file using the syntax ${propname}. All
system properties are available including those set using the -D
syntax, those automatically made available by the JVM and those configured in
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50294] Mention obvious things about config format
https://issues.apache.org/bugzilla/show_bug.cgi?id=50294 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #3 from Mark Thomas 2010-11-24 15:02:12 EST --- Many thanks for the patches. The updated docs will be included in 7.0.6, 6.0.30 and 5.5.32 -- 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: r1038795 - in /tomcat/trunk: java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java webapps/docs/changelog.xml
Author: markt
Date: Wed Nov 24 20:09:26 2010
New Revision: 1038795
URL: http://svn.apache.org/viewvc?rev=1038795&view=rev
Log:
Add additional trace level logging to Tribes to assist with fault diagnosis.
Based on a patch by Ariel.
Fix Eclipse warnings in file
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java?rev=1038795&r1=1038794&r2=1038795&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
Wed Nov 24 20:09:26 2010
@@ -64,6 +64,7 @@ public class ParallelNioSender extends A
}
+@Override
public synchronized void sendMessage(Member[] destination, ChannelMessage
msg) throws ChannelException {
long start = System.currentTimeMillis();
this.setUdpBased((msg.getOptions()&Channel.SEND_OPTIONS_UDP) ==
Channel.SEND_OPTIONS_UDP);
@@ -82,6 +83,7 @@ public class ParallelNioSender extends A
try {
remaining -= doLoop(selectTimeout,
getMaxRetryAttempts(),waitForAck,msg);
} catch (Exception x ) {
+if (log.isTraceEnabled()) log.trace("Error sending
message", x);
int faulty = (cx == null)?0:cx.getFaultyMembers().length;
if ( cx == null ) {
if ( x instanceof ChannelException ) cx =
(ChannelException)x;
@@ -109,7 +111,7 @@ public class ParallelNioSender extends A
throw cx;
}
} catch (Exception x ) {
-try { this.disconnect(); } catch (Exception ignore) {}
+try { this.disconnect(); } catch (Exception e) {/*Ignore*/}
if ( x instanceof ChannelException ) throw (ChannelException)x;
else throw new ChannelException(x);
}
@@ -141,6 +143,9 @@ public class ParallelNioSender extends A
SenderState.getSenderState(sender.getDestination()).setReady();
}//end if
} catch (Exception x) {
+if (log.isTraceEnabled()) {
+log.trace("Error while processing send to " +
sender.getDestination().getName(), x);
+}
SenderState state =
SenderState.getSenderState(sender.getDestination());
int attempt = sender.getAttempt()+1;
boolean retry = (sender.getAttempt() <= maxAttempts &&
maxAttempts>0);
@@ -261,10 +266,12 @@ public class ParallelNioSender extends A
if ( x != null ) throw x;
}
+@Override
public void add(Member member) {
-
+// NOOP
}
+@Override
public void remove(Member member) {
//disconnect senders
NioSender sender = nioSenders.remove(member);
@@ -275,14 +282,13 @@ public class ParallelNioSender extends A
@Override
public synchronized void disconnect() {
setConnected(false);
-try {close(); }catch (Exception x){}
-
+try {close(); }catch (Exception x){/*Ignore*/}
}
@Override
public void finalize() {
-try {disconnect(); }catch ( Exception ignore){}
-try {selector.close();} catch (Exception ignore) {}
+try {disconnect(); }catch ( Exception e){/*Ignore*/}
+try {selector.close();} catch (Exception e) {/*Ignore*/}
}
@Override
@@ -309,8 +315,8 @@ public class ParallelNioSender extends A
}
}
}
-//clean up any canceled keys
-if ( result ) try { selector.selectNow(); }catch (Exception ignore){}
+//clean up any cancelled keys
+if ( result ) try { selector.selectNow(); }catch (Exception
e){/*Ignore*/}
return result;
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1038795&r1=1038794&r2=1038795&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Nov 24 20:09:26 2010
@@ -38,6 +38,14 @@
+
+
+
+50185: Add additional trace level logging to Tribes to
assist
+with fault diagnosis. Based on a patch by Ariel. (markt)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50185] [tribes] Logging improvement
https://issues.apache.org/bugzilla/show_bug.cgi?id=50185 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Mark Thomas 2010-11-24 15:10:59 EST --- Thanks for the patch. I have applied a slightly more efficient version of it to 7.0.x which will be included in 7.0.6 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: r1038799 - in /tomcat/trunk: java/org/apache/coyote/ajp/AbstractAjpProtocol.java java/org/apache/coyote/http11/AbstractHttp11Protocol.java webapps/docs/changelog.xml
Author: markt
Date: Wed Nov 24 20:16:32 2010
New Revision: 1038799
URL: http://svn.apache.org/viewvc?rev=1038799&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50108
Add get/set methods for Connector property minSpareThreads.
Patch provided by Eiji Takahashi.
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java?rev=1038799&r1=1038798&r2=1038799&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java Wed Nov 24
20:16:32 2010
@@ -185,6 +185,10 @@ public abstract class AbstractAjpProtoco
public int getMaxThreads() { return endpoint.getMaxThreads(); }
public void setMaxThreads(int maxThreads) {
endpoint.setMaxThreads(maxThreads); }
+public int getMinSpareThreads() { return endpoint.getMinSpareThreads(); }
+public void setMinSpareThreads(int minSpareThreads) {
endpoint.setMinSpareThreads(minSpareThreads); }
+
+
public int getThreadPriority() { return endpoint.getThreadPriority(); }
public void setThreadPriority(int threadPriority) {
endpoint.setThreadPriority(threadPriority); }
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1038799&r1=1038798&r2=1038799&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Wed
Nov 24 20:16:32 2010
@@ -350,6 +350,8 @@ public abstract class AbstractHttp11Prot
public int getMaxThreads() { return endpoint.getMaxThreads(); }
public void setMaxThreads(int maxThreads) {
endpoint.setMaxThreads(maxThreads); }
+public int getMinSpareThreads() { return endpoint.getMinSpareThreads(); }
+public void setMinSpareThreads(int minSpareThreads) {
endpoint.setMinSpareThreads(minSpareThreads); }
public int getThreadPriority() { return endpoint.getThreadPriority(); }
public void setThreadPriority(int threadPriority) {
endpoint.setThreadPriority(threadPriority); }
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1038799&r1=1038798&r2=1038799&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Nov 24 20:16:32 2010
@@ -38,6 +38,14 @@
+
+
+
+50108: Add get/set methods for Connector property
+minSpareThreads. Patch provided by Eiji Takahashi. (markt)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50108] Add missing setter/getter to AbstractXXXProtocol
https://issues.apache.org/bugzilla/show_bug.cgi?id=50108 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mark Thomas 2010-11-24 15:17:50 EST --- Thanks for the patch. It has been applied to 7.0.x and will be included in 7.0.6 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: r1038803 - in /tomcat/trunk: conf/catalina.properties java/org/apache/catalina/startup/catalina.properties webapps/docs/changelog.xml
Author: markt
Date: Wed Nov 24 20:33:49 2010
New Revision: 1038803
URL: http://svn.apache.org/viewvc?rev=1038803&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49650
Remove unnecessary entries package.access property defined in
catalina.properties.
Patch provided by Owen Farrell.
Modified:
tomcat/trunk/conf/catalina.properties
tomcat/trunk/java/org/apache/catalina/startup/catalina.properties
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/conf/catalina.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/conf/catalina.properties?rev=1038803&r1=1038802&r2=1038803&view=diff
==
--- tomcat/trunk/conf/catalina.properties (original)
+++ tomcat/trunk/conf/catalina.properties Wed Nov 24 20:33:49 2010
@@ -19,7 +19,7 @@
# passed to checkPackageAccess unless the
# corresponding RuntimePermission ("accessClassInPackage."+package) has
# been granted.
-package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.tomcat.,org.apache.jasper.,sun.beans.
+package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.tomcat.,org.apache.jasper.
#
# List of comma-separated packages that start with or equal this string
# will cause a security exception to be thrown when
Modified: tomcat/trunk/java/org/apache/catalina/startup/catalina.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/catalina.properties?rev=1038803&r1=1038802&r2=1038803&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/catalina.properties (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/catalina.properties Wed Nov
24 20:33:49 2010
@@ -19,7 +19,7 @@
# passed to checkPackageAccess unless the
# corresponding RuntimePermission ("accessClassInPackage."+package) has
# been granted.
-package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.tomcat.,org.apache.jasper.,sun.beans.
+package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.tomcat.,org.apache.jasper.
#
# List of comma-separated packages that start with or equal this string
# will cause a security exception to be thrown when
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1038803&r1=1038802&r2=1038803&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Nov 24 20:33:49 2010
@@ -38,6 +38,14 @@
+
+
+
+49650: Remove unnecessary entries package.access property
+defined in catalina.properties. Patch provided by Owen Farrell.
(markt)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49650] Streamline package.access property definition in catalina.properties
https://issues.apache.org/bugzilla/show_bug.cgi?id=49650 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mark Thomas 2010-11-24 15:35:12 EST --- Thanks for the patch. It has been applied to 7.0.x and will be included in 7.0.6 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 49100] Mutable public constants: MemberImpl.TRIBES_MBR_BEGIN/END
https://issues.apache.org/bugzilla/show_bug.cgi?id=49100 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WONTFIX -- 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 49101] All constants in tribes.transport.Constants are mutable
https://issues.apache.org/bugzilla/show_bug.cgi?id=49101 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WONTFIX -- 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 50106] Fix several mbean descriptors
https://issues.apache.org/bugzilla/show_bug.cgi?id=50106 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Mark Thomas 2010-11-24 15:55:19 EST --- Many thanks for the patch. It has been applied to 7.0.x and will be included in 7.0.6 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: r1038810 - in /tomcat/trunk: java/org/apache/catalina/authenticator/ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache/catalina/ha/session/ java/org/apache
Author: markt Date: Wed Nov 24 20:54:21 2010 New Revision: 1038810 URL: http://svn.apache.org/viewvc?rev=1038810&view=rev Log: https://issues.apache.org/bugzilla/show_bug.cgi?id=50106 Correct several MBean descriptors. Patch provided by Eiji Takahashi. Modified: tomcat/trunk/java/org/apache/catalina/authenticator/mbeans-descriptors.xml tomcat/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml tomcat/trunk/java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml tomcat/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml tomcat/trunk/java/org/apache/catalina/realm/mbeans-descriptors.xml tomcat/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml tomcat/trunk/java/org/apache/catalina/valves/mbeans-descriptors.xml tomcat/trunk/java/org/apache/jasper/servlet/mbeans-descriptors.xml tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/java/org/apache/catalina/authenticator/mbeans-descriptors.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/mbeans-descriptors.xml?rev=1038810&r1=1038809&r2=1038810&view=diff == --- tomcat/trunk/java/org/apache/catalina/authenticator/mbeans-descriptors.xml (original) +++ tomcat/trunk/java/org/apache/catalina/authenticator/mbeans-descriptors.xml Wed Nov 24 20:54:21 2010 @@ -42,7 +42,8 @@ + type="java.lang.String" + writeable="false"/> @@ -71,7 +72,8 @@ + type="java.lang.String" + writeable="false"/> + type="java.lang.String" + writeable="false"/> + type="java.lang.String" + writeable="false"/> @@ -152,7 +156,8 @@ + type="java.lang.String" + writeable="false"/> @@ -181,7 +186,8 @@ + type="java.lang.String" + writeable="false"/> Modified: tomcat/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml?rev=1038810&r1=1038809&r2=1038810&view=diff == --- tomcat/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml (original) +++ tomcat/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml Wed Nov 24 20:54:21 2010 @@ -44,10 +44,6 @@ description="Allow disabling TRACE method" type="boolean"/> - - + + @@ -152,7 +152,8 @@ + type="java.lang.String" + writeable="false"/> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml?rev=1038810&r1=1038809&r2=1038810&view=diff == --- tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml (original) +++ tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml Wed Nov 24 20:54:21 2010 @@ -172,7 +172,7 @@ + type="boolean"/> + type="java.lang.String" + writeable="false"/> + type="java.lang.String" + writeable="false"/> + type="java.lang.String" + writeable="false"/> + type="java.lang.String" + writeable="false"/> + type="java.lang.String" + writeable="false"/> + type="java.lang.String" + writeable="false"/> + type="java.lang.String" + writeable="false"/> + type="java.lang.String" + writeable="false"/> + type="java.lang.String" + writeable="false"/> + type="int" /> + type="java.lang.String" + writeable="false"/> + type="java.lang.String" + writeable="false"/> Modified: tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml?rev=1038810&r1=1038809&r2=1038810&view=diff == --- tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml (original) +++ tomcat/trunk/java/org/apache/catalina/ha/ses
svn commit: r1038811 - /tomcat/trunk/webapps/docs/changelog.xml
Author: markt Date: Wed Nov 24 20:55:02 2010 New Revision: 1038811 URL: http://svn.apache.org/viewvc?rev=1038811&view=rev Log: Move to Catalina section Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1038811&r1=1038810&r2=1038811&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Wed Nov 24 20:55:02 2010 @@ -44,6 +44,10 @@ 49650: Remove unnecessary entries package.access property defined in catalina.properties. Patch provided by Owen Farrell. (markt) + +50106: Correct several MBean descriptors. Patch provided by +Eiji Takahashi. (markt) + @@ -54,14 +58,6 @@ - - - -50106: Correct several MBean descriptors. Patch provided by -Eiji Takahashi. (markt) - - - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1038831 - in /tomcat/trunk: java/org/apache/catalina/loader/WebappClassLoader.java webapps/docs/changelog.xml
Author: markt
Date: Wed Nov 24 21:28:33 2010
New Revision: 1038831
URL: http://svn.apache.org/viewvc?rev=1038831&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48837
Extend thread local memory leak detection to include classes loaded by
subordinate class loaders to the web application's class loader such as the
Jasper class loader.
Based on a patch by Sylvain Laurent.
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=1038831&r1=1038830&r2=1038831&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Wed Nov
24 21:28:33 2010
@@ -2183,7 +2183,7 @@ public class WebappClassLoader
for (Thread thread : threads) {
if (thread != null) {
ClassLoader ccl = thread.getContextClassLoader();
-if (ccl != null && ccl == this) {
+if (ccl == this) {
// Don't warn about this thread
if (thread == Thread.currentThread()) {
continue;
@@ -2424,8 +2424,8 @@ public class WebappClassLoader
boolean remove = false;
// Check the key
Object key = ((Reference) table[j]).get();
-if (this.equals(key) || (key != null &&
-this == key.getClass().getClassLoader())) {
+if (this.equals(key) ||
+isLoadedByThisWebAppClassLoader(key)) {
remove = true;
}
// Check the value
@@ -2433,15 +2433,15 @@ public class WebappClassLoader
table[j].getClass().getDeclaredField("value");
valueField.setAccessible(true);
Object value = valueField.get(table[j]);
-if (this.equals(value) || (value != null &&
-this == value.getClass().getClassLoader())) {
+if (this.equals(value) ||
+isLoadedByThisWebAppClassLoader(value)) {
remove = true;
}
if (remove) {
Object[] args = new Object[5];
args[0] = contextName;
if (key != null) {
-args[1] = key.getClass().getCanonicalName();
+args[1] = getPrettyClassName(key.getClass());
try {
args[2] = key.toString();
} catch (Exception e) {
@@ -2453,7 +2453,7 @@ public class WebappClassLoader
}
}
if (value != null) {
-args[3] = value.getClass().getCanonicalName();
+args[3] = getPrettyClassName(value.getClass());
try {
args[4] = value.toString();
} catch (Exception e) {
@@ -2503,6 +2503,33 @@ public class WebappClassLoader
}
}
+private String getPrettyClassName(Class clazz) {
+String name = clazz.getCanonicalName();
+if (name==null){
+name = clazz.getName();
+}
+return name;
+}
+
+/**
+ * @param o object to test
+ * @return true if o has been loaded by the current
classloader
+ * or one of its descendants.
+ */
+private boolean isLoadedByThisWebAppClassLoader(Object o) {
+if (o == null) {
+return false;
+}
+ClassLoader cl = o.getClass().getClassLoader();
+while (cl != null) {
+if(cl == this) {
+return true;
+}
+cl = cl.getParent();
+}
+return false;
+}
+
/*
* Get the set of current threads as an array.
*/
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1038831&r1=1038830&r2=1038831&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Nov 24 21:28:33 2010
@@ -40,6 +40,12 @@
+
+48837: Extend thread local memory leak detection to in
svn commit: r1038834 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Wed Nov 24 21:30:48 2010 New Revision: 1038834 URL: http://svn.apache.org/viewvc?rev=1038834&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=1038834&r1=1038833&r2=1038834&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Nov 24 21:30:48 2010 @@ -106,7 +106,7 @@ PATCHES PROPOSED TO BACKPORT: kkolinko: Patch to impose limit on the trailers length: http://svn.apache.org/viewvc?rev=1037924&view=rev - +1: kkolinko + +1: kkolinko, markt -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50026 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1038835 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Wed Nov 24 21:32:52 2010 New Revision: 1038835 URL: http://svn.apache.org/viewvc?rev=1038835&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=1038835&r1=1038834&r2=1038835&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Nov 24 21:32:52 2010 @@ -274,3 +274,10 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?rev=1038041&view=rev +1: markt, kkolinko -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48837 + Extend threads local memory leak detection / fixing to classes loaded by the + JSP class loaders + Patch by Sylvain Laurent + +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 48837] Memory leaks protection does not cure leaks triggered by JSP pages code
https://issues.apache.org/bugzilla/show_bug.cgi?id=48837 Mark Thomas changed: What|Removed |Added Component|Catalina|Catalina Version|trunk |unspecified Product|Tomcat 7|Tomcat 6 Target Milestone|--- |default --- Comment #2 from Mark Thomas 2010-11-24 16:34:32 EST --- Fixed in 7.0.x and will be included in 7.0.6 onwards. I also proposed your patch for 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
Re: svn commit: r1038835 - /tomcat/tc6.0.x/trunk/STATUS.txt
2010/11/25 : > Author: markt > Date: Wed Nov 24 21:32:52 2010 > New Revision: 1038835 > > URL: http://svn.apache.org/viewvc?rev=1038835&view=rev > Log: > Proposal > > Modified: > tomcat/tc6.0.x/trunk/STATUS.txt > > + > +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48837 > + Extend threads local memory leak detection / fixing to classes loaded by > the > + JSP class loaders > + Patch by Sylvain Laurent > + +1: markt > + -1: Patch URL where? This one: ? http://svn.apache.org/viewvc?view=revision&revision=1038831 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [Tomcat Wiki] Update of "TomcatVersions" by TimFunk
2010/11/24 Apache Wiki : > > The "TomcatVersions" page has been changed by TimFunk. > The comment on this change is: CTR / RTC clarification. > http://wiki.apache.org/tomcat/TomcatVersions?action=diff&rev1=14&rev2=15 > > -- > > + > + = RTC Exceptions = > + Via http://markmail.org/thread/2fgydrrhn4qjye3r > + > + * Allow C-T-R for trivial fixes to English messages that are in resource > files and those that are inline in the code. This includes typos and > rephrasing, but does not include adding/removing message parameters. > + * Allow C-T-R for any fixes for non-English resource files. The files must > use 7-bit characters only. Other symbols must be escaped with \u, as does > native2ascii. > + * Require some indication in the commit message for code that usually is > covered by RTC, that this commit was done using C-T-R rule. > + > Thank you, Tim! Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1038841 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Wed Nov 24 21:50:44 2010 New Revision: 1038841 URL: http://svn.apache.org/viewvc?rev=1038841&view=rev Log: Add the patch 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=1038841&r1=1038840&r2=1038841&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Nov 24 21:50:44 2010 @@ -279,5 +279,6 @@ PATCHES PROPOSED TO BACKPORT: Extend threads local memory leak detection / fixing to classes loaded by the JSP class loaders Patch by Sylvain Laurent + https://issues.apache.org/bugzilla/attachment.cgi?id=25116 +1: markt -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1038835 - /tomcat/tc6.0.x/trunk/STATUS.txt
On 24/11/2010 21:43, Konstantin Kolinko wrote: > 2010/11/25 : >> Author: markt >> Date: Wed Nov 24 21:32:52 2010 >> New Revision: 1038835 >> >> URL: http://svn.apache.org/viewvc?rev=1038835&view=rev >> Log: >> Proposal >> >> Modified: >>tomcat/tc6.0.x/trunk/STATUS.txt >> >> + >> +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48837 >> + Extend threads local memory leak detection / fixing to classes loaded by >> the >> + JSP class loaders >> + Patch by Sylvain Laurent >> + +1: markt >> + -1: > > Patch URL where? This one: ? > http://svn.apache.org/viewvc?view=revision&revision=1038831 Not that one. I've added the tc6 specific one from the bug report. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49142] Missing serialVersionUIDs
https://issues.apache.org/bugzilla/show_bug.cgi?id=49142 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #4 from Mark Thomas 2010-11-24 17:05:26 EST --- Fixed in 7.0.x and will be included in 7.0.6 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: r1038846 - in /tomcat/trunk: java/javax/servlet/ java/javax/servlet/http/ java/javax/servlet/jsp/ java/javax/servlet/jsp/el/ java/javax/servlet/jsp/tagext/ java/org/apache/catalina/ha/depl
Author: markt
Date: Wed Nov 24 22:08:38 2010
New Revision: 1038846
URL: http://svn.apache.org/viewvc?rev=1038846&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49142
Add missing serialVersionUIDs using Eclipse's auto correct and a little manual
formatting
Modified:
tomcat/trunk/java/javax/servlet/GenericServlet.java
tomcat/trunk/java/javax/servlet/ServletContextAttributeEvent.java
tomcat/trunk/java/javax/servlet/ServletContextEvent.java
tomcat/trunk/java/javax/servlet/ServletException.java
tomcat/trunk/java/javax/servlet/ServletRequestAttributeEvent.java
tomcat/trunk/java/javax/servlet/ServletRequestEvent.java
tomcat/trunk/java/javax/servlet/UnavailableException.java
tomcat/trunk/java/javax/servlet/http/HttpServlet.java
tomcat/trunk/java/javax/servlet/http/HttpSessionBindingEvent.java
tomcat/trunk/java/javax/servlet/http/HttpSessionEvent.java
tomcat/trunk/java/javax/servlet/jsp/JspException.java
tomcat/trunk/java/javax/servlet/jsp/JspTagException.java
tomcat/trunk/java/javax/servlet/jsp/SkipPageException.java
tomcat/trunk/java/javax/servlet/jsp/el/ELException.java
tomcat/trunk/java/javax/servlet/jsp/el/ELParseException.java
tomcat/trunk/java/javax/servlet/jsp/tagext/TagSupport.java
tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessage.java
tomcat/trunk/java/org/apache/catalina/ha/deploy/UndeployMessage.java
tomcat/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java
tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIServlet.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIStopProcessingException.java
tomcat/trunk/java/org/apache/catalina/tribes/ChannelException.java
tomcat/trunk/java/org/apache/catalina/tribes/RemoteProcessException.java
tomcat/trunk/java/org/apache/catalina/tribes/UniqueId.java
tomcat/trunk/java/org/apache/catalina/tribes/io/ChannelData.java
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
tomcat/trunk/java/org/apache/catalina/tribes/util/ExecutorFactory.java
tomcat/trunk/java/org/apache/catalina/util/ParameterMap.java
tomcat/trunk/java/org/apache/catalina/util/ResourceSet.java
tomcat/trunk/java/org/apache/jasper/JasperException.java
tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
tomcat/trunk/java/org/apache/jasper/runtime/HttpJspBase.java
tomcat/trunk/java/org/apache/juli/logging/LogConfigurationException.java
tomcat/trunk/java/org/apache/naming/EjbRef.java
tomcat/trunk/java/org/apache/naming/HandlerRef.java
tomcat/trunk/java/org/apache/naming/JndiPermission.java
tomcat/trunk/java/org/apache/naming/ResourceEnvRef.java
tomcat/trunk/java/org/apache/naming/ResourceLinkRef.java
tomcat/trunk/java/org/apache/naming/ServiceRef.java
tomcat/trunk/java/org/apache/naming/TransactionRef.java
tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/FixedNotificationFilter.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java
tomcat/trunk/java/org/apache/tomcat/util/net/URL.java
tomcat/trunk/test/org/apache/catalina/tribes/demos/MapDemo.java
tomcat/trunk/webapps/examples/WEB-INF/jsp/applet/Clock2.java
Modified: tomcat/trunk/java/javax/servlet/GenericServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/GenericServlet.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==
--- tomcat/trunk/java/javax/servlet/GenericServlet.java (original)
+++ tomcat/trunk/java/javax/servlet/GenericServlet.java Wed Nov 24 22:08:38 2010
@@ -42,6 +42,8 @@ import java.util.Enumeration;
public abstract class GenericServlet implements Servlet, ServletConfig,
java.io.Serializable {
+private static final long serialVersionUID = 1L;
+
private transient ServletConfig config;
/**
Modified: tomcat/trunk/java/javax/servlet/ServletContextAttributeEvent.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletContextAttributeEvent.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==
--- tomcat/trunk/java/javax/servlet/ServletContextAttributeEvent.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletContextAttributeEvent.java Wed Nov
24 22:08:38 2010
@@ -24,6 +24,8 @@ package javax.servlet;
* @since v 2.3
*/
public class ServletContextAttributeEvent extends ServletContextEvent {
+private static final
Re: svn commit: r1038717 - in /tomcat/tc7.0.x/tags/TOMCAT_7_0_5: ./ java/org/apache/catalina/core/ java/org/apache/catalina/startup/
2010/11/24 : > Author: markt > Date: Wed Nov 24 17:41:29 2010 > New Revision: 1038717 > > URL: http://svn.apache.org/viewvc?rev=1038717&view=rev > Log: > Tag Tomcat 7.0.5 > > Added: > tomcat/tc7.0.x/tags/TOMCAT_7_0_5/ (props changed) > - copied from r1038654, tomcat/trunk/ > > tomcat/tc7.0.x/tags/TOMCAT_7_0_5/java/org/apache/catalina/core/LocalStrings.properties > - copied unchanged from r1038656, > tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties > > tomcat/tc7.0.x/tags/TOMCAT_7_0_5/java/org/apache/catalina/core/StandardEngine.java > - copied unchanged from r1038711, > tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java > > tomcat/tc7.0.x/tags/TOMCAT_7_0_5/java/org/apache/catalina/startup/HostConfig.java > - copied unchanged from r1038713, > tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java > > tomcat/tc7.0.x/tags/TOMCAT_7_0_5/java/org/apache/catalina/startup/LocalStrings.properties > - copied unchanged from r1038713, > tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties > > tomcat/tc7.0.x/tags/TOMCAT_7_0_5/java/org/apache/catalina/startup/LocalStrings_es.properties > - copied unchanged from r1038713, > tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties FYI: It is recommended to perform "svn up" before making a WC->URL copy. The above mentioned files have rev. later than their parent. I do not say that anything is broken. It just might be an inconvenience. This tag actually matches r1038713, not r1038654. > Modified: > tomcat/tc7.0.x/tags/TOMCAT_7_0_5/build.properties.default > > Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_5/ > Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_5/ > Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [ANN] New Tomcat committer: Christopher Schultz (schultz)
Congratulations! On Wed, Nov 24, 2010 at 6:53 AM, Brooke Hedrick wrote: > Congrats Chris. > On Nov 23, 2010 7:01 PM, "Keiichi Fujino" wrote: > > 2010/11/23 Mark Thomas : > >> On behalf of the Tomcat committers I am pleased to announce that > >> Christopher Schultz (schultz) has been voted in as a new Tomcat > committer. > >> > >> Please join me in welcoming him. > >> > > > > Congratulations! > > > > -- > > Keiichi.Fujino > > > > - > > To unsubscribe, e-mail: users-unsubscr...@tomcat.apache.org > > For additional commands, e-mail: users-h...@tomcat.apache.org > > > -- Sadeep
DO NOT REPLY [Bug 50333] New: IllegalArgumentException occurs when setting maxActive to smaller than 1.
https://issues.apache.org/bugzilla/show_bug.cgi?id=50333 Summary: IllegalArgumentException occurs when setting maxActive to smaller than 1. Product: Tomcat Modules Version: unspecified Platform: All OS/Version: All Status: NEW Severity: normal Priority: P2 Component: jdbc-pool AssignedTo: dev@tomcat.apache.org ReportedBy: mashm...@gmail.com Created an attachment (id=26340) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=26340) patch IllegalArgumentException occurs when setting maxActive to smaller than 1. - java.lang.IllegalArgumentException at java.util.concurrent.ArrayBlockingQueue.(ArrayBlockingQueue.java:164) at org.apache.tomcat.jdbc.pool.ConnectionPool.init(ConnectionPool.java:365) at org.apache.tomcat.jdbc.pool.ConnectionPool.(ConnectionPool.java:130) at org.apache.tomcat.jdbc.pool.DataSourceProxy.createPool(DataSourceProxy.java:93) at org.apache.tomcat.jdbc.pool.DataSourceFactory.createDataSource(DataSourceFactory.java:490) at org.apache.tomcat.jdbc.pool.DataSourceFactory.getObjectInstance(DataSourceFactory.java:219) at org.apache.naming.factory.ResourceFactory.getObjectInstance(ResourceFactory.java:142) at javax.naming.spi.NamingManager.getObjectInstance(NamingManager.java:304) at org.apache.naming.NamingContext.lookup(NamingContext.java:826) at org.apache.naming.NamingContext.lookup(NamingContext.java:145) at org.apache.naming.NamingContext.lookup(NamingContext.java:814) at org.apache.naming.NamingContext.lookup(NamingContext.java:159) at org.apache.catalina.core.NamingContextListener.addResource(NamingContextListener.java:1020) at org.apache.catalina.core.NamingContextListener.createNamingContext(NamingContextListener.java:631) at org.apache.catalina.core.NamingContextListener.lifecycleEvent(NamingContextListener.java:237) at org.apache.catalina.util.LifecycleSupport.fireLifecycleEvent(LifecycleSupport.java:119) at org.apache.catalina.util.LifecycleBase.fireLifecycleEvent(LifecycleBase.java:89) at org.apache.catalina.core.StandardServer.startInternal(StandardServer.java:668) at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:140) at org.apache.catalina.startup.Catalina.start(Catalina.java:596) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) at java.lang.reflect.Method.invoke(Method.java:597) at org.apache.catalina.startup.Bootstrap.start(Bootstrap.java:303) at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:431) --- In DBCP, if the negative value is set to maxActive, the pool size is unlimited. However, because ArrayBlockingQueue is used in JDBC-Pool, values that are smaller than 1 cannot be set to maxActive. In my patch, if maxActive is smaller than 1, default value (100) is set to maxActive. Regards. -- 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
