bloritsch 01/10/31 13:21:14
Modified: src/java/org/apache/avalon/excalibur/component
DefaultComponentFactory.java
src/java/org/apache/avalon/excalibur/testcase
ExcaliburTestCase.java
src/scratchpad/org/apache/avalon/excalibur/i18n
BundleSelector.java
src/scratchpad/org/apache/avalon/excalibur/i18n/test
DefaultBundleLoaderTestCase.java
DefaultBundleLoaderTestCase.xtest
XmlBundleTestCase.xtest
src/scratchpad/org/apache/avalon/excalibur/thread/impl
DefaultThreadPool.java WorkerThread.java
src/test/org/apache/avalon/excalibur/logger/test
TestComponent.java TestComponentImpl.java
Log:
More logging fixes
Revision Changes Path
1.7 +3 -2
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultComponentFactory.java 2001/08/29 14:38:16 1.6
+++ DefaultComponentFactory.java 2001/10/31 21:21:13 1.7
@@ -20,6 +20,7 @@
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.avalon.framework.logger.Loggable;
+import org.apache.avalon.framework.logger.LogKitLogger;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.avalon.excalibur.pool.ObjectFactory;
import org.apache.avalon.excalibur.logger.LogKitManager;
@@ -30,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.6 $ $Date: 2001/08/29 14:38:16 $
+ * @version CVS $Revision: 1.7 $ $Date: 2001/10/31 21:21:13 $
* @since 4.0
*/
public class DefaultComponentFactory
@@ -118,7 +119,7 @@
else
{
getLogger().debug( "logger attribute is " + logger );
- ((Loggable)component).setLogger( m_logkit.getLogger(
logger ) );
+ ((Loggable)component).setLogger( new LogKitLogger(
m_logkit.getLogger( logger ) ) );
}
}
}
1.12 +5 -4
jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/testcase/ExcaliburTestCase.java
Index: ExcaliburTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/testcase/ExcaliburTestCase.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ExcaliburTestCase.java 2001/10/31 17:56:44 1.11
+++ ExcaliburTestCase.java 2001/10/31 21:21:13 1.12
@@ -19,13 +19,14 @@
import org.apache.avalon.framework.context.DefaultContext;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.logger.Logger;
+import org.apache.avalon.framework.logger.LogKitLogger;
import org.apache.avalon.excalibur.component.DefaultRoleManager;
import org.apache.avalon.excalibur.component.ExcaliburComponentManager;
import org.apache.avalon.excalibur.logger.DefaultLogKitManager;
import org.apache.log.Hierarchy;
-import org.apache.log.Logger;
import org.apache.log.LogTarget;
import org.apache.log.Priority;
import org.apache.log.format.PatternFormatter;
@@ -145,7 +146,7 @@
* </pre>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version $Id: ExcaliburTestCase.java,v 1.11 2001/10/31 17:56:44 neeme Exp
$
+ * @version $Id: ExcaliburTestCase.java,v 1.12 2001/10/31 21:21:13 bloritsch
Exp $
*/
public class ExcaliburTestCase
extends TestCase
@@ -339,14 +340,14 @@
//FIXME(GP): This method should setup a LogConfigurator and
LogManager
// according to the configuration spec. not yet
completed/implemented
// It will return a default logger for now.
- final Logger logger = Hierarchy.getDefaultHierarchy().getLoggerFor(
getName() );
+ final org.apache.log.Logger logger =
Hierarchy.getDefaultHierarchy().getLoggerFor( getName() );
logger.setPriority( m_logPriority );
final PatternFormatter formatter = new PatternFormatter( FORMAT );
final StreamTarget target = new StreamTarget( System.out, formatter
);
logger.setLogTargets( new LogTarget[] { target } );
- return logger;
+ return new LogKitLogger(logger);
}
/**
1.4 +3 -3
jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/i18n/BundleSelector.java
Index: BundleSelector.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/i18n/BundleSelector.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BundleSelector.java 2001/10/31 20:46:05 1.3
+++ BundleSelector.java 2001/10/31 21:21:14 1.4
@@ -29,7 +29,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Neeme Praks</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Mike Engelhart</a>
- * @version $Id: BundleSelector.java,v 1.3 2001/10/31 20:46:05 bloritsch Exp
$
+ * @version $Id: BundleSelector.java,v 1.4 2001/10/31 21:21:14 bloritsch Exp
$
*/
public class BundleSelector
@@ -37,8 +37,8 @@
{
/**
- * The role implemented by an <code>BundleSelector</code>.
- */
+ * The role implemented by an <code>BundleSelector</code>.
+ */
public static String ROLE =
"org.apache.avalon.excalibur.i18n.BundleSelector";
/** Component Manager */
1.3 +4 -2
jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/i18n/test/DefaultBundleLoaderTestCase.java
Index: DefaultBundleLoaderTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/i18n/test/DefaultBundleLoaderTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultBundleLoaderTestCase.java 2001/10/31 20:46:05 1.2
+++ DefaultBundleLoaderTestCase.java 2001/10/31 21:21:14 1.3
@@ -19,7 +19,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Neeme Praks</a>
- * @version $Id: DefaultBundleLoaderTestCase.java,v 1.2 2001/10/31 20:46:05
bloritsch Exp $
+ * @version $Id: DefaultBundleLoaderTestCase.java,v 1.3 2001/10/31 21:21:14
bloritsch Exp $
*/
public class DefaultBundleLoaderTestCase extends ExcaliburTestCase {
@@ -30,12 +30,14 @@
}
public void setUp() throws Exception {
- this.bundleSelector = (BundleSelector)
manager.lookup(BundleSelector.ROLE);
+ super.setUp();
+ this.bundleSelector = (BundleSelector)
this.manager.lookup(BundleSelector.ROLE);
}
public void tearDown() throws Exception {
manager.release(this.bundleSelector);
this.bundleSelector = null;
+ super.tearDown();
}
public void testLoading() throws Exception {
1.2 +20 -17
jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/i18n/test/DefaultBundleLoaderTestCase.xtest
Index: DefaultBundleLoaderTestCase.xtest
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/i18n/test/DefaultBundleLoaderTestCase.xtest,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultBundleLoaderTestCase.xtest 2001/10/31 19:56:47 1.1
+++ DefaultBundleLoaderTestCase.xtest 2001/10/31 21:21:14 1.2
@@ -10,23 +10,26 @@
<role name="org.apache.avalon.excalibur.xml.xpath.XPathProcessor"
shorthand="xpath-processor"
default-class="org.apache.avalon.excalibur.xml.xpath.XPathProcessorImpl"/>
<role name="org.apache.avalon.excalibur.i18n.BundleSelector"
shorthand="bundle-selector"
default-class="org.apache.avalon.excalibur.i18n.BundleSelector"/>
</roles>
- <components>
- <bundle-selector>
- <loaders>
- <loader type-name="xml"
bundle="org.apache.avalon.excalibur.i18n.XmlBundle"
class="org.apache.avalon.excalibur.i18n.DefaultBundleLoader"
mapper="org.apache.avalon.excalibur.i18n.DefaultMapper">
- <prefix>file:///root/path/to/xml/files/</prefix>
- <suffix>.xml</suffix>
- <load-on-startup>
- <!-- implementation specific parameters -->
- <all/>
- </load-on-startup>
- </loader>
- </loaders>
- <matchers default-type="xml">
- <!--matcher
class="org.apache.avalon.excalibur.i18n.DefaultMatcher" type="xml"/-->
- </matchers>
- </bundle-selector>
- </components>
+ <context/>
+ <logkit/>
+ <components>
+ <bundle-selector>
+ <loaders>
+ <loader type-name="xml"
bundle="org.apache.avalon.excalibur.i18n.XmlBundle"
class="org.apache.avalon.excalibur.i18n.DefaultBundleLoader"
mapper="org.apache.avalon.excalibur.i18n.DefaultMapper">
+ <prefix>file:///root/path/to/xml/files/</prefix>
+ <suffix>.xml</suffix>
+ <load-on-startup>
+ <!-- implementation specific parameters -->
+ <all/>
+ </load-on-startup>
+ </loader>
+ </loaders>
+ <matchers default-type="xml">
+ <!--matcher
class="org.apache.avalon.excalibur.i18n.DefaultMatcher" type="xml"/-->
+ </matchers>
+ </bundle-selector>
+ <xpath-processor/>
+ </components>
<configuration>
</configuration>
</testcase>
1.2 +5 -0
jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/i18n/test/XmlBundleTestCase.xtest
Index: XmlBundleTestCase.xtest
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/i18n/test/XmlBundleTestCase.xtest,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XmlBundleTestCase.xtest 2001/10/31 19:56:47 1.1
+++ XmlBundleTestCase.xtest 2001/10/31 21:21:14 1.2
@@ -9,4 +9,9 @@
<roles>
<role name="org.apache.avalon.excalibur.xml.xpath.XPathProcessor"
shorthand="xpath-processor"
default-class="org.apache.avalon.excalibur.xml.xpath.XPathProcessorImpl"/>
</roles>
+ <context/>
+ <logkit/>
+ <components>
+ <xpath-processor/>
+ </components>
</testcase>
1.3 +7 -1
jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/thread/impl/DefaultThreadPool.java
Index: DefaultThreadPool.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/thread/impl/DefaultThreadPool.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultThreadPool.java 2001/10/25 17:04:30 1.2
+++ DefaultThreadPool.java 2001/10/31 21:21:14 1.3
@@ -15,7 +15,8 @@
import org.apache.avalon.excalibur.thread.ThreadControl;
import org.apache.avalon.framework.activity.Executable;
import org.apache.avalon.framework.logger.Loggable;
-import org.apache.log.Logger;
+import org.apache.avalon.framework.logger.Logger;
+import org.apache.avalon.framework.logger.LogKitLogger;
/**
* This class is the public frontend for the thread pool code.
@@ -69,6 +70,11 @@
{
m_logger.fatalError( "Could not initialize the pool", e );
}
+ }
+
+ public void setLogger( final org.apache.log.Logger logger )
+ {
+ setLogger( new LogKitLogger( logger ) );
}
public Object newInstance()
1.2 +7 -1
jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/thread/impl/WorkerThread.java
Index: WorkerThread.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/thread/impl/WorkerThread.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WorkerThread.java 2001/09/19 10:39:46 1.1
+++ WorkerThread.java 2001/10/31 21:21:14 1.2
@@ -13,7 +13,8 @@
import org.apache.avalon.excalibur.thread.ThreadControl;
import org.apache.avalon.framework.activity.Executable;
import org.apache.avalon.framework.logger.Loggable;
-import org.apache.log.Logger;
+import org.apache.avalon.framework.logger.Logger;
+import org.apache.avalon.framework.logger.LogKitLogger;
/**
* This class extends the Thread class to add recyclable functionalities.
@@ -56,6 +57,11 @@
public void setLogger( final Logger logger )
{
m_logger = logger;
+ }
+
+ public void setLogger( final org.apache.log.Logger logger )
+ {
+ setLogger( new LogKitLogger( logger ) );
}
/**
1.4 +2 -2
jakarta-avalon-excalibur/src/test/org/apache/avalon/excalibur/logger/test/TestComponent.java
Index: TestComponent.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/src/test/org/apache/avalon/excalibur/logger/test/TestComponent.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestComponent.java 2001/08/25 15:16:49 1.3
+++ TestComponent.java 2001/10/31 21:21:14 1.4
@@ -8,13 +8,13 @@
package org.apache.avalon.excalibur.logger.test;
import org.apache.avalon.framework.component.Component;
-import org.apache.log.Logger;
+import org.apache.avalon.framework.logger.Logger;
/**
* TestComponent.
*
* @author <a href="mailto:[EMAIL PROTECTED],org">Giacomo Pati</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/08/25 15:16:49 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/10/31 21:21:14 $
*/
public interface TestComponent
extends Component
1.5 +11 -11
jakarta-avalon-excalibur/src/test/org/apache/avalon/excalibur/logger/test/TestComponentImpl.java
Index: TestComponentImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/src/test/org/apache/avalon/excalibur/logger/test/TestComponentImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestComponentImpl.java 2001/08/29 14:38:16 1.4
+++ TestComponentImpl.java 2001/10/31 21:21:14 1.5
@@ -8,28 +8,28 @@
package org.apache.avalon.excalibur.logger.test;
import org.apache.avalon.framework.logger.AbstractLoggable;
-import org.apache.log.Logger;
+import org.apache.avalon.framework.logger.Logger;
import org.apache.log.LogTarget;
/**
* TestComponent.
*
* @author <a href="mailto:[EMAIL PROTECTED],org">Giacomo Pati</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/08/29 14:38:16 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/10/31 21:21:14 $
*/
-public class TestComponentImpl
+public class TestComponentImpl
extends AbstractLoggable
implements TestComponent
{
- public void test( Logger defaultLogger, String message )
+ public void test( Logger defaultLogger, String message )
{
final Logger logger = getLogger();
- final String cat = logger.getCategory();
- defaultLogger.info( "Category is " + cat );
- logger.debug( message );
- logger.info( message );
- logger.warn( message );
- logger.error( message );
- logger.fatalError( message );
+ //final String cat = logger.getCategory();
+ //defaultLogger.info( "Category is " + cat );
+ logger.debug( message );
+ logger.info( message );
+ logger.warn( message );
+ logger.error( message );
+ logger.fatalError( message );
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
