bloritsch 01/10/31 13:40:59
Modified: src/java/org/apache/avalon/excalibur/component
DefaultComponentFactory.java
DefaultComponentHandler.java
PoolableComponentHandler.java
ThreadSafeComponentHandler.java
src/java/org/apache/avalon/excalibur/datasource
Jdbc2Connection.java Jdbc3Connection.java
Log:
More logging fixes
Revision Changes Path
1.8 +2 -6
jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/component/DefaultComponentFactory.java
Index: DefaultComponentFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/component/DefaultComponentFactory.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultComponentFactory.java 2001/10/31 21:21:13 1.7
+++ DefaultComponentFactory.java 2001/10/31 21:40:59 1.8
@@ -31,7 +31,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Paul Russell</a>
- * @version CVS $Revision: 1.7 $ $Date: 2001/10/31 21:21:13 $
+ * @version CVS $Revision: 1.8 $ $Date: 2001/10/31 21:40:59 $
* @since 4.0
*/
public class DefaultComponentFactory
@@ -100,11 +100,7 @@
if( component instanceof Loggable )
{
- if( null == m_logkit )
- {
- ((Loggable)component).setLogger( getLogger() );
- }
- else if( m_configuration == null )
+ if( null == m_logkit || null == m_configuration )
{
((Loggable)component).setLogger( getLogger() );
}
1.5 +2 -2
jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/component/DefaultComponentHandler.java
Index: DefaultComponentHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/component/DefaultComponentHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultComponentHandler.java 2001/08/25 14:52:59 1.4
+++ DefaultComponentHandler.java 2001/10/31 21:40:59 1.5
@@ -14,14 +14,14 @@
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.avalon.excalibur.logger.LogKitManager;
-import org.apache.log.Logger;
+import org.apache.avalon.framework.logger.Logger;
/**
* The DefaultComponentHandler to make sure components are initialized
* and destroyed correctly.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/08/25 14:52:59 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/10/31 21:40:59 $
* @since 4.0
*/
class DefaultComponentHandler
1.5 +2 -2
jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/component/PoolableComponentHandler.java
Index: PoolableComponentHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/component/PoolableComponentHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PoolableComponentHandler.java 2001/08/25 14:52:59 1.4
+++ PoolableComponentHandler.java 2001/10/31 21:40:59 1.5
@@ -14,14 +14,14 @@
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.excalibur.pool.Poolable;
import org.apache.avalon.excalibur.logger.LogKitManager;
-import org.apache.log.Logger;
+import org.apache.avalon.framework.logger.Logger;
/**
* The PoolableComponentHandler to make sure components are initialized
* and destroyed correctly.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/08/25 14:52:59 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/10/31 21:40:59 $
* @since 4.0
*/
public class PoolableComponentHandler extends ComponentHandler {
1.5 +3 -6
jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/component/ThreadSafeComponentHandler.java
Index: ThreadSafeComponentHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/component/ThreadSafeComponentHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ThreadSafeComponentHandler.java 2001/08/25 14:52:59 1.4
+++ ThreadSafeComponentHandler.java 2001/10/31 21:40:59 1.5
@@ -14,14 +14,14 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.excalibur.logger.LogKitManager;
-import org.apache.log.Logger;
+import org.apache.avalon.framework.logger.Logger;
/**
* The ThreadSafeComponentHandler to make sure components are initialized
* and destroyed correctly.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/08/25 14:52:59 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/10/31 21:40:59 $
* @since 4.0
*/
public class ThreadSafeComponentHandler extends ComponentHandler {
@@ -60,10 +60,7 @@
public void setLogger(Logger log)
{
- if (m_factory != null)
- {
- m_factory.setLogger(log);
- }
+ m_factory.setLogger(log);
super.setLogger(log);
}
1.6 +2 -2
jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/datasource/Jdbc2Connection.java
Index: Jdbc2Connection.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/datasource/Jdbc2Connection.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Jdbc2Connection.java 2001/08/14 16:26:09 1.5
+++ Jdbc2Connection.java 2001/10/31 21:40:59 1.6
@@ -20,7 +20,7 @@
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.avalon.excalibur.pool.Pool;
-import org.apache.log.Logger;
+import org.apache.avalon.framework.logger.Logger;
/**
* The Connection object used in conjunction with the JdbcDataSource
@@ -31,7 +31,7 @@
* total number of Connection objects that are created.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.5 $ $Date: 2001/08/14 16:26:09 $
+ * @version CVS $Revision: 1.6 $ $Date: 2001/10/31 21:40:59 $
* @since 4.0
*/
public class JdbcConnection
1.6 +2 -2
jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/datasource/Jdbc3Connection.java
Index: Jdbc3Connection.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/datasource/Jdbc3Connection.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Jdbc3Connection.java 2001/08/14 16:26:09 1.5
+++ Jdbc3Connection.java 2001/10/31 21:40:59 1.6
@@ -20,7 +20,7 @@
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.avalon.excalibur.pool.Pool;
-import org.apache.log.Logger;
+import org.apache.avalon.framework.logger.Logger;
/**
* The Connection object used in conjunction with the JdbcDataSource
@@ -31,7 +31,7 @@
* total number of Connection objects that are created.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.5 $ $Date: 2001/08/14 16:26:09 $
+ * @version CVS $Revision: 1.6 $ $Date: 2001/10/31 21:40:59 $
* @since 4.0
*/
public class JdbcConnection
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
