donaldp 01/11/09 13:14:31
Modified: src/java/org/apache/avalon/phoenix AbstractBlock.java
BlockContext.java package.html
src/java/org/apache/avalon/phoenix/components/application
DefaultApplication.java DefaultBlockContext.java
LifecycleHelper.java Resources.properties
src/java/org/apache/avalon/phoenix/components/classloader
AbstractPolicy.java ContextClassLoaderManager.java
DefaultClassLoaderManager.java
PolicyClassLoader.java Resources.properties
src/java/org/apache/avalon/phoenix/components/deployer
DefaultDeployer.java DefaultDeploymentRecorder.java
PersistentDeploymentRecorder.java
src/java/org/apache/avalon/phoenix/components/embeddor
DefaultEmbeddor.java
src/java/org/apache/avalon/phoenix/components/kernel
DefaultApplicationContext.java DefaultKernel.java
Resources.properties
src/java/org/apache/avalon/phoenix/components/logger
DefaultLogManager.java Resources.properties
SimpleLogKitManager.java
src/java/org/apache/avalon/phoenix/components/manager
AbstractSystemManager.java Resources.properties
src/java/org/apache/avalon/phoenix/tools/assembler
Assembler.java
src/java/org/apache/avalon/phoenix/tools/infobuilder
BlockInfoBuilder.java Resources.properties
src/java/org/apache/avalon/phoenix/tools/installer
Installer.java
src/java/org/apache/avalon/phoenix/tools/verifier
Resources.properties SarVerifier.java
Log:
Update to use LogEnabled rather than Loggable where possible.
This means that internally the Phoenix container uses LogEnabled and only
uses Loggable when a hosted block still uses the old format.
Eventually the old interface will be deprecated and removed.
Unfortunately this required a backwards incompatible change in BlockContext
so that we return a org.apache.avalon.framework.logger.Logger rather than a
org.apache.log.Logger. This should not effect a large proportion of users.
Revision Changes Path
1.4 +3 -3
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/AbstractBlock.java
Index: AbstractBlock.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/AbstractBlock.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractBlock.java 2001/09/20 10:45:14 1.3
+++ AbstractBlock.java 2001/11/09 21:14:30 1.4
@@ -17,7 +17,7 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
/**
* This is an <code>AbstractBlock</code> that makes deployment a bit
@@ -25,10 +25,10 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/09/20 10:45:14 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/11/09 21:14:30 $
*/
public abstract class AbstractBlock
- extends AbstractLoggable
+ extends AbstractLogEnabled
implements Block, Contextualizable, Composable, Configurable
{
private BlockContext m_context;
1.4 +1 -1
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/BlockContext.java
Index: BlockContext.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/BlockContext.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BlockContext.java 2001/09/28 04:17:57 1.3
+++ BlockContext.java 2001/11/09 21:14:30 1.4
@@ -10,7 +10,7 @@
import java.io.File;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.excalibur.thread.ThreadPool;
-import org.apache.log.Logger;
+import org.apache.avalon.framework.logger.Logger;
/**
* Context via which Blocks communicate with container.
1.2 +1 -1
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/package.html
Index: package.html
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/package.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- package.html 2001/05/09 08:31:06 1.1
+++ package.html 2001/11/09 21:14:30 1.2
@@ -3,4 +3,4 @@
other main Avalon packages. It acts as a Container for applications
built on top of the Avalon Framework, allowing dynamic loading
and unloading of those applications.
-</body></html>
\ No newline at end of file
+</body></html>
1.3 +2 -2
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/DefaultApplication.java
Index: DefaultApplication.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/DefaultApplication.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultApplication.java 2001/09/27 05:04:12 1.2
+++ DefaultApplication.java 2001/11/09 21:14:30 1.3
@@ -13,7 +13,7 @@
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.excalibur.lang.ThreadContext;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.phoenix.Block;
import org.apache.avalon.phoenix.BlockListener;
import org.apache.avalon.phoenix.interfaces.Application;
@@ -29,7 +29,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
public final class DefaultApplication
- extends AbstractLoggable
+ extends AbstractLogEnabled
implements Application
{
private static final Resources REZ =
1.6 +7 -6
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/DefaultBlockContext.java
Index: DefaultBlockContext.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/DefaultBlockContext.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultBlockContext.java 2001/09/28 04:16:34 1.5
+++ DefaultBlockContext.java 2001/11/09 21:14:30 1.6
@@ -14,11 +14,12 @@
import org.apache.avalon.framework.CascadingRuntimeException;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.framework.logger.Loggable;
+import org.apache.avalon.framework.logger.LogEnabled;
+import org.apache.avalon.framework.logger.Logger;
+import org.apache.avalon.framework.logger.LogKitLogger;
import org.apache.avalon.phoenix.BlockContext;
import org.apache.avalon.phoenix.metadata.SarMetaData;
import org.apache.avalon.phoenix.interfaces.ApplicationContext;
-import org.apache.log.Logger;
/**
* Context via which Blocks communicate with container.
@@ -26,7 +27,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
final class DefaultBlockContext
- implements BlockContext, Loggable
+ implements BlockContext, LogEnabled
{
private static final Resources REZ =
ResourceManager.getPackageResources( DefaultBlockContext.class );
@@ -42,7 +43,7 @@
m_frame = frame;
}
- public void setLogger( final Logger logger )
+ public void enableLogging( final Logger logger )
{
m_logger = logger;
}
@@ -118,7 +119,7 @@
*/
public Logger getLogger( final String name )
{
- return m_frame.getLogger( getName() ).getChildLogger( name );
+ return new LogKitLogger( m_frame.getLogger( getName()
).getChildLogger( name ) );
}
/**
@@ -129,6 +130,6 @@
*/
public Logger getBaseLogger()
{
- return m_frame.getLogger( getName() );
+ return new LogKitLogger( m_frame.getLogger( getName() ) );
}
}
1.18 +12 -3
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/LifecycleHelper.java
Index: LifecycleHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/LifecycleHelper.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- LifecycleHelper.java 2001/09/28 04:18:34 1.17
+++ LifecycleHelper.java 2001/11/09 21:14:30 1.18
@@ -22,8 +22,11 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.logger.Loggable;
+import org.apache.avalon.framework.logger.Logger;
+import org.apache.avalon.framework.logger.LogKitLogger;
import org.apache.avalon.phoenix.Block;
import org.apache.avalon.phoenix.BlockContext;
import org.apache.avalon.phoenix.BlockEvent;
@@ -43,7 +46,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
class LifecycleHelper
- extends AbstractLoggable
+ extends AbstractLogEnabled
{
private static final Resources REZ =
ResourceManager.getPackageResources( LifecycleHelper.class );
@@ -148,12 +151,18 @@
notice( name, stage );
final Block block = createBlock( metaData );
- //Loggable stage
+ //LogEnabled stage
stage = STAGE_LOGGER;
if( block instanceof Loggable )
{
notice( name, stage );
((Loggable)block).setLogger( m_context.getLogger( name ) );
+ }
+ else if( block instanceof LogEnabled )
+ {
+ notice( name, stage );
+ final Logger logger = new LogKitLogger( m_context.getLogger(
name ) );
+ ((LogEnabled)block).enableLogging( logger );
}
//Contextualize stage
1.17 +1 -1
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/Resources.properties
Index: Resources.properties
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/Resources.properties,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Resources.properties 2001/10/24 21:05:26 1.16
+++ Resources.properties 2001/11/09 21:14:30 1.17
@@ -12,4 +12,4 @@
lifecycle-fail.error=Block named "{0}" failed to pass through the
{1,choice,0#Creation|1#Logger
initialization|2#Contextualization|3#Composing|4#Configuration|5#Initialization|6#Starting|7#Stopping|8#Disposing|9#Destruction}
stage. (Reason: {2}).
#BlockContext Messages
-context.warn.threadpool=Warning: Accessing ThreadPools via
BlockContext.getThreadPool()\nor BlockContext.getDefaultThreadPool() is a
deprecated feature\nand developers should instead use a ThreadManager Block to
access\nThreadPools.
\ No newline at end of file
+context.warn.threadpool=Warning: Accessing ThreadPools via
BlockContext.getThreadPool()\nor BlockContext.getDefaultThreadPool() is a
deprecated feature\nand developers should instead use a ThreadManager Block to
access\nThreadPools.
1.2 +4 -4
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/AbstractPolicy.java
Index: AbstractPolicy.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/AbstractPolicy.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractPolicy.java 2001/09/24 11:15:39 1.1
+++ AbstractPolicy.java 2001/11/09 21:14:30 1.2
@@ -24,8 +24,8 @@
import java.util.PropertyPermission;
import org.apache.avalon.excalibur.io.FileUtil;
import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.logger.Loggable;
-import org.apache.log.Logger;
+import org.apache.avalon.framework.logger.LogEnabled;
+import org.apache.avalon.framework.logger.Logger;
/**
* Abstract policy extended in avalon.
@@ -34,7 +34,7 @@
*/
abstract class AbstractPolicy
extends Policy
- implements Component, Loggable
+ implements Component, LogEnabled
{
private final ArrayList m_entries = new ArrayList();
private Logger m_logger;
@@ -48,7 +48,7 @@
Permissions m_permissions;
}
- public void setLogger( final Logger logger )
+ public void enableLogging( final Logger logger )
{
m_logger = logger;
}
1.4 +2 -2
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/ContextClassLoaderManager.java
Index: ContextClassLoaderManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/ContextClassLoaderManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ContextClassLoaderManager.java 2001/10/27 22:48:01 1.3
+++ ContextClassLoaderManager.java 2001/11/09 21:14:30 1.4
@@ -3,14 +3,14 @@
import java.io.File;
import java.net.URL;
import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.phoenix.interfaces.ClassLoaderManager;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Eung-ju Park</a>
*/
public class ContextClassLoaderManager
- extends AbstractLoggable
+ extends AbstractLogEnabled
implements ClassLoaderManager
{
public ClassLoader createClassLoader( final Configuration server,
1.16 +3 -3
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/DefaultClassLoaderManager.java
Index: DefaultClassLoaderManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/DefaultClassLoaderManager.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- DefaultClassLoaderManager.java 2001/11/02 09:16:58 1.15
+++ DefaultClassLoaderManager.java 2001/11/09 21:14:30 1.16
@@ -18,7 +18,7 @@
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.phoenix.interfaces.ClassLoaderManager;
/**
@@ -36,7 +36,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
public class DefaultClassLoaderManager
- extends AbstractLoggable
+ extends AbstractLogEnabled
implements ClassLoaderManager
{
/**
@@ -95,7 +95,7 @@
throws ConfigurationException
{
final DefaultPolicy policy = new DefaultPolicy( baseDirectory );
- policy.setLogger( getLogger() );
+ policy.enableLogging( getLogger() );
policy.configure( configuration );
return policy;
}
1.11 +4 -4
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/PolicyClassLoader.java
Index: PolicyClassLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/PolicyClassLoader.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- PolicyClassLoader.java 2001/11/03 02:16:05 1.10
+++ PolicyClassLoader.java 2001/11/09 21:14:30 1.11
@@ -19,8 +19,8 @@
import java.security.Policy;
import java.util.ArrayList;
import java.util.Enumeration;
-import org.apache.avalon.framework.logger.Loggable;
-import org.apache.log.Logger;
+import org.apache.avalon.framework.logger.LogEnabled;
+import org.apache.avalon.framework.logger.Logger;
/**
* Classloader that uses a specified <code>Policy</code> object
@@ -32,7 +32,7 @@
*/
class PolicyClassLoader
extends URLClassLoader
- implements Loggable
+ implements LogEnabled
{
///Policy to use to define permissions for classes loaded in classloader
private final Policy m_policy;
@@ -73,7 +73,7 @@
}
}
- public void setLogger( final Logger logger )
+ public void enableLogging( final Logger logger )
{
m_logger = logger;
}
1.4 +1 -1
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/Resources.properties
Index: Resources.properties
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/Resources.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Resources.properties 2001/10/27 17:02:17 1.3
+++ Resources.properties 2001/11/09 21:14:30 1.4
@@ -8,4 +8,4 @@
policy.error.alias.missing=Unable to locate alias {0} in keystore named {1}.
create-connection=Cannot create connection using {0} protocol.
-parse-url=No {0}/ found in url spec: {1}
\ No newline at end of file
+parse-url=No {0}/ found in url spec: {1}
1.11 +2 -2
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/DefaultDeployer.java
Index: DefaultDeployer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/DefaultDeployer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DefaultDeployer.java 2001/11/05 23:57:59 1.10
+++ DefaultDeployer.java 2001/11/09 21:14:30 1.11
@@ -20,7 +20,7 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.phoenix.interfaces.Application;
import org.apache.avalon.phoenix.interfaces.ClassLoaderManager;
import org.apache.avalon.phoenix.interfaces.ConfigurationRepository;
@@ -45,7 +45,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
public class DefaultDeployer
- extends AbstractLoggable
+ extends AbstractLogEnabled
implements Deployer, Composable, Initializable
{
private static final Resources REZ =
1.5 +2 -2
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/DefaultDeploymentRecorder.java
Index: DefaultDeploymentRecorder.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/DefaultDeploymentRecorder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultDeploymentRecorder.java 2001/11/03 02:15:10 1.4
+++ DefaultDeploymentRecorder.java 2001/11/09 21:14:30 1.5
@@ -8,7 +8,7 @@
package org.apache.avalon.phoenix.components.deployer;
import java.util.HashMap;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.phoenix.interfaces.DeploymentException;
import org.apache.avalon.phoenix.interfaces.DeploymentRecorder;
import org.apache.avalon.phoenix.tools.installer.Installation;
@@ -19,7 +19,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Mircea Toma</a>
*/
public class DefaultDeploymentRecorder
- extends AbstractLoggable
+ extends AbstractLogEnabled
implements DeploymentRecorder
{
private final HashMap m_installations = new HashMap();
1.2 +2 -2
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/PersistentDeploymentRecorder.java
Index: PersistentDeploymentRecorder.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/PersistentDeploymentRecorder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PersistentDeploymentRecorder.java 2001/11/02 23:29:35 1.1
+++ PersistentDeploymentRecorder.java 2001/11/09 21:14:30 1.2
@@ -8,7 +8,7 @@
package org.apache.avalon.phoenix.components.deployer;
import java.io.File;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
@@ -27,7 +27,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Mircea Toma</a>
*/
-public class PersistentDeploymentRecorder extends AbstractLoggable
implements DeploymentRecorder {
+public class PersistentDeploymentRecorder extends AbstractLogEnabled
implements DeploymentRecorder {
private static final Resources REZ =
ResourceManager.getPackageResources(
PersistentDeploymentRecorder.class );
1.31 +7 -6
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/embeddor/DefaultEmbeddor.java
Index: DefaultEmbeddor.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/embeddor/DefaultEmbeddor.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- DefaultEmbeddor.java 2001/11/05 23:57:29 1.30
+++ DefaultEmbeddor.java 2001/11/09 21:14:30 1.31
@@ -24,8 +24,10 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.AvalonFormatter;
+import org.apache.avalon.framework.logger.LogKitLogger;
+import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameterizable;
import org.apache.avalon.framework.parameters.Parameters;
@@ -40,7 +42,6 @@
import org.apache.avalon.phoenix.interfaces.SystemManager;
import org.apache.log.Hierarchy;
import org.apache.log.LogTarget;
-import org.apache.log.Logger;
import org.apache.log.Priority;
import org.apache.log.output.io.FileTarget;
@@ -52,7 +53,7 @@
* @author <a href="[EMAIL PROTECTED]">Peter Donald</a>
*/
public class DefaultEmbeddor
- extends AbstractLoggable
+ extends AbstractLogEnabled
implements Embeddor, Parameterizable
{
private static final Resources REZ =
@@ -225,7 +226,7 @@
throws Exception
{
final Logger logger = createLogger();
- setLogger( logger );
+ enableLogging( logger );
String component = null;
@@ -278,12 +279,12 @@
//Create an anonymous hierarchy so no other
//components can get access to logging hierarchy
final Hierarchy hierarchy = new Hierarchy();
- final Logger logger = hierarchy.getLoggerFor( "Phoenix" );
+ final org.apache.log.Logger logger = hierarchy.getLoggerFor(
"Phoenix" );
logger.setLogTargets( new LogTarget[] { logTarget } );
logger.setPriority( Priority.getPriorityForName( logPriority ) );
logger.info( "Logger started" );
- return logger;
+ return new LogKitLogger( logger );
}
/**
1.5 +3 -3
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/DefaultApplicationContext.java
Index: DefaultApplicationContext.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/DefaultApplicationContext.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultApplicationContext.java 2001/09/27 05:04:12 1.4
+++ DefaultApplicationContext.java 2001/11/09 21:14:30 1.5
@@ -21,7 +21,7 @@
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.phoenix.interfaces.ApplicationContext;
import org.apache.avalon.phoenix.interfaces.ConfigurationRepository;
import org.apache.avalon.phoenix.metadata.SarMetaData;
@@ -34,7 +34,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
class DefaultApplicationContext
- extends AbstractLoggable
+ extends AbstractLogEnabled
implements ApplicationContext, Composable, Configurable
{
private static final Resources REZ =
@@ -185,7 +185,7 @@
final DefaultThreadPool threadPool =
new DefaultThreadPool( name, maxThreads, m_threadContext );
threadPool.setDaemon( isDaemon );
- threadPool.setLogger( getLogger() );
+ threadPool.enableLogging( getLogger() );
m_threadPools.put( name, threadPool );
}
catch( final Exception e )
1.43 +2 -2
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/DefaultKernel.java
Index: DefaultKernel.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/DefaultKernel.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- DefaultKernel.java 2001/10/23 23:03:28 1.42
+++ DefaultKernel.java 2001/11/09 21:14:30 1.43
@@ -19,7 +19,7 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.context.DefaultContext;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.phoenix.components.application.DefaultApplication;
import org.apache.avalon.phoenix.interfaces.Application;
import org.apache.avalon.phoenix.interfaces.ApplicationContext;
@@ -42,7 +42,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
public class DefaultKernel
- extends AbstractLoggable
+ extends AbstractLogEnabled
implements Kernel, Composable
{
private static final Resources REZ =
1.3 +1 -1
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/Resources.properties
Index: Resources.properties
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/Resources.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Resources.properties 2001/09/27 03:07:42 1.2
+++ Resources.properties 2001/11/09 21:14:30 1.3
@@ -8,4 +8,4 @@
frame.warn.thread-pools=Warning: Configuring ThreadPools via server.xml\nis
a deprecated feature and developers should\nuse a ThreadManager Block to access
ThreadPools\nand remove <threads/> entry from server.xml file.
frame.error.thread.missing=No such thread pool {0}.
-frame.error.thread.create=Error creating thread pool {0}.
\ No newline at end of file
+frame.error.thread.create=Error creating thread pool {0}.
1.6 +2 -2
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/logger/DefaultLogManager.java
Index: DefaultLogManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/logger/DefaultLogManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultLogManager.java 2001/11/05 23:56:51 1.5
+++ DefaultLogManager.java 2001/11/09 21:14:30 1.6
@@ -12,7 +12,7 @@
import org.apache.avalon.excalibur.logger.LogKitManager;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.context.DefaultContext;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.phoenix.BlockContext;
import org.apache.avalon.phoenix.interfaces.LogManager;
import org.apache.avalon.phoenix.metadata.SarMetaData;
@@ -24,7 +24,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
public class DefaultLogManager
- extends AbstractLoggable
+ extends AbstractLogEnabled
implements LogManager
{
public Hierarchy createHierarchy( final SarMetaData metaData,
1.2 +1 -1
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/logger/Resources.properties
Index: Resources.properties
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/logger/Resources.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Resources.properties 2001/09/26 07:29:29 1.1
+++ Resources.properties 2001/11/09 21:14:30 1.2
@@ -1,3 +1,3 @@
target.nocreate=Error creating LogTarget named "{0}" for file {0}. (Reason:
{2}).
unknown-target=Unable to locate LogTarget named "{0}" for Logger named "{1}".
-unknown-priority=Unknown priority "{0}" for Logger named "{1}".
\ No newline at end of file
+unknown-priority=Unknown priority "{0}" for Logger named "{1}".
1.3 +2 -2
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/logger/SimpleLogKitManager.java
Index: SimpleLogKitManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/logger/SimpleLogKitManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SimpleLogKitManager.java 2001/09/26 11:45:40 1.2
+++ SimpleLogKitManager.java 2001/11/09 21:14:30 1.3
@@ -19,7 +19,7 @@
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.AvalonFormatter;
import org.apache.log.Hierarchy;
import org.apache.log.LogTarget;
@@ -35,7 +35,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
public class SimpleLogKitManager
- extends AbstractLoggable
+ extends AbstractLogEnabled
implements LogKitManager, Contextualizable, Configurable
{
private static final Resources REZ =
1.5 +2 -2
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/AbstractSystemManager.java
Index: AbstractSystemManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/AbstractSystemManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractSystemManager.java 2001/09/27 05:04:13 1.4
+++ AbstractSystemManager.java 2001/11/09 21:14:31 1.5
@@ -10,7 +10,7 @@
import java.util.HashMap;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.phoenix.interfaces.ManagerException;
import org.apache.avalon.phoenix.interfaces.SystemManager;
@@ -20,7 +20,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
public abstract class AbstractSystemManager
- extends AbstractLoggable
+ extends AbstractLogEnabled
implements SystemManager
{
private static final Resources REZ =
1.3 +1 -1
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/Resources.properties
Index: Resources.properties
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/Resources.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Resources.properties 2001/08/18 10:24:08 1.2
+++ Resources.properties 2001/11/09 21:14:31 1.3
@@ -7,4 +7,4 @@
jmxmanager.error.export.fail=Unable to export {0} as mBean.
jmxmanager.error.export.fail=Unable to unexport {0} as mBean.
-jmxmanager.error.mbeanserver.create=Failed to create MBean Server of class
{0}.
\ No newline at end of file
+jmxmanager.error.mbeanserver.create=Failed to create MBean Server of class
{0}.
1.3 +6 -5
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/assembler/Assembler.java
Index: Assembler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/assembler/Assembler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Assembler.java 2001/09/26 06:45:23 1.2
+++ Assembler.java 2001/11/09 21:14:31 1.3
@@ -15,15 +15,16 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.phoenix.metadata.BlockListenerMetaData;
import org.apache.avalon.phoenix.metadata.BlockMetaData;
import org.apache.avalon.phoenix.metadata.DependencyMetaData;
import org.apache.avalon.phoenix.metadata.SarMetaData;
import org.apache.avalon.phoenix.metainfo.BlockInfo;
import org.apache.avalon.phoenix.tools.infobuilder.BlockInfoBuilder;
-import org.apache.log.Logger;
+
/**
* Assemble a <code>SarMetaData</code> object from a Configuration
* object. The Configuration object represents the assembly descriptor
@@ -32,7 +33,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
public class Assembler
- extends AbstractLoggable
+ extends AbstractLogEnabled
{
private static final Resources REZ =
ResourceManager.getPackageResources( Assembler.class );
@@ -45,9 +46,9 @@
*
* @param logger the logger to use
*/
- public void setLogger( final Logger logger )
+ public void enableLogging( final Logger logger )
{
- super.setLogger( logger );
+ super.enableLogging( logger );
setupLogger( m_builder );
}
1.3 +2 -2
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/infobuilder/BlockInfoBuilder.java
Index: BlockInfoBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/infobuilder/BlockInfoBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BlockInfoBuilder.java 2001/09/26 08:29:44 1.2
+++ BlockInfoBuilder.java 2001/11/09 21:14:31 1.3
@@ -9,7 +9,7 @@
import java.util.ArrayList;
import org.apache.avalon.framework.Version;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
@@ -28,7 +28,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
public final class BlockInfoBuilder
- extends AbstractLoggable
+ extends AbstractLogEnabled
{
private static final Resources REZ =
ResourceManager.getPackageResources( BlockInfoBuilder.class );
1.2 +1 -1
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/infobuilder/Resources.properties
Index: Resources.properties
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/infobuilder/Resources.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Resources.properties 2001/09/26 06:20:08 1.1
+++ Resources.properties 2001/11/09 21:14:31 1.2
@@ -1,4 +1,4 @@
blockinfo-created=Constructed BlockInfo object for class {0}. BlockInfo
contains {1} services and {2} dependencies.
missing-block=Warning: Unspecified <block/> section in BlockInfo for class
{0}.
redundent-role=Warning: BlockInfo for class {0} redundently specifies role
name "{1}" in dependency when it is identical to the name of service. It is
recomended that the <role/> section be elided.
-creating-blockinfo=Creating a BlockInfo for class "{0}".
\ No newline at end of file
+creating-blockinfo=Creating a BlockInfo for class "{0}".
1.18 +2 -2
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/installer/Installer.java
Index: Installer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/installer/Installer.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Installer.java 2001/11/01 22:56:58 1.17
+++ Installer.java 2001/11/09 21:14:31 1.18
@@ -29,7 +29,7 @@
import org.apache.avalon.excalibur.io.ExtensionFileFilter;
import org.apache.avalon.excalibur.io.FileUtil;
import org.apache.avalon.excalibur.io.IOUtil;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
/**
* An Installer is responsible for taking a URL for Sar
@@ -38,7 +38,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
public class Installer
- extends AbstractLoggable
+ extends AbstractLogEnabled
{
private static final Resources REZ =
ResourceManager.getPackageResources( Installer.class );
1.6 +1 -1
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/verifier/Resources.properties
Index: Resources.properties
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/verifier/Resources.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Resources.properties 2001/09/26 06:45:23 1.5
+++ Resources.properties 2001/11/09 21:14:31 1.6
@@ -22,4 +22,4 @@
verify-block-type=Verifying that the specified Blocks have valid types.
verify-listener-type=Verifying that the specified BlockListeners have valid
types.
-service-interface-deprecated=Warning: The Block named "{0}" exports a
service ({1}) that extends org.apache.avalon.phoenix.Service. The Service
interface is deprecated and should not be used.
\ No newline at end of file
+service-interface-deprecated=Warning: The Block named "{0}" exports a
service ({1}) that extends org.apache.avalon.phoenix.Service. The Service
interface is deprecated and should not be used.
1.6 +2 -2
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/verifier/SarVerifier.java
Index: SarVerifier.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/verifier/SarVerifier.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SarVerifier.java 2001/09/26 06:45:23 1.5
+++ SarVerifier.java 2001/11/09 21:14:31 1.6
@@ -13,7 +13,7 @@
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.phoenix.Block;
import org.apache.avalon.phoenix.BlockListener;
import org.apache.avalon.phoenix.Service;
@@ -53,7 +53,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
public class SarVerifier
- extends AbstractLoggable
+ extends AbstractLogEnabled
{
private static final Resources REZ =
ResourceManager.getPackageResources( SarVerifier.class );
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
