donaldp 01/04/18 06:15:49
Modified: src/java/org/apache/excalibur/datasource
DataSourceComponent.java J2eeDataSource.java
JdbcConnection.java JdbcConnectionPool.java
JdbcDataSource.java
Log:
Updated location of Pool to excalibur.pool package
Updated lifecycle methods
Revision Changes Path
1.2 +3 -3
jakarta-avalon/src/java/org/apache/excalibur/datasource/DataSourceComponent.java
Index: DataSourceComponent.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon/src/java/org/apache/excalibur/datasource/DataSourceComponent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DataSourceComponent.java 2001/04/17 03:07:46 1.1
+++ DataSourceComponent.java 2001/04/18 13:15:48 1.2
@@ -9,15 +9,15 @@
import java.sql.Connection;
import java.sql.SQLException;
-import org.apache.avalon.Component;
-import org.apache.avalon.ThreadSafe;
+import org.apache.avalon.component.Component;
+import org.apache.avalon.thread.ThreadSafe;
import org.apache.avalon.configuration.Configurable;
/**
* The standard interface for DataSources in Avalon.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1 $ $Date: 2001/04/17 03:07:46 $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/04/18 13:15:48 $
*/
public interface DataSourceComponent
extends Component, Configurable, ThreadSafe
1.2 +2 -2
jakarta-avalon/src/java/org/apache/excalibur/datasource/J2eeDataSource.java
Index: J2eeDataSource.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon/src/java/org/apache/excalibur/datasource/J2eeDataSource.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- J2eeDataSource.java 2001/04/17 03:07:46 1.1
+++ J2eeDataSource.java 2001/04/18 13:15:48 1.2
@@ -13,7 +13,7 @@
import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.sql.DataSource;
-import org.apache.avalon.AbstractLoggable;
+import org.apache.avalon.logger.AbstractLoggable;
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
@@ -23,7 +23,7 @@
* J2EE container pools the datasources properly.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1 $ $Date: 2001/04/17 03:07:46 $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/04/18 13:15:48 $
*/
public class J2eeDataSource
extends AbstractLoggable
1.2 +3 -3
jakarta-avalon/src/java/org/apache/excalibur/datasource/JdbcConnection.java
Index: JdbcConnection.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon/src/java/org/apache/excalibur/datasource/JdbcConnection.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JdbcConnection.java 2001/04/17 03:07:46 1.1
+++ JdbcConnection.java 2001/04/18 13:15:48 1.2
@@ -15,8 +15,8 @@
import java.sql.SQLWarning;
import java.sql.Statement;
import java.util.Map;
-import org.apache.avalon.AbstractLoggable;
-import org.apache.avalon.Recyclable;
+import org.apache.avalon.logger.AbstractLoggable;
+import org.apache.excalibur.pool.Recyclable;
import org.apache.excalibur.pool.Pool;
/**
@@ -28,7 +28,7 @@
* total number of Connection objects that are created.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1 $ $Date: 2001/04/17 03:07:46 $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/04/18 13:15:48 $
*/
public class JdbcConnection
extends AbstractLoggable
1.2 +5 -5
jakarta-avalon/src/java/org/apache/excalibur/datasource/JdbcConnectionPool.java
Index: JdbcConnectionPool.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon/src/java/org/apache/excalibur/datasource/JdbcConnectionPool.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JdbcConnectionPool.java 2001/04/17 03:07:46 1.1
+++ JdbcConnectionPool.java 2001/04/18 13:15:48 1.2
@@ -13,12 +13,12 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import org.apache.avalon.AbstractLoggable;
+import org.apache.avalon.logger.AbstractLoggable;
import org.apache.avalon.Disposable;
import org.apache.avalon.Initializable;
-import org.apache.avalon.Poolable;
-import org.apache.avalon.Recyclable;
-import org.apache.avalon.util.Lock;
+import org.apache.excalibur.pool.Poolable;
+import org.apache.excalibur.pool.Recyclable;
+import org.apache.excalibur.concurrent.Lock;
import org.apache.excalibur.pool.Pool;
/**
@@ -26,7 +26,7 @@
* thread to manage the number of SQL Connections.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1 $ $Date: 2001/04/17 03:07:46 $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/04/18 13:15:48 $
*/
public class JdbcConnectionPool
extends AbstractLoggable
1.2 +2 -2
jakarta-avalon/src/java/org/apache/excalibur/datasource/JdbcDataSource.java
Index: JdbcDataSource.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon/src/java/org/apache/excalibur/datasource/JdbcDataSource.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JdbcDataSource.java 2001/04/17 03:07:46 1.1
+++ JdbcDataSource.java 2001/04/18 13:15:48 1.2
@@ -9,10 +9,10 @@
import java.sql.Connection;
import java.sql.SQLException;
-import org.apache.avalon.AbstractLoggable;
import org.apache.avalon.Disposable;
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
+import org.apache.avalon.logger.AbstractLoggable;
/**
* The Default implementation for DataSources in Avalon. This uses the
@@ -20,7 +20,7 @@
* <code>java.sql.DriverManager</code>.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1 $ $Date: 2001/04/17 03:07:46 $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/04/18 13:15:48 $
*/
public class JdbcDataSource
extends AbstractLoggable
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
