donaldp 01/04/02 21:41:45
Modified: proposal/4.0/src/java/org/apache/avalon/camelot
DefaultLoader.java
proposal/4.0/src/java/org/apache/avalon/datasource
DataSourceComponent.java JdbcConnection.java
JdbcConnectionPool.java
proposal/4.0/src/java/org/apache/avalon/pool
ThreadSafePool.java
proposal/4.0/src/java/org/apache/avalon/thread
DefaultThreadPool.java WorkerThread.java
Removed: proposal/4.0/src/java/org/apache/avalon/camelot
AbstractCamelotDeployer.java
AbstractZipDeployer.java
Log:
Made proposal compile.
Revision Changes Path
1.4 +1 -2
jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/camelot/DefaultLoader.java
Index: DefaultLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/camelot/DefaultLoader.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultLoader.java 2001/03/15 04:34:45 1.3
+++ DefaultLoader.java 2001/04/03 04:41:41 1.4
@@ -10,7 +10,6 @@
import java.net.URL;
import java.net.URLClassLoader;
import org.apache.aut.ExceptionUtil;
-import org.apache.aut.ObjectUtil;
import org.apache.framework.component.Component;
import org.apache.framework.container.FactoryException;
import org.apache.framework.container.Loader;
@@ -82,7 +81,7 @@
{
try
{
- return ObjectUtil.createObject( m_classLoader, classname );
+ return m_classLoader.loadClass( classname ).newInstance();
}
catch( final ClassNotFoundException cnfe )
{
1.3 +2 -2
jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/datasource/DataSourceComponent.java
Index: DataSourceComponent.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/datasource/DataSourceComponent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DataSourceComponent.java 2001/03/15 04:34:50 1.2
+++ DataSourceComponent.java 2001/04/03 04:41:42 1.3
@@ -11,13 +11,13 @@
import java.sql.SQLException;
import org.apache.framework.component.Component;
import org.apache.framework.configuration.Configurable;
-import org.apache.framework.ThreadSafe;
+import org.apache.framework.thread.ThreadSafe;
/**
* The standard interface for DataSources in Avalon.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/03/15 04:34:50 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/04/03 04:41:42 $
*/
public interface DataSourceComponent
extends Component, Configurable, ThreadSafe
1.5 +4 -4
jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/datasource/JdbcConnection.java
Index: JdbcConnection.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/datasource/JdbcConnection.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JdbcConnection.java 2001/03/15 04:34:50 1.4
+++ JdbcConnection.java 2001/04/03 04:41:42 1.5
@@ -16,9 +16,9 @@
import java.sql.Statement;
import java.util.Map;
import org.apache.avalon.logger.AbstractLoggable;
-import org.apache.framework.Recyclable;
-import org.apache.framework.pool.Pool;
-import org.apache.framework.pool.Poolable;
+import org.apache.avalon.pool.Recyclable;
+import org.apache.avalon.pool.Pool;
+import org.apache.avalon.pool.Poolable;
/**
* The Connection object used in conjunction with the JdbcDataSource
@@ -29,7 +29,7 @@
* total number of Connection objects that are created.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/03/15 04:34:50 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/04/03 04:41:42 $
*/
public class JdbcConnection
extends AbstractLoggable
1.6 +4 -4
jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/datasource/JdbcConnectionPool.java
Index: JdbcConnectionPool.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/datasource/JdbcConnectionPool.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JdbcConnectionPool.java 2001/03/15 04:34:50 1.5
+++ JdbcConnectionPool.java 2001/04/03 04:41:42 1.6
@@ -13,18 +13,18 @@
import java.util.ArrayList;
import java.util.List;
import org.apache.avalon.logger.AbstractLoggable;
-import org.apache.framework.Recyclable;
+import org.apache.avalon.pool.Recyclable;
import org.apache.framework.lifecycle.Disposable;
import org.apache.framework.lifecycle.Initializable;
-import org.apache.framework.pool.Pool;
-import org.apache.framework.pool.Poolable;
+import org.apache.avalon.pool.Pool;
+import org.apache.avalon.pool.Poolable;
/**
* The Pool implementation for JdbcConnections. It uses a background
* thread to manage the number of SQL Connections.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.5 $ $Date: 2001/03/15 04:34:50 $
+ * @version CVS $Revision: 1.6 $ $Date: 2001/04/03 04:41:42 $
*/
public class JdbcConnectionPool
extends AbstractLoggable
1.4 +1 -1
jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/pool/ThreadSafePool.java
Index: ThreadSafePool.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/pool/ThreadSafePool.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ThreadSafePool.java 2001/04/02 04:06:30 1.3
+++ ThreadSafePool.java 2001/04/03 04:41:44 1.4
@@ -7,7 +7,7 @@
*/
package org.apache.avalon.pool;
-import org.apache.framework.ThreadSafe;
+import org.apache.framework.thread.ThreadSafe;
/**
* This is a implementation of <code>Pool</code> that is thread safe.
1.3 +2 -2
jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/thread/DefaultThreadPool.java
Index: DefaultThreadPool.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/thread/DefaultThreadPool.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultThreadPool.java 2001/03/15 04:34:59 1.2
+++ DefaultThreadPool.java 2001/04/03 04:41:44 1.3
@@ -8,8 +8,8 @@
package org.apache.avalon.thread;
import org.apache.framework.logger.Loggable;
-import org.apache.framework.pool.ObjectFactory;
-import org.apache.framework.pool.Poolable;
+import org.apache.avalon.pool.ObjectFactory;
+import org.apache.avalon.pool.Poolable;
import org.apache.avalon.pool.ThreadSafePool;
import org.apache.framework.thread.ThreadPool;
import org.apache.log.Logger;
1.6 +2 -2
jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/thread/WorkerThread.java
Index: WorkerThread.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/thread/WorkerThread.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- WorkerThread.java 2001/03/15 04:34:59 1.5
+++ WorkerThread.java 2001/04/03 04:41:45 1.6
@@ -7,11 +7,11 @@
*/
package org.apache.avalon.thread;
+import org.apache.avalon.pool.Poolable;
import org.apache.avalon.pool.ThreadSafePool;
import org.apache.framework.logger.Loggable;
-import org.apache.framework.pool.Poolable;
-import org.apache.framework.thread.ThreadPool;
import org.apache.framework.thread.ThreadContext;
+import org.apache.framework.thread.ThreadPool;
import org.apache.log.Logger;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
