Author: fhanik
Date: Wed Jan 13 19:08:09 2010
New Revision: 898889
URL: http://svn.apache.org/viewvc?rev=898889&view=rev
Log:
Remove a dependency on Java 6 that accidentally got introduced
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.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
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java?rev=898889&r1=898888&r2=898889&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
Wed Jan 13 19:08:09 2010
@@ -464,10 +464,10 @@
public static DataSource createDataSource(Properties properties,Context
context) throws Exception {
PoolConfiguration poolProperties =
DataSourceFactory.parsePoolProperties(properties);
if (poolProperties.getDataSourceJNDI()!=null &&
poolProperties.getDataSource()==null) {
- javax.sql.CommonDataSource jndiDS = null;
+ Object jndiDS = null;
try {
if (context!=null) {
- jndiDS =
(javax.sql.CommonDataSource)context.lookup(poolProperties.getDataSourceJNDI());
+ jndiDS =
context.lookup(poolProperties.getDataSourceJNDI());
} else {
log.warn("dataSourceJNDI property is configued, but local
JNDI context is null.");
}
@@ -477,7 +477,7 @@
if (jndiDS==null) {
try {
context = (Context) (new InitialContext());
- jndiDS =
(javax.sql.CommonDataSource)context.lookup(poolProperties.getDataSourceJNDI());
+ jndiDS =
context.lookup(poolProperties.getDataSourceJNDI());
} catch (NamingException e) {
log.warn("The name
\""+poolProperties.getDataSourceJNDI()+"\" can not be found in the
InitialContext.");
}
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java?rev=898889&r1=898888&r2=898889&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
Wed Jan 13 19:08:09 2010
@@ -23,7 +23,6 @@
import java.util.Properties;
import java.util.concurrent.Future;
-import javax.sql.CommonDataSource;
import javax.sql.XAConnection;
import org.apache.juli.logging.Log;
@@ -1015,14 +1014,14 @@
/**
* {...@inheritdoc}
*/
- public void setDataSource(javax.sql.CommonDataSource ds) {
+ public void setDataSource(Object ds) {
getPoolProperties().setDataSource(ds);
}
/**
* {...@inheritdoc}
*/
- public CommonDataSource getDataSource() {
+ public Object getDataSource() {
return getPoolProperties().getDataSource();
}
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java?rev=898889&r1=898888&r2=898889&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
Wed Jan 13 19:08:09 2010
@@ -18,8 +18,6 @@
import java.util.Properties;
-import javax.sql.CommonDataSource;
-
import org.apache.tomcat.jdbc.pool.PoolProperties.InterceptorDefinition;
/**
@@ -730,14 +728,14 @@
* will be invoked.
* @param ds the {...@link javax.sql.DataSource} to be used for creating
connections to be pooled.
*/
- public void setDataSource(CommonDataSource ds);
+ public void setDataSource(Object ds);
/**
* Returns a datasource, if one exists that is being used to create
connections.
* This method will return null if the pool is using a {...@link
java.sql.Driver}
* @return the {...@link javax.sql.DataSource} to be used for creating
connections to be pooled or null if a Driver is used.
*/
- public CommonDataSource getDataSource();
+ public Object getDataSource();
/**
* Configure the connection pool to use a DataSource according to
{...@link PoolConfiguration#setDataSource(CommonDataSource)}
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=898889&r1=898888&r2=898889&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
Wed Jan 13 19:08:09 2010
@@ -25,7 +25,6 @@
import java.util.Properties;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.sql.CommonDataSource;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -77,7 +76,7 @@
protected boolean useLock = false;
protected InterceptorDefinition[] interceptors = null;
protected int suspectTimeout = 0;
- protected javax.sql.CommonDataSource dataSource = null;
+ protected Object dataSource = null;
protected String dataSourceJNDI = null;
@@ -878,14 +877,14 @@
/**
* {...@inheritdoc}
*/
- public void setDataSource(javax.sql.CommonDataSource ds) {
+ public void setDataSource(Object ds) {
this.dataSource = ds;
}
/**
* {...@inheritdoc}
*/
- public CommonDataSource getDataSource() {
+ public Object getDataSource() {
return dataSource;
}
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=898889&r1=898888&r2=898889&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
Wed Jan 13 19:08:09 2010
@@ -25,7 +25,6 @@
import javax.management.Notification;
import javax.management.NotificationBroadcasterSupport;
import javax.management.NotificationListener;
-import javax.sql.CommonDataSource;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -77,7 +76,7 @@
- @Override
+
public MBeanNotificationInfo[] getNotificationInfo() {
MBeanNotificationInfo[] pres = super.getNotificationInfo();
MBeanNotificationInfo[] loc = getDefaultNotificationInfo();
@@ -401,7 +400,8 @@
public void setDriverClassName(String driverClassName) {
getPoolProperties().setDriverClassName(driverClassName);
}
-
+
+ @Override
public void setFairQueue(boolean fairQueue) {
getPoolProperties().setFairQueue(fairQueue);
}
@@ -442,7 +442,7 @@
}
- @Override
+ @Override
public void setMaxIdle(int maxIdle) {
// TODO Auto-generated method stub
@@ -575,14 +575,14 @@
/**
* {...@inheritdoc}
*/
- public void setDataSource(javax.sql.CommonDataSource ds) {
+ public void setDataSource(Object ds) {
getPoolProperties().setDataSource(ds);
}
/**
* {...@inheritdoc}
*/
- public CommonDataSource getDataSource() {
+ public Object getDataSource() {
return getPoolProperties().getDataSource();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
