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 @@
<!-- See "build.properties.sample" in the top level directory for all -->
<property name="version.major" value="1" />
<property name="version.minor" value="0" />
- <property name="version.build" value="9" />
+ <property name="version.build" value="10" />
<property name="version.patch" value="-beta" />
<property name="version"
value="${version.major}.${version.minor}.${version.build}${version.patch}" />
<!-- property values you must customize for successful building!!! -->
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; i<proxies.length; i++) {
try {
+ if (log.isDebugEnabled()) {
+ log.debug("Creating interceptor instance of
class:"+proxies[i].getInterceptorClass());
+ }
proxies[i].getInterceptorClass().newInstance().poolStarted(this);
}catch (Exception x) {
log.error("Unable to inform interceptor of pool start.",x);
@@ -771,7 +774,11 @@
try {
MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
ObjectName name = new
ObjectName(POOL_JMX_TYPE_PREFIX+"ConnectionPool,name="+getName());
- jmxPool = new org.apache.tomcat.jdbc.pool.jmx.ConnectionPool(this);
+ if
("1.5".equals(System.getProperty("java.specification.version"))) {
+ jmxPool = new
org.apache.tomcat.jdbc.pool.jmx.ConnectionPool(this);
+ } else {
+ jmxPool = new
org.apache.tomcat.jdbc.pool.jmx.ConnectionPool(this,true);
+ }
mbs.registerMBean(jmxPool, name);
} catch (Exception x) {
log.warn("Unable to start JMX integration for connection pool.
Instance["+getName()+"] can't be monitored.",x);
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=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<? extends JdbcInterceptor> 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
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
