Re: Bayeux/Cometd API question
Hi Filip, ok, I'll take a look at the current implementation and if the effort seems reasonable for me, I'll try to allocate some days during the next (let's say 3-6) weeks to contribute an implementation for the current API. I would then really propose to use the API interface package org.cometd.* as used by Jetty (and others). Would that be ok for you? If I have questions left, should I post them to the dev list here or should I contact you directly? Regards, Florian Original-Nachricht > Datum: Thu, 18 Dec 2008 15:01:26 -0700 > Von: Filip Hanik - Dev Lists > An: Tomcat Developers List > Betreff: Re: Bayeux/Cometd API question > Feel free to contribute any API changes you feel need to be added > > Filip > > fl...@gmx.de wrote: > > Hi together, > > > > I've developed a Bayeux/Cometd application using the Jetty > implementation running in Tomcat 5. Development started several month back > with no > Tomcat Bayeux implementation available. > > With this setup the application works well for limited traffic but of > course not for high-volume traffic (since that way it can't really scale). > I'm following the Tomcat Bayeux development for several months now. > Currently, I'm somewhat concerned about the Bayeux-API differences between > Jetty and > Tomcat, and I can't see any sign/any attempt of unifying the API (this > prevents us to switch to the Tomcat Bayeux implementation and we need to even > think about switching completely to Jetty). > > > > I know that org.cometd.Bayeux is not a real standardized thing and it's > being hosted at mortbay.org. But are there any plans for the Tomcat > implementation to catch up with the latest (at least half-"official") API? Or > even > any vision of Tomcat/Jetty people pulling Bayeux/Cometd together towards a > common direction/standardized API (or even JSR)? The current situation is > somewhat unfortunate for a developer of a large Bayeux/Cometd application. > > > > Best Regards, > > Florian > > > > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org -- Pt! Schon vom neuen GMX MultiMessenger gehört? Der kann`s mit allen: http://www.gmx.net/de/go/multimessenger - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r728026 - in /tomcat/site/trunk: docs/security-4.html docs/security-5.html docs/security-6.html xdocs/security-4.xml xdocs/security-5.xml xdocs/security-6.xml
Author: markt Date: Fri Dec 19 06:10:33 2008 New Revision: 728026 URL: http://svn.apache.org/viewvc?rev=728026&view=rev Log: Update security pages with real cause of CVE-2008-2938 Modified: tomcat/site/trunk/docs/security-4.html tomcat/site/trunk/docs/security-5.html tomcat/site/trunk/docs/security-6.html tomcat/site/trunk/xdocs/security-4.xml tomcat/site/trunk/xdocs/security-5.xml tomcat/site/trunk/xdocs/security-6.xml Modified: tomcat/site/trunk/docs/security-4.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-4.html?rev=728026&r1=728025&r2=728026&view=diff == --- tomcat/site/trunk/docs/security-4.html (original) +++ tomcat/site/trunk/docs/security-4.html Fri Dec 19 06:10:33 2008 @@ -326,28 +326,6 @@ Affects: 4.1.0-4.1.37 - -important: Directory traversal - http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-2938";> - CVE-2008-2938 - - -If a context is configured with allowLinking="true" and the - connector is configured with URIEncoding="UTF-8" then a - malformed request may be used to access arbitrary files on the server. - If the connector is configured with URIEncoding="UTF-8" then - a malformed request may be used to access arbitrary files within the - docBase of a context such as web.xml. It should also be noted that - setting useBodyEncodingForURI="true" has the same effect as - setting URIEncoding="UTF-8" when processing requests with - bodies encoded with UTF-8. - - This was fixed in - http://svn.apache.org/viewvc?rev=681065&view=rev";> - revision 681065. - -Affects: 4.1.0-4.1.37 - @@ -1072,6 +1050,39 @@ page that called System.exit(1) rather than relying on a bug in an internal Sun class. + +important: Directory traversal + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-2938";> + CVE-2008-2938 + + +Originally reported as a Tomcat vulnerability the root cause of this + issue is that the JVM does not correctly decode UTF-8 encoded URLs to + UTF-8. This exposes a directory traversal vulnerability when the + connector uses URIEncoding="UTF-8". This directory traversal + is limited to the docBase of the web application. + +If a context is configured with allowLinking="true" then the + directory traversal vulnerability is extended to the entire file system + of the host server. + +It should also be noted that setting + useBodyEncodingForURI="true" has the same effect as setting + URIEncoding="UTF-8" when processing requests with bodies + encoded with UTF-8. + +Although the root cause was quickly identified as a JVM issue and that it + affected multiple JVMs from multiple vendors, it was decided to report + this as a Tomcat vulnerability until such time as the JVM vendors + provided updates to resolve this issue. For further information on the + status of this issue for your JVM, contact your JVM vendor. + +A workaround was implemented in + http://svn.apache.org/viewvc?rev=681065&view=rev";> + revision 681065 that protects against this and any similar character + encoding issues that may still exist in the JVM. This work around is + included in Tomcat 4.1.39 onwards. + Modified: tomcat/site/trunk/docs/security-5.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-5.html?rev=728026&r1=728025&r2=728026&view=diff == --- tomcat/site/trunk/docs/security-5.html (original) +++ tomcat/site/trunk/docs/security-5.html Fri Dec 19 06:10:33 2008 @@ -288,28 +288,6 @@ Affects: 5.5.0-5.5.26 - -important: Directory traversal - http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-2938";> - CVE-2008-2938 - - -If a context is configured with allowLinking="true" and the - connector is configured with URIEncoding="UTF-8" then a - malformed request may be used to access arbitrary files on the server. - If the connector is configured with URIEncoding="UTF-8" then - a malformed request may be used to access arbitrary files within the - docBase of a context such as web.xml. It should also be noted that - setting useBodyEncodingForURI="true" has the same effect as - setting URIEncoding="UTF-8" when processing requests with - bodies encoded with UTF-8. - - This was fixed in - http://svn.apache.org/viewvc?rev=681029&view=rev";> - revision 681029. - -Affects: 5.5.0-5.5.26 - @@ -964,6 +942,39 @@ The vulnerability described is in the web application deployed on Tomcat rather than in Tomcat. + +important: Directory traversal + http://cve.mitre.org/cgi-bin/cvename.cgi?
svn commit: r728028 - /tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Author: markt Date: Fri Dec 19 06:20:40 2008 New Revision: 728028 URL: http://svn.apache.org/viewvc?rev=728028&view=rev Log: Update the change log Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.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=728028&r1=728027&r2=728028&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Dec 19 06:20:40 2008 @@ -363,6 +363,10 @@ 1.6 JDK but because it does this by skipping DBCP, release builds must be generated with a 1.5 JDK. (costin/markt) + +46366: Correct information in RUNNING.txt regarding use of +CATALINA_HOME and CATALINA_BASE. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r728030 - /tomcat/connectors/trunk/jni/xdocs/index.xml
Author: markt Date: Fri Dec 19 06:23:49 2008 New Revision: 728030 URL: http://svn.apache.org/viewvc?rev=728030&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46291 Add note that setenv.(sh|bat) should be created if not present Modified: tomcat/connectors/trunk/jni/xdocs/index.xml Modified: tomcat/connectors/trunk/jni/xdocs/index.xml URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/xdocs/index.xml?rev=728030&r1=728029&r2=728030&view=diff == --- tomcat/connectors/trunk/jni/xdocs/index.xml (original) +++ tomcat/connectors/trunk/jni/xdocs/index.xml Fri Dec 19 06:23:49 2008 @@ -170,8 +170,8 @@ - Edit the $CATALINA_HOME/bin/setenv.sh and add the path to the tc-native libraries to LD_LIBRARY_PATH. - Something like: + Edit $CATALINA_HOME/bin/setenv.sh (creating the file if necessary) and add + the path to the tc-native libraries to LD_LIBRARY_PATH. Something like: LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$CATALINA_HOME/lib export LD_LIBRARY_PATH @@ -193,8 +193,8 @@ -Edit the $CATALINA_BASE\bin\setenv.bat and add the path to the tc-native libraries, apr and OpenSSL to PATH. -For example: +Edit $CATALINA_BASE\bin\setenv.bat (creating the file if necessary) and add +the path to the tc-native libraries, apr and OpenSSL to PATH. For example: set PATH=%PATH;C:\cygwin\home\support\tomcat-native-current-win32-src\jni\native\Debug;C:\cygwin\home\support\tomcat-native-current-win32-src\jni\apr\Debug;C:\OpenSSL\lib\VC - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 46291] http://tomcat.apache.org/native-doc/ installation is wrong
https://issues.apache.org/bugzilla/show_bug.cgi?id=46291 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mark Thomas 2008-12-19 06:24:30 PST --- By default, setenv does not exist. It should be created if required. I have added a note to that effect to the docs. -- 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: r728032 - /tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java
Author: markt
Date: Fri Dec 19 06:28:06 2008
New Revision: 728032
URL: http://svn.apache.org/viewvc?rev=728032&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46408
Don't make assumptions about exception type
Modified:
tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java
Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java?rev=728032&r1=728031&r2=728032&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java (original)
+++ tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java Fri Dec 19
06:28:06 2008
@@ -299,9 +299,14 @@
}
Subject.doAsPrivileged(subject, pea, null);
- } catch( PrivilegedActionException pe) {
-Throwable e = ((InvocationTargetException)pe.getException())
+} catch( PrivilegedActionException pe) {
+Throwable e;
+if (pe.getException() instanceof InvocationTargetException) {
+e = ((InvocationTargetException)pe.getException())
.getTargetException();
+} else {
+e = pe;
+}
if (log.isDebugEnabled()){
log.debug(sm.getString("SecurityUtil.doAsPrivilege"), e);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r728033 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Fri Dec 19 06:29:48 2008 New Revision: 728033 URL: http://svn.apache.org/viewvc?rev=728033&view=rev Log: Prpose fix for 46408 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=728033&r1=728032&r2=728033&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Dec 19 06:29:48 2008 @@ -257,3 +257,9 @@ +1: fhanik -1: +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46408 + Correct potential invalid cast + http://svn.apache.org/viewvc?rev=728032&view=rev + +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 46408] Invalid cast in SecurityUtil
https://issues.apache.org/bugzilla/show_bug.cgi?id=46408 --- Comment #1 from Mark Thomas 2008-12-19 06:30:03 PST --- Thanks for the report. This has been fixed in trunk and proposed 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: Bayeux/Cometd API question
fl...@gmx.de wrote: Hi Filip, ok, I'll take a look at the current implementation and if the effort seems reasonable for me, I'll try to allocate some days during the next (let's say 3-6) weeks to contribute an implementation for the current API. excellent. I would then really propose to use the API interface package org.cometd.* as used by Jetty (and others). Would that be ok for you? this is the Apache Software Foundation, so software here, unless we implement a standard, is always prefixed org.apache If I have questions left, should I post them to the dev list here or should I contact you directly? the mailing list is the way to go, anyone who wishes to participate can Regards, Florian Original-Nachricht Datum: Thu, 18 Dec 2008 15:01:26 -0700 Von: Filip Hanik - Dev Lists An: Tomcat Developers List Betreff: Re: Bayeux/Cometd API question Feel free to contribute any API changes you feel need to be added Filip fl...@gmx.de wrote: Hi together, I've developed a Bayeux/Cometd application using the Jetty implementation running in Tomcat 5. Development started several month back with no Tomcat Bayeux implementation available. With this setup the application works well for limited traffic but of course not for high-volume traffic (since that way it can't really scale). I'm following the Tomcat Bayeux development for several months now. Currently, I'm somewhat concerned about the Bayeux-API differences between Jetty and Tomcat, and I can't see any sign/any attempt of unifying the API (this prevents us to switch to the Tomcat Bayeux implementation and we need to even think about switching completely to Jetty). I know that org.cometd.Bayeux is not a real standardized thing and it's being hosted at mortbay.org. But are there any plans for the Tomcat implementation to catch up with the latest (at least half-"official") API? Or even any vision of Tomcat/Jetty people pulling Bayeux/Cometd together towards a common direction/standardized API (or even JSR)? The current situation is somewhat unfortunate for a developer of a large Bayeux/Cometd application. Best Regards, Florian - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r728081 - in /tomcat/trunk/modules/jdbc-pool: ./ doc/ java/org/apache/tomcat/jdbc/pool/ java/org/apache/tomcat/jdbc/pool/interceptor/ test/org/apache/tomcat/jdbc/pool/ test/org/apache/tomc
Author: fhanik Date: Fri Dec 19 09:55:46 2008 New Revision: 728081 URL: http://svn.apache.org/viewvc?rev=728081&view=rev Log: Documented interceptors a bit better, implemented setters for interceptor properties Added: tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/pool/ tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/pool/interceptor/ tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/pool/interceptor/TestInterceptor.java tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestInterceptorShortName.java Modified: tomcat/trunk/modules/jdbc-pool/build.xml tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java tomcat/trunk/modules/jdbc-pool/sign.sh Modified: tomcat/trunk/modules/jdbc-pool/build.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.xml?rev=728081&r1=728080&r2=728081&view=diff == --- tomcat/trunk/modules/jdbc-pool/build.xml (original) +++ tomcat/trunk/modules/jdbc-pool/build.xml Fri Dec 19 09:55:46 2008 @@ -23,7 +23,7 @@ - + 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=728081&r1=728080&r2=728081&view=diff == --- tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml (original) +++ tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml Fri Dec 19 09:55:46 2008 @@ -350,6 +350,75 @@ of the results from a method invokation as well. You could build query performance analyzer that provides JMX notifications when a query is running longer than the expected time. + +Configuring JDBC interceptors is done using the jdbcInterceptors property. +The property contains a list of semi colon separated class names. If the classname if not fully qualified it will be prefixed with the +org.apache.tomcat.jdbc.pool.interceptor. prefix. +Example: + + jdbcInterceptors="org.apache.tomcat.jdbc.pool.interceptor.ConnectionState;org.apache.tomcat.jdbc.pool.interceptor.StatementFinalizer" + + is the same as + + jdbcInterceptors="ConnectionState;StatementFinalizer" + +Interceptors can have properties as well. These would be configured within the paranthesis of the class names. +Example: + + jdbcInterceptors="ConnectionState;StatementFinalizer(useWeakReferences=true,useEquals=true)" + + + + +Abstract base class for all interceptors, can not be instantiated. + + +(String as boolean) A custom query to be run when a connection is first created. + The default value is false. + + + + + +Caches the connection for the following attributes autoCommit, readOnly, + transactionIsolation and catalog. + It is a performance enhancement to avoid roundtrip to the database when getters are called or setters are called with an already set value. + + + + + +Keeps track of all statements created using createStatement, prepareStatement or prepareCall + and closes these statements when the connection is returned to the pool. + + + + + +Keeps track of query performance and issues log entries when queries exceed a time threshold of fail. + The log level used is WARN + + + +(int as String) The number of milliseconds a query has to exceed before issuing a log alert. + The default value is 1000 milliseconds. + + + +(int as String) The maximum number of queries to keep track of in order to preserve memory space + The default value is 1000. + + + + + +Extends the SlowQueryReport and in addition to log entries it issues JMX notification + for monitoring tools to react to. Inherits all the attributes from its parent class. + This class uses Tomcat's JMX engine so it wont work outside of the Tomcat container. + + + + @@ -519,15 +588,41 @@ The compare(String,Method) will use the useEquals flag on an interceptor and do either reference comparison or a string value comparison when the useEquals=true flag is set. - + +Pool start/stop + When the connection pool is started or closed, you can be notifed. You will only be notified once per interceptor class + even though it is an instance
svn commit: r728158 - /tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
Author: fhanik Date: Fri Dec 19 13:45:04 2008 New Revision: 728158 URL: http://svn.apache.org/viewvc?rev=728158&view=rev Log: Fix property parsing Modified: tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java Modified: tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java?rev=728158&r1=728157&r2=728158&view=diff == --- tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java (original) +++ tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java Fri Dec 19 13:45:04 2008 @@ -220,12 +220,13 @@ InterceptorDefinition[] definitions = new InterceptorDefinition[interceptorValues.length]; for (int i=0; i
svn commit: r728161 - in /tomcat/trunk/modules/jdbc-pool: build.xml sign.sh
Author: fhanik Date: Fri Dec 19 13:46:25 2008 New Revision: 728161 URL: http://svn.apache.org/viewvc?rev=728161&view=rev Log: inc version number Modified: tomcat/trunk/modules/jdbc-pool/build.xml tomcat/trunk/modules/jdbc-pool/sign.sh Modified: tomcat/trunk/modules/jdbc-pool/build.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.xml?rev=728161&r1=728160&r2=728161&view=diff == --- tomcat/trunk/modules/jdbc-pool/build.xml (original) +++ tomcat/trunk/modules/jdbc-pool/build.xml Fri Dec 19 13:46:25 2008 @@ -23,7 +23,7 @@ - + Modified: tomcat/trunk/modules/jdbc-pool/sign.sh URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/sign.sh?rev=728161&r1=728160&r2=728161&view=diff == --- tomcat/trunk/modules/jdbc-pool/sign.sh (original) +++ tomcat/trunk/modules/jdbc-pool/sign.sh Fri Dec 19 13:46:25 2008 @@ -1,4 +1,4 @@ -VERSION=v1.0.8-beta +VERSION=v1.0.9-beta for i in $(find output/release/$VERSION -name "*.zip" -o -name "*.tar.gz"); do echo Signing $i echo $1|gpg --passphrase-fd 0 -a -b $i - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r728197 - in /tomcat/trunk/modules/jdbc-pool: build.xml java/org/apache/tomcat/jdbc/pool/ConnectionPool.java java/org/apache/tomcat/jdbc/pool/PoolProperties.java java/org/apache/tomcat/jdb
Author: fhanik
Date: Fri Dec 19 16:45:46 2008
New Revision: 728197
URL: http://svn.apache.org/viewvc?rev=728197&view=rev
Log:
Removed calling to a JDK 1.6 method if its run under 1.5 and still take
advantage of the JMX features
Modified:
tomcat/trunk/modules/jdbc-pool/build.xml
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
tomcat/trunk/modules/jdbc-pool/sign.sh
Modified: tomcat/trunk/modules/jdbc-pool/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.xml?rev=728197&r1=728196&r2=728197&view=diff
==
--- tomcat/trunk/modules/jdbc-pool/build.xml (original)
+++ tomcat/trunk/modules/jdbc-pool/build.xml Fri Dec 19 16:45:46 2008
@@ -23,7 +23,7 @@
-
+
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java?rev=728197&r1=728196&r2=728197&view=diff
==
---
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
Fri Dec 19 16:45:46 2008
@@ -353,6 +353,9 @@
PoolProperties.InterceptorDefinition[] proxies =
getPoolProperties().getJdbcInterceptorsAsArray();
for (int i=0; ihttp://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java?rev=728197&r1=728196&r2=728197&view=diff
==
---
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
Fri Dec 19 16:45:46 2008
@@ -25,12 +25,16 @@
import java.util.Properties;
import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+
/**
* @author Filip Hanik
*
*/
public class PoolProperties {
public static final String PKG_PREFIX =
"org.apache.tomcat.jdbc.pool.interceptor.";
+protected static Log log = LogFactory.getLog(PoolProperties.class);
protected static AtomicInteger poolCounter = new AtomicInteger(0);
protected Properties dbProperties = new Properties();
@@ -460,8 +464,14 @@
public Class getInterceptorClass() throws
ClassNotFoundException {
if (clazz==null) {
if (getClassName().indexOf(".")<0) {
+if (log.isDebugEnabled()) {
+log.debug("Loading interceptor
class:"+PoolProperties.PKG_PREFIX+getClassName());
+}
clazz =
Class.forName(PoolProperties.PKG_PREFIX+getClassName(), true,
this.getClass().getClassLoader());
} else {
+if (log.isDebugEnabled()) {
+log.debug("Loading interceptor class:"+getClassName());
+}
clazz = Class.forName(getClassName(), true,
this.getClass().getClassLoader());
}
}
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java?rev=728197&r1=728196&r2=728197&view=diff
==
---
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
Fri Dec 19 16:45:46 2008
@@ -37,6 +37,11 @@
protected AtomicInteger sequence = new AtomicInteger(0);
public ConnectionPool(org.apache.tomcat.jdbc.pool.ConnectionPool pool) {
+super();
+this.pool = pool;
+}
+
+public ConnectionPool(org.apache.tomcat.jdbc.pool.ConnectionPool pool,
boolean for16) {
super(getDefaultNotificationInfo());
this.pool = pool;
}
Modified: tomcat/trunk/modules/jdbc-pool/sign.sh
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/sign.sh?rev=728197&r1=728196&r2=728197&view=diff
==
--- tomcat/trunk/modules/jdbc-pool/sign.sh (original)
+++ tomcat/trunk/modules/jdbc-pool/sign.sh Fri Dec 19 16:45:46 2008
@@ -1,4 +1,4 @@
-VERSION=v1.0.9-beta
+VERSION=v1.0.10-beta
for i in $(find output/release/$VERSION -name "*.zip" -o -name "*.tar.gz"); do
