svn commit: r995071 - /tomcat/tags/JDBC_POOL_1_0_8_5/
Author: markt Date: Wed Sep 8 14:43:39 2010 New Revision: 995071 URL: http://svn.apache.org/viewvc?rev=995071&view=rev Log: Create missing tag for jdbc-pool 1.0.8.5 Added: tomcat/tags/JDBC_POOL_1_0_8_5/ (props changed) - copied from r899796, tomcat/trunk/modules/jdbc-pool/ Propchange: tomcat/tags/JDBC_POOL_1_0_8_5/ -- --- svn:ignore (added) +++ svn:ignore Wed Sep 8 14:43:39 2010 @@ -0,0 +1,3 @@ +build.properties +includes +output Propchange: tomcat/tags/JDBC_POOL_1_0_8_5/ -- 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
[VOTE] Release Tomcat 5.5.31 Build
The builds for Tomcat 5.5.31 are ready for testing and approval. The candidates binaries are available here: http://people.apache.org/~jim/tomcat-5.5/ According to the release process, the 5.5.31 build corresponding to the tag TOMCAT_5_5_31 [1] is: [ ] Broken [ ] Alpha [ ] Beta [ ] Stable +++ 1. http://svn.apache.org/viewvc/tomcat/tc5.5.x/tags/TOMCAT_5_5_31/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r995082 - /tomcat/trunk/modules/jdbc-pool/doc/changelog.xml
Author: markt Date: Wed Sep 8 15:09:16 2010 New Revision: 995082 URL: http://svn.apache.org/viewvc?rev=995082&view=rev Log: Bring changelog up to date 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=995082&r1=995081&r2=995082&view=diff == --- tomcat/trunk/modules/jdbc-pool/doc/changelog.xml (original) +++ tomcat/trunk/modules/jdbc-pool/doc/changelog.xml Wed Sep 8 15:09:16 2010 @@ -28,13 +28,47 @@ - + - 720253Document how to use interceptors - 717972Added an interceptor that will clean up non closed statements when a connection is returned to the pool. (org.apache.tomcat.jdbc.pool.interceptor.StatementFinalizer) - 713763Improve connection state handling - 713763Improve connection state handling + 992409 Code clean-up. Reduce sequences of three or more + blank lines to two blank lines. (markt) + 952811 48814 Add Validator interface and allow + users to configure a Validator class name. Patch provided by Matt Passell. + (markt) + 948073 Code clean-up. Remove unused imports. (markt) + + 943434 49224 Only try setting the username and + password if they are non-null. Patch provided by Matt Passell. (markt) + + 943032 49269 Set maxIdle to maxActive by + default to prevent warning on start when maxIdle > maxActive. Patch + provided by Matt Passell. (markt) + 940574 49241 Don't ignore the + suspectTimeout property. (fhanik) + 939320 Fix svn:keywords for property replacement. + (kkolinko) + 931550, 934651, 934677 Add a + statement cache. (fhanik) + 919076 Improve XA support. (fhanik) + 915940 48392 Add an interceptor to wrap + Statements and ResultSets to prevent access to the physical connection. + (fhanik) + 912026 Call setTransactionIsolation() before + anything else as some drivers require this to be the first call. (fhanik) + + 900017 Update Javadoc for XADataSource. (kkolinko) + + + + + + + + 720253 Document how to use interceptors + 717972 Added an interceptor that will clean up non closed statements when a connection is returned to the pool. (org.apache.tomcat.jdbc.pool.interceptor.StatementFinalizer) + 713763 Improve connection state handling + 713763 Improve connection state handling - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r995083 - /tomcat/trunk/modules/jdbc-pool/build.properties.default
Author: markt
Date: Wed Sep 8 15:09:49 2010
New Revision: 995083
URL: http://svn.apache.org/viewvc?rev=995083&view=rev
Log:
Update to latest Tomact 6.0.x and DBCP 1.3.x release
Modified:
tomcat/trunk/modules/jdbc-pool/build.properties.default
Modified: tomcat/trunk/modules/jdbc-pool/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.properties.default?rev=995083&r1=995082&r2=995083&view=diff
==
--- tomcat/trunk/modules/jdbc-pool/build.properties.default (original)
+++ tomcat/trunk/modules/jdbc-pool/build.properties.default Wed Sep 8 15:09:49
2010
@@ -76,11 +76,11 @@ mysql.home=${base.path}/mysql-connector-
mysql.jar=${mysql.home}/mysql-connector-java-5.1.12-bin.jar
mysql.loc=http://mysql.he.net/Downloads/Connector-J/mysql-connector-java-5.1.12.zip
-dbcp.home=${base.path}/commons-dbcp-1.2
-dbcp.jar=${dbcp.home}/commons-dbcp-1.2.jar
-dbcp.loc=http://archive.apache.org/dist/commons/dbcp/binaries/commons-dbcp-1.2.zip
+dbcp.home=${base.path}/commons-dbcp-1.3
+dbcp.jar=${dbcp.home}/commons-dbcp-1.3.jar
+dbcp.loc=http://archive.apache.org/dist/commons/dbcp/binaries/commons-dbcp-1.3.zip
-tomcat.version=6.0.20
+tomcat.version=6.0.29
tomcat.home=${base.path}/apache-tomcat-${tomcat.version}
tomcat.dbcp.jar=${tomcat.home}/lib/tomcat-dbcp.jar
tomcat.juli.jar=${tomcat.home}/bin/tomcat-juli.jar
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r995084 - /tomcat/trunk/modules/jdbc-pool/doc/changelog.xml
Author: markt Date: Wed Sep 8 15:11:49 2010 New Revision: 995084 URL: http://svn.apache.org/viewvc?rev=995084&view=rev Log: Update changelog 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=995084&r1=995083&r2=995084&view=diff == --- tomcat/trunk/modules/jdbc-pool/doc/changelog.xml (original) +++ tomcat/trunk/modules/jdbc-pool/doc/changelog.xml Wed Sep 8 15:11:49 2010 @@ -31,6 +31,8 @@ + 995083 Update to Tomcat 6.0.29 (for JULI). (markt) + 992409 Code clean-up. Reduce sequences of three or more blank lines to two blank lines. (markt) 952811 48814 Add Validator interface and allow - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r995087 - /tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
Author: markt
Date: Wed Sep 8 15:19:00 2010
New Revision: 995087
URL: http://svn.apache.org/viewvc?rev=995087&view=rev
Log:
Remove some unused code
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java?rev=995087&r1=995086&r2=995087&view=diff
==
---
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
Wed Sep 8 15:19:00 2010
@@ -27,7 +27,6 @@ import org.apache.juli.logging.LogFactor
import org.apache.tomcat.jdbc.pool.interceptor.ConnectionState;
import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
/**
* Represents a pooled connection
@@ -40,10 +39,6 @@ public class PooledConnection {
* Logger
*/
private static final Log log = LogFactory.getLog(PooledConnection.class);
-/**
- * Instance counter
- */
-protected static AtomicInteger counter = new AtomicInteger(01);
/**
* Validate when connection is borrowed flag
@@ -100,10 +95,6 @@ public class PooledConnection {
*/
private volatile long lastValidated = System.currentTimeMillis();
/**
- * The instance number for this connection
- */
-private int instanceCount = 0;
-/**
* The parent
*/
protected ConnectionPool parent;
@@ -127,7 +118,6 @@ public class PooledConnection {
* @param parent - the parent connection pool
*/
public PooledConnection(PoolConfiguration prop, ConnectionPool parent) {
-instanceCount = counter.addAndGet(1);
poolProperties = prop;
this.parent = parent;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r995091 - /tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
Author: markt
Date: Wed Sep 8 15:27:00 2010
New Revision: 995091
URL: http://svn.apache.org/viewvc?rev=995091&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49831
Make sure pooled XA connections are properly closed when the pool shuts down.
Based on a patch by Daniel Mikusa.
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java?rev=995091&r1=995090&r2=995091&view=diff
==
---
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
Wed Sep 8 15:27:00 2010
@@ -265,7 +265,11 @@ public class PooledConnection {
if (connection != null) {
try {
parent.disconnectEvent(this, finalize);
-connection.close();
+if (xaConnection == null) {
+connection.close();
+} else {
+xaConnection.close();
+}
}catch (Exception ignore) {
if (log.isDebugEnabled()) {
log.debug("Unable to close underlying SQL
connection",ignore);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49831] Issue with closing XAConnections on MSSQL
https://issues.apache.org/bugzilla/show_bug.cgi?id=49831 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #3 from Mark Thomas 2010-09-08 11:27:53 EDT --- I applied your original patch. The relationship between connection and xaConnection is such that it was sufficient. The fix will be included in jdbc-pool 1.0.9.0 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: r995095 - /tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml
Author: markt Date: Wed Sep 8 15:31:27 2010 New Revision: 995095 URL: http://svn.apache.org/viewvc?rev=995095&view=rev Log: Document new validation class (https://issues.apache.org/bugzilla/show_bug.cgi?id=48817) Patch provided by Matt Passell. Modified: tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml Modified: tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml?rev=995095&r1=995094&r2=995095&view=diff == --- tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml (original) +++ tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml Wed Sep 8 15:31:27 2010 @@ -266,6 +266,17 @@ + + (String) The name of a class which implements the + org.apache.tomcat.jdbc.pool.Validator interface and + provides a no-arg constructor (may be implicit). If specified, the + class will be used to create a Validator instance which is then used + instead of any validation query to validate connections. The default + value is null. An example value is + com.mycompany.project.SimpleValidator. + + + (int) The number of milliseconds to sleep between runs of the idle connection validation/cleaner thread. This value should not be set under 1 second. It dictates how often we check for idle, abandoned connections, and how often - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48817] Skip validation query and use JDBC API for validation
https://issues.apache.org/bugzilla/show_bug.cgi?id=48817 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #14 from Mark Thomas 2010-09-08 11:31:42 EDT --- Cheers. Patch applied. It will be in 1.0.9.0 onwards. Thanks again. -- 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: r995099 - /tomcat/trunk/modules/jdbc-pool/doc/changelog.xml
Author: markt Date: Wed Sep 8 15:35:48 2010 New Revision: 995099 URL: http://svn.apache.org/viewvc?rev=995099&view=rev Log: Update changelog 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=995099&r1=995098&r2=995099&view=diff == --- tomcat/trunk/modules/jdbc-pool/doc/changelog.xml (original) +++ tomcat/trunk/modules/jdbc-pool/doc/changelog.xml Wed Sep 8 15:35:48 2010 @@ -31,13 +31,18 @@ + 995091 49831 Make sure pooled XAConnections are + closed when the connection pool shuts down. Patch provided by Daniel + Mikusa. (markt) + 995087 Code clean-up. Remove some unused code. (markt) + 995083 Update to Tomcat 6.0.29 (for JULI). (markt) 992409 Code clean-up. Reduce sequences of three or more blank lines to two blank lines. (markt) - 952811 48814 Add Validator interface and allow - users to configure a Validator class name. Patch provided by Matt Passell. - (markt) + 952811, 995095 48814 Add Validator + interface and allow users to configure a Validator class name. Patch + provided by Matt Passell. (markt) 948073 Code clean-up. Remove unused imports. (markt) 943434 49224 Only try setting the username and - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Tomcat 5.5.31 Build
On 8 September 2010 15:50, Jim Jagielski wrote: > The builds for Tomcat 5.5.31 are ready for testing and approval. > The candidates binaries are available here: > > http://people.apache.org/~jim/tomcat-5.5/ > > According to the release process, the 5.5.31 build corresponding to the > tag TOMCAT_5_5_31 [1] is: > > [ ] Broken > [ ] Alpha > [ ] Beta > [ ] Stable > +++ > > 1. http://svn.apache.org/viewvc/tomcat/tc5.5.x/tags/TOMCAT_5_5_31/ There are some non-trivial souce files without AL headers: build/build.properties.default build/resources/welcome.bin.html These ones also don't have AL headers, but perhaps comments are not allowed: build/resources/config.ini build/resources/jvm.ini Some of the files in the SVN tag disagree with the source archive: build/build.properties.default build/build.xml Files in source archive but not found in SVN: build.xml build/tomcat-5.5.31-build.txt > > > > - > 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
DO NOT REPLY [Bug 49900] New: BundleSupport.release() does not call super.release() to clear bodyContent
https://issues.apache.org/bugzilla/show_bug.cgi?id=49900 Summary: BundleSupport.release() does not call super.release() to clear bodyContent Product: Taglibs Version: 1.1 Platform: PC OS/Version: Windows XP Status: NEW Severity: normal Priority: P2 Component: Standard Taglib AssignedTo: dev@tomcat.apache.org ReportedBy: jfrede...@dmotorworks.com I'm running standard-1.1.2.jar in Tomcat 5.5. Profiling reveals large memory usage in org.apache.jasper.runtime.BodyContentImpl objects. I believe this is because org.apache.taglibs.standard.tag.common.fmt.BundleTagSupport does not call super.release() from it's release() method. The superclass, BodyTagSupport, nulls the reference to bodyContent in it's release() method. The BundleTag instances are pooled by the container, so in between requests the most recent bodyContent cannot be garbage collected. It will be reset on the next startTag() invocation, so the tag behavior is correct, but the memory usage is much higher than it should be. -- 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
Proposed .dsp and source change to jk for apache 2.0
It seems I've been lax in committing anything in recent memory, and had my
commit privileges for the jk module suspended :) But wanted to pass on these
very small proposals;
* mod_jk.dsp should have referred to a project 'named' mod_jk, the 'project
name' should generally match the name of the .dsp file itself.
* mod_jk.dsp would benefit from having 'mod_jk - Win32 Release httpd 2.2'
targets, so that we can build either for httpd 2.0 or 2.2 without making
any changes to the library references (libapr.lib vs libapr-1.lib).
In any case, having a default to 2.0 seems awfully archaic now :)
* mod_jk.c conditionally compiled for map_to_storage. That hook predated
the beta and GA of httpd 2.0, so leaving such a test in place is likely
confusing to the more casual reviewer.
I'm happy to commit this myself, if the team will entertain restoring my
commit bit to the connectors tree and folks are happy with the suggestions.
#
# 20010808 predates the 2.0.23 tag, the 2.0.28 first beta and 2.0.35 GA
#
# It's sufficiently obscure to cause confusion for the module code reviewer,
# so drop the test for the presence of the map_to_storage hook.
#
Index: mod_jk.c
===
--- mod_jk.c(revision 995054)
+++ mod_jk.c(working copy)
@@ -3549,7 +3549,6 @@
return DECLINED;
}
-#if (MODULE_MAGIC_NUMBER_MAJOR > 20010808)
/* bypass the directory_walk and file_walk for non-file requests */
static int jk_map_to_storage(request_rec * r)
{
@@ -3665,7 +3664,6 @@
}
return DECLINED;
}
-#endif
static void jk_register_hooks(apr_pool_t * p)
{
@@ -3673,9 +3671,7 @@
ap_hook_post_config(jk_post_config, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_child_init(jk_child_init, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_translate_name(jk_translate, NULL, NULL, APR_HOOK_MIDDLE);
-#if (MODULE_MAGIC_NUMBER_MAJOR > 20010808)
ap_hook_map_to_storage(jk_map_to_storage, NULL, NULL, APR_HOOK_MIDDLE);
-#endif
}
module AP_MODULE_DECLARE_DATA jk_module = {
#
# Project 'names' should ideally match the name of the .dsp file itself.
# Since there are library changes between 2.0 and 2.2 that can't be easily
# and programatically controlled, use different targets (httpd 2.0, or 2.2)
# to differentiate these flavors (although this isn't really true, the
# real distinction is between apr 0.9 and 1.x).
#
Index: mod_jk.dsp
===
--- mod_jk.dsp (revision 995054)
+++ mod_jk.dsp (working copy)
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="apache" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="mod_jk" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-CFG=apache - Win32 Debug
+CFG=mod_jk - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,12 +13,14 @@
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "mod_jk.mak" CFG="apache - Win32 Debug"
+!MESSAGE NMAKE /f "mod_jk.mak" CFG="mod_jk - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "apache - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "apache - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "mod_jk - Win32 Release httpd 2.0" (based on "Win32 (x86)
Dynamic-Link Library")
+!MESSAGE "mod_jk - Win32 Debug httpd 2.0" (based on "Win32 (x86) Dynamic-Link
Library")
+!MESSAGE "mod_jk - Win32 Release httpd 2.2" (based on "Win32 (x86)
Dynamic-Link Library")
+!MESSAGE "mod_jk - Win32 Debug httpd 2.2" (based on "Win32 (x86) Dynamic-Link
Library")
!MESSAGE
# Begin Project
@@ -29,7 +31,7 @@
MTL=midl.exe
RSC=rc.exe
-!IF "$(CFG)" == "apache - Win32 Release"
+!IF "$(CFG)" == "mod_jk - Win32 Release httpd 2.0"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -55,7 +57,7 @@
# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib /nologo /dll
/machine:I386
# ADD LINK32 libhttpd.lib libapr.lib libaprutil.lib kernel32.lib user32.lib
advapi32.lib ws2_32.lib mswsock.lib /nologo /base:"0x6A6B"
/subsystem:windows /dll /debug /machine:I386 /out:"Release/mod_jk.so"
/libpath:"$(APACHE2_HOME)\Release"
/libpath:"$(APACHE2_HOME)\srclib\apr\Release"
/libpath:"$(APACHE2_HOME)\srclib\apr-util\Release"
/libpath:"$(APACHE2_HOME)\lib" /opt:ref
-!ELSEIF "$(CFG)" == "apache - Win32 Debug"
+!ELSEIF "$(CFG)" == "mod_jk - Win32 Debug httpd 2.0"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -81,12 +83,66 @@
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.
Re: Proposed .dsp and source change to jk for apache 2.0
On 09/08/2010 06:51 PM, William A. Rowe Jr. wrote: It seems I've been lax in committing anything in recent memory, and had my commit privileges for the jk module suspended :) But wanted to pass on these very small proposals; Sure. Note that I'm using Makefile.vc for building the binaries, so didn't look at .dsp files for quite some time. Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Proposed .dsp and source change to jk for apache 2.0
On 9/8/2010 12:04 PM, Mladen Turk wrote: > On 09/08/2010 06:51 PM, William A. Rowe Jr. wrote: >> It seems I've been lax in committing anything in recent memory, and had my >> commit privileges for the jk module suspended :) But wanted to pass on these >> very small proposals; >> > > Sure. Note that I'm using Makefile.vc for building the > binaries, so didn't look at .dsp files for quite some time. Understandable, it makes much more sense for a typical build/package. I like the .dsp (or converted .vcproj equivalent) for doing development work, and these happen to have sat in my tree for a couple months due to some more interesting work on exporting and evaluating server busyness following the map_to_storage phase. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Proposed .dsp and source change to jk for apache 2.0
On 08.09.2010 19:27, William A. Rowe Jr. wrote: On 9/8/2010 12:04 PM, Mladen Turk wrote: On 09/08/2010 06:51 PM, William A. Rowe Jr. wrote: It seems I've been lax in committing anything in recent memory, and had my commit privileges for the jk module suspended :) But wanted to pass on these very small proposals; Sure. Note that I'm using Makefile.vc for building the binaries, so didn't look at .dsp files for quite some time. Understandable, it makes much more sense for a typical build/package. I like the .dsp (or converted .vcproj equivalent) for doing development work, and these happen to have sat in my tree for a couple months due to some more interesting work on exporting and evaluating server busyness following the map_to_storage phase. +1 to everything you suggested to change. If you improve the dsps, you might want to take a look at https://issues.apache.org/bugzilla/show_bug.cgi?id=43303 Thanks! Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47678] Unable to allocate shared memory when using isapi_redirect.dll as an extension and filter
https://issues.apache.org/bugzilla/show_bug.cgi?id=47678 --- Comment #2 from Eric Smith 2010-09-08 14:49:30 EDT --- I've just pulled down v1.2.30 32-bit and I'm seeing the same problem I reported last year under Windows 2008 Server 64bit, IIS 7.0. I have just observed that upon starting IIS, for a default web site having this ISAPI filter on it, that 2 threads are being started and that appears to be the reason the second shm init is failing. In this INFO level logging there is process #2784 starting first and successfully initialized, but also started was process #3552 which throws an error during the jk_shm_open call. [Wed Sep 08 13:52:20.319 2010] [2784:3892] [info] jk_isapi_plugin.c (2403): Starting Jakarta/ISAPI/isapi_redirector/1.2.30 [Wed Sep 08 13:52:20.334 2010] [2784:3892] [info] jk_isapi_plugin.c (2573): Jakarta/ISAPI/isapi_redirector/1.2.30 initialized [Wed Sep 08 13:52:21.647 2010] [3552:3176] [info] jk_isapi_plugin.c (2403): Starting Jakarta/ISAPI/isapi_redirector/1.2.30 [Wed Sep 08 13:52:21.647 2010] [3552:3176] [error] jk_isapi_plugin.c (2539): Initializing shm:(null) errno=-1. Load balancing workers will not function properly. [Wed Sep 08 13:52:21.663 2010] [3552:3176] [info] jk_isapi_plugin.c (2573): Jakarta/ISAPI/isapi_redirector/1.2.30 initialized [Wed Sep 08 13:58:08.881 2010] [2784:2252] [info] jk_isapi_plugin.c (2245): Jakarta/ISAPI/isapi_redirector/1.2.30 stopping [Wed Sep 08 13:58:08.881 2010] [3552:816] [info] jk_isapi_plugin.c (2245): Jakarta/ISAPI/isapi_redirector/1.2.30 stopping I see both processes in the task manager as running w3wp.exe*32 described as IIS Worker Process. When DEBUG logging enabled, the first process gets the shm: [Wed Sep 08 14:01:26.559 2010] [3664:2648] [debug] jk_shm.c (132): shared memory will contain 2 ajp workers of size 320 and 0 lb workers of size 320 with 0 members of size 384+320 [Wed Sep 08 14:01:26.559 2010] [3664:2648] [debug] jk_shm.c (254): Initialized shared memory JKISAPISHMEM_LOCALHOST_1 size=768 free=640 addr=0x52 The 2nd process reports an error getting the shm: [Wed Sep 08 14:04:53.677 2010] [2764:3516] [debug] jk_shm.c (132): shared memory will contain 2 ajp workers of size 320 and 0 lb workers of size 320 with 0 members of size 384+320 [Wed Sep 08 14:04:53.677 2010] [2764:3516] [error] jk_isapi_plugin.c (2539): Initializing shm:(null) errno=-1. Load balancing workers will not function properly. As more requests come in, more of these threads are launched and they fail too. -- 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: r995218 - /tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
Author: markt
Date: Wed Sep 8 19:39:36 2010
New Revision: 995218
URL: http://svn.apache.org/viewvc?rev=995218&view=rev
Log:
Fix @Override warnings
Modified:
tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
Modified: tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java?rev=995218&r1=995217&r2=995218&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java Wed
Sep 8 19:39:36 2010
@@ -112,16 +112,19 @@ public class DefaultInstanceManager impl
this.injectionMap = injectionMap;
}
+@Override
public Object newInstance(String className) throws IllegalAccessException,
InvocationTargetException, NamingException, InstantiationException,
ClassNotFoundException {
Class clazz = loadClassMaybePrivileged(className, classLoader);
return newInstance(clazz.newInstance(), clazz);
}
+@Override
public Object newInstance(final String className, final ClassLoader
classLoader) throws IllegalAccessException, NamingException,
InvocationTargetException, InstantiationException, ClassNotFoundException {
Class clazz = classLoader.loadClass(className);
return newInstance(clazz.newInstance(), clazz);
}
+@Override
public void newInstance(Object o)
throws IllegalAccessException, InvocationTargetException,
NamingException {
newInstance(o, o.getClass());
@@ -136,6 +139,7 @@ public class DefaultInstanceManager impl
return instance;
}
+@Override
public void destroyInstance(Object instance) throws
IllegalAccessException, InvocationTargetException {
if (!ignoreAnnotations) {
preDestroy(instance, instance.getClass());
@@ -162,6 +166,7 @@ public class DefaultInstanceManager impl
if (Globals.IS_SECURITY_ENABLED) {
methods = AccessController.doPrivileged(
new PrivilegedAction(){
+@Override
public Method[] run(){
return clazz.getDeclaredMethods();
}
@@ -215,6 +220,7 @@ public class DefaultInstanceManager impl
if (Globals.IS_SECURITY_ENABLED) {
methods = AccessController.doPrivileged(
new PrivilegedAction(){
+@Override
public Method[] run(){
return clazz.getDeclaredMethods();
}
@@ -275,6 +281,7 @@ public class DefaultInstanceManager impl
final Class clazz2 = clazz;
fields = AccessController.doPrivileged(
new PrivilegedAction(){
+@Override
public Field[] run(){
return clazz2.getDeclaredFields();
}
@@ -318,6 +325,7 @@ public class DefaultInstanceManager impl
final Class clazz2 = clazz;
methods = AccessController.doPrivileged(
new PrivilegedAction(){
+@Override
public Method[] run(){
return clazz2.getDeclaredMethods();
}
@@ -372,6 +380,7 @@ public class DefaultInstanceManager impl
try {
clazz = AccessController.doPrivileged(new
PrivilegedExceptionAction>() {
+@Override
public Class run() throws Exception {
return loadClass(className, classLoader);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r995224 - /tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
Author: markt
Date: Wed Sep 8 19:45:16 2010
New Revision: 995224
URL: http://svn.apache.org/viewvc?rev=995224&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49892
Correct JNDI name for method resource injections
Based on a patch by Gurkan Erdogdu
Modified:
tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
Modified: tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java?rev=995224&r1=995223&r2=995224&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java Wed
Sep 8 19:45:16 2010
@@ -485,6 +485,7 @@ public class DefaultInstanceManager impl
throws NamingException, IllegalAccessException,
InvocationTargetException {
if (!method.getName().startsWith("set")
+|| method.getName().length() < 4
|| method.getParameterTypes().length != 1
|| !method.getReturnType().getName().equals("void")) {
throw new IllegalArgumentException("Invalid method resource
injection annotation");
@@ -498,7 +499,7 @@ public class DefaultInstanceManager impl
lookedupResource = context.lookup(name);
} else {
lookedupResource = context.lookup(
-clazz.getName() + "/" + method.getName().substring(3));
+clazz.getName() + "/" + getName(method));
}
accessibility = method.isAccessible();
@@ -506,4 +507,16 @@ public class DefaultInstanceManager impl
method.invoke(instance, lookedupResource);
method.setAccessible(accessibility);
}
+
+public static String getName(Method setter) {
+StringBuilder name = new StringBuilder(setter.getName());
+
+// remove 'set'
+name.delete(0, 3);
+
+// lowercase first char
+name.setCharAt(0, Character.toLowerCase(name.charAt(0)));
+
+return name.toString();
+}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r995226 - /tomcat/trunk/webapps/docs/changelog.xml
Author: markt Date: Wed Sep 8 19:46:34 2010 New Revision: 995226 URL: http://svn.apache.org/viewvc?rev=995226&view=rev Log: Update changelog 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=995226&r1=995225&r2=995226&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Wed Sep 8 19:46:34 2010 @@ -127,6 +127,10 @@ Update the version numbers in ServerInfo defaults to Tomact 7.0.x. (markt) + +49892: Correct JNDI name for method resource injections. +Based on a patch by Gurkan Erdogdu. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49892] Wrong JNDI Name for Method Resource Injections
https://issues.apache.org/bugzilla/show_bug.cgi?id=49892 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Mark Thomas 2010-09-08 15:47:18 EDT --- Thanks for the patch. I have applied it to trunk and it will be in 7.0.3 onwards. I also added to test for method name length to ensure correct operation. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "MemoryLeakProtection" by Sylva inLaurent
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change
notification.
The "MemoryLeakProtection" page has been changed by SylvainLaurent.
http://wiki.apache.org/tomcat/MemoryLeakProtection?action=diff&rev1=12&rev2=13
--
- ''' !! This page is under construction !! '''
-
For some time Tomcat has had some means of protection against memory leaks
when stopping or redeploying applications.
This page tries to list them, and shows the situations where leaks can be
detected and fixed.
@@ -27, +25 @@
||[[#cclThreadSpawnedByWebApp|ContextClassLoader / Threads spawned by
webapps]]||>=6.0.24||In 6.0.24-6.0.26 {{{TimerThread}}} are stopped but it may
lead to problems. Optional from 6.0.27 with the
{{{clearReferencesStopTimerThreads}}} flag. Other threads may be stopped with
the {{{clearReferencesStopThreads}}} flag, but it's unsafe. ||[[#48837|Detect
child classloaders]], Fix the application to stop the thread when the
application is stopped||
||[[#cclThreadSpawnedByCommonClassLoader|ContextClassLoader / Threads spawned
by classes loaded by the common classloader]]||>=6.0.24||In 6.0.24-6.0.26
{{{TimerThread}}} are stopped but it may lead to problems. Optional from 6.0.27
with the {{{clearReferencesStopTimerThreads}}} flag. Other threads may be
stopped with the {{{clearReferencesStopThreads}}} flag, but it's unsafe.
||[[#48837|Detect child classloaders]], fix the offending code (set the correct
CCL when spawning the thread)||
||[[#cclThreadSpawnedByJRE|ContextClassLoader / Threads spawned by JRE
classes]]|| no || >=6.0.24 pre-spawns some known offenders || ||
- ||[[#staticClassVariables|static class variables]]|| no ||> 6.0.? || ||
+ ||[[#staticClassVariables|static class variables]]|| no ||> 6.0.? . Disabled
by default with tomcat 7|| ||
||[[#LogFactory|LogFactory]]|| ||> 6.0.? || ||
||[[#jdbc|JDBC driver registration]]|| > 6.0.? ||> 6.0.? || ||
||[[#rmiTarget|RMI Target]]|| ||> 6.0.? || ||
@@ -402, +400 @@
Related issues
*
<>[[https://issues.apache.org/bugzilla/show_bug.cgi?id=48837|48837]]
- Memory leaks protection does not cure leaks triggered by JSP pages code
- *
<>[[https://issues.apache.org/bugzilla/show_bug.cgi?id=48895|48895]]
- !WebAppClassLoader.clearThreadLocalMap() concurrency issues
- *
<>[[https://issues.apache.org/bugzilla/show_bug.cgi?id=48971|48971]]
- memory leak protection : stopping !TimerThreads should be optional and
disabled by default
* <>[[https://issues.apache.org/bugzilla/show_bug.cgi?id=
49159|49159]] - Improve ThreadLocal memory leak clean-up
* [[http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4957990|Sun bug
4957990]] - In some cases the Server JVM fails to collect classloaders.
According to [[http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4957990|this
page]] it should have been fixed with java 6u16 but actually it was not. It
seems to be fixed with 6u21 (documented
[[http://download.java.net/jdk6/6u21/promoted/b03/changes/JDK6u21.list.html|here]]
and verified by the author of this wiki page).
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Proposed .dsp and source change to jk for apache 2.0
On 9/8/2010 12:57 PM, Rainer Jung wrote: > > +1 to everything you suggested to change. If you improve the dsps, you might > want to take > a look at > > https://issues.apache.org/bugzilla/show_bug.cgi?id=43303 Yea, I'm happy to add .rc's (VERSION resources) to the binaries, should be straightforward enough. Pointers to similar bugs are welcome. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 43303] Versioning under Windows not reported by many connector components
https://issues.apache.org/bugzilla/show_bug.cgi?id=43303 --- Comment #5 from William A. Rowe Jr. 2010-09-08 17:23:13 EDT --- Sensible suggestion! (Commenting to put it on my free-cycles radar). -- 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
Can jsp-file be a JspServlet init-param?
I've recently rewritten the geronimo-jetty integration to work off the servlet 3 *Registration classes. This works great except for servlets backed by jsp files, since there's no way to tell the servlet container through the ServletRegistration interface that its actually something with this extra jsp file name that needs to be added through some special process into the request. However, its easy to subclass the JspServlet so it gets the jsp file value from an init param, and of course its easy to set the init param from the web.xml. This appears to work fine. Is there some reason I've missed that this is a bad idea? If not, would the jasper community consider a patch to modify the JspServlet so it directly looks for such an init-param? And would the tomcat community consider simplifying the runtime code to use this init-param instead of a Constants.JSP_FILE request attribute? thanks david jencks - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49903] New: Make tomcat workers file reloadable
https://issues.apache.org/bugzilla/show_bug.cgi?id=49903 Summary: Make tomcat workers file reloadable Product: Tomcat Connectors Version: unspecified Platform: All URL: http://www.mail-archive.com/us...@tomcat.apache.org/ms g81603.html OS/Version: All Status: NEW Severity: enhancement Priority: P2 Component: Common AssignedTo: dev@tomcat.apache.org ReportedBy: cont...@ruslan.org Created an attachment (id=26007) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=26007) Patch for tomcat-connectors 1.2.30 File with mounts (one which specified using JkMountFile in apache connector) already reloadable. The same functionality needed for workers file. Besides obvious use to add or remove workers as needed, there is other reasons to implement it. For example timeouts or activation can be either set at startup time or modified through jkstatus interface. However, when modified through the jkstatus, the same settings must be duplicated into workers file - this is tedious and error-prone. Also property like JkWorkersFileReload needs to be added. I`ve created patch file partially implements such functionality, with the following restrictions - Only Apache2 connector (tried on 2.2.16) - Requires JkShmSize directive to be used (to allocate enough space in shared memory for future workers) - Only works during maintain phase, so JkWatchdogInterval must be set -- 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 49903] Make workers file reloadable
https://issues.apache.org/bugzilla/show_bug.cgi?id=49903 Ruslan changed: What|Removed |Added Summary|Make tomcat workers file|Make workers file |reloadable |reloadable -- 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: Can jsp-file be a JspServlet init-param?
On 09/09/2010 00:54, David Jencks wrote: > I've recently rewritten the geronimo-jetty integration to work off the > servlet 3 *Registration classes. This works great except for servlets backed > by jsp files, since there's no way to tell the servlet container through the > ServletRegistration interface that its actually something with this extra jsp > file name that needs to be added through some special process into the > request. That looks like an oversight in the 3.0 spec. > However, its easy to subclass the JspServlet so it gets the jsp file value > from an init param, and of course its easy to set the init param from the > web.xml. This appears to work fine. > > Is there some reason I've missed that this is a bad idea? Well, it would be container specific rather than defined by the spec but since the spec offers no way to define it, I don't see there is a choice. > If not, would the jasper community consider a patch to modify the JspServlet > so it directly looks for such an init-param? Patches always get considered. > And would the tomcat community consider simplifying the runtime code to use > this init-param instead of a Constants.JSP_FILE request attribute? As usual, it would depend on the patch. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
