geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r651684 [7/8] - in /geronimo/server/trunk: ./ assemblies/geronimo-boilerplate-minimal/ assemblies/geronimo-boilerplate-minimal/src/main/assembly/ assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/ assemblies/geronimo-boilerplate...
Date Fri, 25 Apr 2008 19:13:26 GMT
Modified: geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/MasterRemoteControl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/MasterRemoteControl.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/MasterRemoteControl.java (original)
+++ geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/MasterRemoteControl.java Fri Apr 25 12:11:52 2008
@@ -50,8 +50,8 @@
 import javax.naming.InitialContext;
 import javax.sql.DataSource;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.geronimo.monitoring.snapshot.SnapshotConfigXMLBuilder;
 import org.apache.geronimo.monitoring.snapshot.SnapshotDBHelper;
 import org.apache.geronimo.monitoring.snapshot.SnapshotProcessor;
@@ -65,7 +65,7 @@
 @Local(MasterRemoteControlLocal.class)
 @PermitAll
 public class MasterRemoteControl {
-    private static Log log = LogFactory.getLog(MasterRemoteControl.class);
+    private final Logger log = LoggerFactory.getLogger(getClass());
     
     // mbean server to talk to other components
     private static MBeanServer mbServer = null;

Modified: geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/snapshot/SnapshotProcessor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/snapshot/SnapshotProcessor.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/snapshot/SnapshotProcessor.java (original)
+++ geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/snapshot/SnapshotProcessor.java Fri Apr 25 12:11:52 2008
@@ -28,8 +28,8 @@
 import javax.naming.Context;
 import javax.naming.InitialContext;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.geronimo.monitoring.MBeanHelper;
 import org.apache.geronimo.monitoring.MasterRemoteControlLocal;
 
@@ -39,7 +39,7 @@
  */
 public class SnapshotProcessor {
     
-    private static Log log = LogFactory.getLog(SnapshotProcessor.class);
+    private static final Logger log = LoggerFactory.getLogger(SnapshotProcessor.class);
     
     /**
      * Collects JSR-77 statistics for all mbeans that have been chosen to 

Modified: geronimo/server/trunk/plugins/monitoring/agent-jar/src/main/java/org/apache/geronimo/monitoring/snapshot/SnapshotConfigXMLBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/agent-jar/src/main/java/org/apache/geronimo/monitoring/snapshot/SnapshotConfigXMLBuilder.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/agent-jar/src/main/java/org/apache/geronimo/monitoring/snapshot/SnapshotConfigXMLBuilder.java (original)
+++ geronimo/server/trunk/plugins/monitoring/agent-jar/src/main/java/org/apache/geronimo/monitoring/snapshot/SnapshotConfigXMLBuilder.java Fri Apr 25 12:11:52 2008
@@ -24,15 +24,15 @@
 import javax.xml.bind.Marshaller;
 import javax.xml.bind.Unmarshaller;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.geronimo.monitoring.MonitorConstants;
 
 /**
  * In charge of dealing with the XML processing of the snapshot's data.
  */
 public class SnapshotConfigXMLBuilder {
-    private static Log log = LogFactory.getLog(SnapshotConfigXMLBuilder.class);
+    private static final Logger log = LoggerFactory.getLogger(SnapshotConfigXMLBuilder.class);
     
     private static final String pathToXML = 
         System.getProperty("org.apache.geronimo.home.dir") + "/var/monitoring/snapshot-config.xml";

Modified: geronimo/server/trunk/plugins/monitoring/agent-jar/src/main/java/org/apache/geronimo/monitoring/snapshot/SnapshotDBHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/agent-jar/src/main/java/org/apache/geronimo/monitoring/snapshot/SnapshotDBHelper.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/agent-jar/src/main/java/org/apache/geronimo/monitoring/snapshot/SnapshotDBHelper.java (original)
+++ geronimo/server/trunk/plugins/monitoring/agent-jar/src/main/java/org/apache/geronimo/monitoring/snapshot/SnapshotDBHelper.java Fri Apr 25 12:11:52 2008
@@ -30,12 +30,12 @@
 
 import javax.sql.DataSource;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.geronimo.monitoring.MonitorConstants;
 
 public class SnapshotDBHelper {
-    private static Log log = LogFactory.getLog(SnapshotDBHelper.class);
+    private final Logger log = LoggerFactory.getLogger(getClass());
     // Connection object used for DB interaction
     private static Connection conn = null;
     // Data Sources

Modified: geronimo/server/trunk/plugins/monitoring/agent-jmx/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/agent-jmx/pom.xml?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/agent-jmx/pom.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/agent-jmx/pom.xml Fri Apr 25 12:11:52 2008
@@ -25,11 +25,10 @@
         <groupId>org.apache.geronimo.plugins.monitoring</groupId>
         <artifactId>monitoring</artifactId>
         <version>2.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>agent-jmx</artifactId>
-    <name>Geronimo Monitoring :: Monitoring Agent :: JMX</name>
+    <name>Geronimo Plugins, Monitoring :: Agent JMX</name>
     <description>Geronimo Monitoring Agent JMX</description>
 
     <dependencies>

Modified: geronimo/server/trunk/plugins/monitoring/agent-jmx/src/main/java/org/apache/geronimo/monitoring/MasterRemoteControlJMX.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/agent-jmx/src/main/java/org/apache/geronimo/monitoring/MasterRemoteControlJMX.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/agent-jmx/src/main/java/org/apache/geronimo/monitoring/MasterRemoteControlJMX.java (original)
+++ geronimo/server/trunk/plugins/monitoring/agent-jmx/src/main/java/org/apache/geronimo/monitoring/MasterRemoteControlJMX.java Fri Apr 25 12:11:52 2008
@@ -41,8 +41,8 @@
 import javax.naming.NamingException;
 import javax.sql.DataSource;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 import org.apache.geronimo.connector.outbound.ManagedConnectionFactoryWrapper;
@@ -64,7 +64,7 @@
  * between the management node and the data in the server node.
  */
 public class MasterRemoteControlJMX implements GBeanLifecycle {
-    private static Log log = LogFactory.getLog(MasterRemoteControlJMX.class);
+    private final Logger log = LoggerFactory.getLogger(getClass());
 
     // mbean server to talk to other components
     private static MBeanServer mbServer = null;

Modified: geronimo/server/trunk/plugins/monitoring/agent-jmx/src/main/java/org/apache/geronimo/monitoring/snapshot/SnapshotProcessor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/agent-jmx/src/main/java/org/apache/geronimo/monitoring/snapshot/SnapshotProcessor.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/agent-jmx/src/main/java/org/apache/geronimo/monitoring/snapshot/SnapshotProcessor.java (original)
+++ geronimo/server/trunk/plugins/monitoring/agent-jmx/src/main/java/org/apache/geronimo/monitoring/snapshot/SnapshotProcessor.java Fri Apr 25 12:11:52 2008
@@ -29,8 +29,8 @@
 import javax.naming.Context;
 import javax.naming.InitialContext;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.geronimo.monitoring.MBeanHelper;
 import org.apache.geronimo.monitoring.MasterRemoteControlJMX;
 import org.apache.geronimo.monitoring.snapshot.SnapshotConfigXMLBuilder;
@@ -41,7 +41,7 @@
  */
 public class SnapshotProcessor {
     
-    private static Log log = LogFactory.getLog(SnapshotProcessor.class);
+    private static final Logger log = LoggerFactory.getLogger(SnapshotProcessor.class);
     
     /**
      * Collects JSR-77 statistics for all mbeans that have been chosen to 

Modified: geronimo/server/trunk/plugins/monitoring/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/pom.xml?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/pom.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/pom.xml Fri Apr 25 12:11:52 2008
@@ -34,33 +34,17 @@
     <artifactId>monitoring</artifactId>
     <name>Geronimo Plugins, Monitoring</name>
     <packaging>pom</packaging>
-    <!-- <version>1.0-SNAPSHOT</version> -->
 
     <description> Geronimo Monitoring and Management </description>
 
     <properties>
         <!--
-        NOTE: Project version, to be used instead of ${pom.version} since that
-              value magically changes when using SNAPSHOT versions.
-
-              This value *must* be kept in sync with the value of the <version>
-              element, and it will need to be changed manually before a release,
-              as the maven-release-plugin will not update this value.
+        FIXME: WTF are these for?  Drop them...
         -->
-        <!-- used in the plans
-        <version>1.0-SNAPSHOT</version> -->
         <monitoringConsoleVersion>2.2-SNAPSHOT</monitoringConsoleVersion>
         <consoleVersion>2.2-SNAPSHOT</consoleVersion>
     </properties>
 
-    <dependencies>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-    
     <modules>
         <module>agent</module>
         <module>agent-ds</module>

Modified: geronimo/server/trunk/plugins/myfaces/geronimo-myfaces-builder/src/main/java/org/apache/geronimo/myfaces/deployment/MyFacesModuleBuilderExtension.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/myfaces/geronimo-myfaces-builder/src/main/java/org/apache/geronimo/myfaces/deployment/MyFacesModuleBuilderExtension.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/myfaces/geronimo-myfaces-builder/src/main/java/org/apache/geronimo/myfaces/deployment/MyFacesModuleBuilderExtension.java (original)
+++ geronimo/server/trunk/plugins/myfaces/geronimo-myfaces-builder/src/main/java/org/apache/geronimo/myfaces/deployment/MyFacesModuleBuilderExtension.java Fri Apr 25 12:11:52 2008
@@ -30,8 +30,8 @@
 
 import javax.faces.webapp.FacesServlet;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.deployment.ModuleIDBuilder;
 import org.apache.geronimo.deployment.service.EnvironmentBuilder;
@@ -75,7 +75,7 @@
  */
 public class MyFacesModuleBuilderExtension implements ModuleBuilderExtension {
 
-    private static final Log log = LogFactory.getLog(MyFacesModuleBuilderExtension.class);
+    private static final Logger log = LoggerFactory.getLogger(MyFacesModuleBuilderExtension.class);
 
     private final Environment defaultEnvironment;
     private final AbstractNameQuery providerFactoryNameQuery;

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java Fri Apr 25 12:11:52 2008
@@ -39,8 +39,8 @@
 import javax.ejb.TimerService;
 import javax.xml.namespace.QName;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.connector.ResourceAdapterWrapperGBean;
 import org.apache.geronimo.deployment.ClassPathList;
@@ -138,7 +138,7 @@
  * @version $Revision: 479481 $ $Date: 2006-11-26 16:52:20 -0800 (Sun, 26 Nov 2006) $
  */
 public class EjbModuleBuilder implements ModuleBuilder, GBeanLifecycle {
-    private static final Log log = LogFactory.getLog(EjbModuleBuilder.class);
+    private final Logger log = LoggerFactory.getLogger(getClass());
 
     private static final String OPENEJBJAR_NAMESPACE = XmlUtil.OPENEJBJAR_QNAME.getNamespaceURI();
     private static final Map<String, String> NAMESPACE_UPDATES = new HashMap<String, String>();

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java Fri Apr 25 12:11:52 2008
@@ -29,8 +29,8 @@
 import java.util.Arrays;
 import java.util.ArrayList;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
@@ -69,7 +69,7 @@
  * @version $Revision: 475950 $ $Date: 2006-11-16 14:18:14 -0800 (Thu, 16 Nov 2006) $
  */
 public class EjbRefBuilder extends AbstractNamingBuilder {
-    private static final Log log = LogFactory.getLog(EjbRefBuilder.class);
+    private final Logger log = LoggerFactory.getLogger(getClass());
 
     private final QNameSet ejbRefQNameSet;
     private final QNameSet ejbLocalRefQNameSet;

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/main/java/org/apache/geronimo/openejb/cluster/infra/NetworkConnectorMonitor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/main/java/org/apache/geronimo/openejb/cluster/infra/NetworkConnectorMonitor.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/main/java/org/apache/geronimo/openejb/cluster/infra/NetworkConnectorMonitor.java (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/main/java/org/apache/geronimo/openejb/cluster/infra/NetworkConnectorMonitor.java Fri Apr 25 12:11:52 2008
@@ -25,8 +25,8 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.geronimo.clustering.Node;
 import org.apache.geronimo.clustering.SessionManagerListener;
 import org.apache.geronimo.clustering.wadi.RemoteNode;
@@ -55,7 +55,7 @@
  * @version $Rev:$ $Date:$
  */
 public class NetworkConnectorMonitor implements GBeanLifecycle {
-    private static final Log log = LogFactory.getLog(NetworkConnectorMonitor.class);
+    private final Logger log = LoggerFactory.getLogger(getClass());
     
     private final Collection<NetworkConnector> connectors;
     private final Collection<EjbDeploymentIdAccessor> idAccessors;

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/main/java/org/apache/geronimo/openejb/cluster/stateful/container/ClusteredStatefulInstanceManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/main/java/org/apache/geronimo/openejb/cluster/stateful/container/ClusteredStatefulInstanceManager.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/main/java/org/apache/geronimo/openejb/cluster/stateful/container/ClusteredStatefulInstanceManager.java (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/main/java/org/apache/geronimo/openejb/cluster/stateful/container/ClusteredStatefulInstanceManager.java Fri Apr 25 12:11:52 2008
@@ -26,8 +26,8 @@
 
 import javax.transaction.TransactionManager;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.geronimo.clustering.Session;
 import org.apache.geronimo.clustering.SessionAlreadyExistException;
 import org.apache.geronimo.clustering.SessionListener;
@@ -165,7 +165,7 @@
     }
     
     protected class MigrationListener implements SessionListener {
-        private final Log log = LogFactory.getLog(MigrationListener.class);
+        private final Logger log = LoggerFactory.getLogger(getClass());
 
         public void notifyInboundSessionMigration(org.apache.geronimo.clustering.Session session) {
             ClusteredBeanEntry beanEntry = new ClusteredBeanEntry(session);

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbModuleImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbModuleImpl.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbModuleImpl.java (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbModuleImpl.java Fri Apr 25 12:11:52 2008
@@ -31,15 +31,15 @@
 import org.apache.openejb.assembler.classic.EjbJarInfo;
 import org.apache.openejb.UndeployException;
 import org.apache.openejb.NoSuchApplicationException;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.logging.Log;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
 
 /**
  * @version $Revision$ $Date$
  */
 public class EjbModuleImpl implements EJBModule {
 
-    private static final Log log = LogFactory.getLog(EjbModuleImpl.class);
+    private final Logger log = LoggerFactory.getLogger(getClass());
     private final J2EEServer server;
     private final J2EEApplication application;
     private final String deploymentDescriptor;
@@ -132,7 +132,7 @@
             List<Throwable> causes = e.getCauses();
             log.error(e.getMessage()+": Encountered "+causes.size()+" failures.");
             for (Throwable throwable : causes) {
-                log.info(throwable);
+                log.info(throwable.toString(), throwable);
             }
         }
     }

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/GeronimoThreadContextListener.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/GeronimoThreadContextListener.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/GeronimoThreadContextListener.java (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/GeronimoThreadContextListener.java Fri Apr 25 12:11:52 2008
@@ -22,8 +22,8 @@
 import javax.security.auth.Subject;
 import javax.security.jacc.PolicyContext;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.geronimo.connector.outbound.connectiontracking.ConnectorInstanceContext;
 import org.apache.geronimo.connector.outbound.connectiontracking.ConnectorInstanceContextImpl;
 import org.apache.geronimo.connector.outbound.connectiontracking.TrackedConnectionAssociator;
@@ -38,7 +38,7 @@
  * @version $Rev$ $Date$
  */
 public class GeronimoThreadContextListener implements ThreadContextListener {
-    private static final Log log = LogFactory.getLog(GeronimoThreadContextListener.class);
+    private final Logger log = LoggerFactory.getLogger(getClass());
 
     // A single stateless listener is used for Geronimo
     private static final GeronimoThreadContextListener instance = new GeronimoThreadContextListener();

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java Fri Apr 25 12:11:52 2008
@@ -32,8 +32,8 @@
 import javax.resource.spi.ResourceAdapter;
 import javax.transaction.TransactionManager;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.geronimo.connector.ResourceAdapterWrapper;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.AbstractNameQuery;
@@ -76,7 +76,7 @@
  * @version $Rev$ $Date$
  */
 public class OpenEjbSystemGBean implements OpenEjbSystem {
-    private static final Log log = LogFactory.getLog(OpenEjbSystemGBean.class);
+    private final Logger log = LoggerFactory.getLogger(getClass());
     private final ConfigurationFactory configurationFactory;
     private final Assembler assembler;
     private final Set<String> registeredResouceAdapters = new TreeSet<String>();

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenejbRemoteLoginModule.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenejbRemoteLoginModule.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenejbRemoteLoginModule.java (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenejbRemoteLoginModule.java Fri Apr 25 12:11:52 2008
@@ -37,8 +37,8 @@
 import javax.security.auth.login.LoginException;
 import javax.security.auth.spi.LoginModule;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.geronimo.security.SubjectId;
 import org.apache.openejb.client.ClientSecurity;
 import org.apache.openejb.client.ServerMetaData;
@@ -56,7 +56,7 @@
  * @version $Rev$ $Date$
  */
 public class OpenejbRemoteLoginModule implements LoginModule {
-    private static Log log = LogFactory.getLog(OpenejbRemoteLoginModule.class);
+    private final Logger log = LoggerFactory.getLogger(getClass());
 
 
     private static final String SECURITY_REALM_KEY = "RemoteSecurityRealm";

Modified: geronimo/server/trunk/plugins/openjpa/geronimo-openjpa/src/main/java/org/apache/geronimo/openjpa/ConfigurationMonitorGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa/geronimo-openjpa/src/main/java/org/apache/geronimo/openjpa/ConfigurationMonitorGBean.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa/geronimo-openjpa/src/main/java/org/apache/geronimo/openjpa/ConfigurationMonitorGBean.java (original)
+++ geronimo/server/trunk/plugins/openjpa/geronimo-openjpa/src/main/java/org/apache/geronimo/openjpa/ConfigurationMonitorGBean.java Fri Apr 25 12:11:52 2008
@@ -24,8 +24,8 @@
 import java.util.Collections;
 import java.util.HashMap;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.AbstractNameQuery;
 import org.apache.geronimo.gbean.GBeanLifecycle;
@@ -45,7 +45,7 @@
  * @version $Rev$ $Date$
  */
 public class ConfigurationMonitorGBean implements GBeanLifecycle {
-    private static final Log log = LogFactory.getLog(ConfigurationMonitorGBean.class);
+    private final Logger log = LoggerFactory.getLogger(getClass());
     
     private final Kernel kernel;
     private final LifecycleListener listener;

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-portlets/pom.xml?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-portlets/pom.xml Fri Apr 25 12:11:52 2008
@@ -46,7 +46,6 @@
         <dependency>
             <groupId>org.apache.pluto</groupId>
             <artifactId>pluto-taglib</artifactId>
-            <version>${plutoVersion}</version>
             <scope>provided</scope>
         </dependency>
 

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/AbstractHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/AbstractHandler.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/AbstractHandler.java (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/AbstractHandler.java Fri Apr 25 12:11:52 2008
@@ -24,8 +24,8 @@
 import javax.portlet.PortletRequest;
 import javax.portlet.PortletSession;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.geronimo.console.MultiPageAbstractHandler;
 import org.apache.geronimo.console.MultiPageModel;
 import org.apache.geronimo.deployment.xbeans.PatternType;
@@ -45,7 +45,7 @@
  * @version $Rev$ $Date$
  */
 public abstract class AbstractHandler extends MultiPageAbstractHandler {
-    private final static Log log = LogFactory.getLog(AbstractHandler.class);
+    private final Logger log = LoggerFactory.getLogger(getClass());
 
     protected final static String GET_ARCHIVE_MODE = "index";
     // 'mode' of initial portlet must be one of "index" or "list"

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/DependenciesHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/DependenciesHandler.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/DependenciesHandler.java (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/DependenciesHandler.java Fri Apr 25 12:11:52 2008
@@ -26,8 +26,8 @@
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.geronimo.console.MultiPageModel;
 
 /**
@@ -36,7 +36,7 @@
  * @version $Rev$ $Date$
  */
 public class DependenciesHandler extends AbstractHandler {
-    private static final Log log = LogFactory.getLog(DependenciesHandler.class);
+    private final Logger log = LoggerFactory.getLogger(getClass());
 
     public DependenciesHandler() {
         super(DEPENDENCIES_MODE, "/WEB-INF/view/configcreator/dependencies.jsp");

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/DeployStatusHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/DeployStatusHandler.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/DeployStatusHandler.java (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/DeployStatusHandler.java Fri Apr 25 12:11:52 2008
@@ -28,8 +28,8 @@
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.geronimo.console.MultiPageModel;
 
 /**
@@ -38,7 +38,7 @@
  * @version $Rev$ $Date$
  */
 public class DeployStatusHandler extends AbstractHandler {
-    private static final Log log = LogFactory.getLog(DisplayPlanHandler.class);
+    private final Logger log = LoggerFactory.getLogger(getClass());
 
     public DeployStatusHandler() {
         super(DEPLOY_STATUS_MODE, "/WEB-INF/view/configcreator/deployStatus.jsp");

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/DisplayPlanHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/DisplayPlanHandler.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/DisplayPlanHandler.java (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/DisplayPlanHandler.java Fri Apr 25 12:11:52 2008
@@ -29,8 +29,8 @@
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.geronimo.console.MultiPageModel;
 
 /**
@@ -39,7 +39,7 @@
  * @version $Rev$ $Date$
  */
 public class DisplayPlanHandler extends AbstractHandler {
-    private static final Log log = LogFactory.getLog(DisplayPlanHandler.class);
+    private final Logger log = LoggerFactory.getLogger(getClass());
 
     public DisplayPlanHandler() {
         super(DISPLAY_PLAN_MODE, "/WEB-INF/view/configcreator/displayPlan.jsp");

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/EnvironmentHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/EnvironmentHandler.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/EnvironmentHandler.java (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/EnvironmentHandler.java Fri Apr 25 12:11:52 2008
@@ -24,8 +24,8 @@
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.geronimo.console.MultiPageModel;
 
 /**
@@ -34,7 +34,7 @@
  * @version $Rev$ $Date$
  */
 public class EnvironmentHandler extends AbstractHandler {
-    private static final Log log = LogFactory.getLog(EnvironmentHandler.class);
+    private final Logger log = LoggerFactory.getLogger(getClass());
 
     public EnvironmentHandler() {
         super(ENVIRONMENT_MODE, "/WEB-INF/view/configcreator/environment.jsp");

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/GetArchiveHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/GetArchiveHandler.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/GetArchiveHandler.java (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/GetArchiveHandler.java Fri Apr 25 12:11:52 2008
@@ -26,8 +26,8 @@
 import javax.portlet.RenderResponse;
 
 import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.geronimo.console.MultiPageModel;
 
 /**
@@ -36,7 +36,7 @@
  * @version $Rev$ $Date$
  */
 public class GetArchiveHandler extends AbstractHandler {
-    private static final Log log = LogFactory.getLog(GetArchiveHandler.class);
+    private final Logger log = LoggerFactory.getLogger(getClass());
 
     public GetArchiveHandler() {
         super(GET_ARCHIVE_MODE, "/WEB-INF/view/configcreator/getArchive.jsp");

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/ReferencesHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/ReferencesHandler.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/ReferencesHandler.java (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/ReferencesHandler.java Fri Apr 25 12:11:52 2008
@@ -26,8 +26,8 @@
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.geronimo.console.MultiPageModel;
 
 /**
@@ -36,7 +36,7 @@
  * @version $Rev$ $Date$
  */
 public class ReferencesHandler extends AbstractHandler {
-    private static final Log log = LogFactory.getLog(ReferencesHandler.class);
+    private final Logger log = LoggerFactory.getLogger(getClass());
 
     public ReferencesHandler() {
         super(REFERENCES_MODE, "/WEB-INF/view/configcreator/references.jsp");

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/SecurityHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/SecurityHandler.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/SecurityHandler.java (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/SecurityHandler.java Fri Apr 25 12:11:52 2008
@@ -24,8 +24,8 @@
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.geronimo.console.MultiPageModel;
 
 /**
@@ -34,7 +34,7 @@
  * @version $Rev$ $Date$
  */
 public class SecurityHandler extends AbstractHandler {
-    private static final Log log = LogFactory.getLog(SecurityHandler.class);
+    private final Logger log = LoggerFactory.getLogger(getClass());
 
     public SecurityHandler() {
         super(SECURITY_MODE, "/WEB-INF/view/configcreator/security.jsp");

Modified: geronimo/server/trunk/plugins/plancreator/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/pom.xml?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/pom.xml (original)
+++ geronimo/server/trunk/plugins/plancreator/pom.xml Fri Apr 25 12:11:52 2008
@@ -35,15 +35,7 @@
     <description>
         Geronimo deployment plan creator
     </description>
-    
-    <dependencies>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-    
+
     <modules>
         <module>plancreator-portlets</module>
         <module>plancreator-console-jetty</module>

Modified: geronimo/server/trunk/plugins/pluto/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/AdminConsoleExtensionGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pluto/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/AdminConsoleExtensionGBean.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pluto/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/AdminConsoleExtensionGBean.java (original)
+++ geronimo/server/trunk/plugins/pluto/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/AdminConsoleExtensionGBean.java Fri Apr 25 12:11:52 2008
@@ -20,8 +20,8 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
@@ -41,7 +41,7 @@
  *  </gbean>
  */
 public class AdminConsoleExtensionGBean implements GBeanLifecycle {
-    private static final Log log = LogFactory.getLog(AdminConsoleExtensionGBean.class);
+    private final Logger log = LoggerFactory.getLogger(getClass());
     public static final GBeanInfo GBEAN_INFO;
     private final String pageTitle;
     private final String portletContext;

Modified: geronimo/server/trunk/plugins/pluto/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/PortalContainerServicesGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pluto/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/PortalContainerServicesGBean.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pluto/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/PortalContainerServicesGBean.java (original)
+++ geronimo/server/trunk/plugins/pluto/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/PortalContainerServicesGBean.java Fri Apr 25 12:11:52 2008
@@ -18,8 +18,8 @@
 
 package org.apache.geronimo.pluto;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
@@ -38,7 +38,7 @@
  * then provide it with references to the pluto services.
  */
 public class PortalContainerServicesGBean implements PortalContainerServices, GBeanLifecycle {
-    private static final Log log = LogFactory.getLog(PortalContainerServicesGBean.class);
+    private static final Logger log = LoggerFactory.getLogger(PortalContainerServicesGBean.class);
     
     private RenderConfigService renderConfigService;
     private PortalCallbackService portalCallbackService;

Modified: geronimo/server/trunk/plugins/pluto/pluto-support/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pluto/pluto-support/pom.xml?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pluto/pluto-support/pom.xml (original)
+++ geronimo/server/trunk/plugins/pluto/pluto-support/pom.xml Fri Apr 25 12:11:52 2008
@@ -67,11 +67,6 @@
         </dependency>
 
         <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging-api</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>commons-beanutils</groupId>
             <artifactId>commons-beanutils</artifactId>
         </dependency>

Modified: geronimo/server/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pom.xml?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pom.xml (original)
+++ geronimo/server/trunk/plugins/pom.xml Fri Apr 25 12:11:52 2008
@@ -40,6 +40,18 @@
             <version>${version}</version>
             <scope>test</scope>
         </dependency>
+        
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     
     <modules>

Modified: geronimo/server/trunk/plugins/spring/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/spring/pom.xml?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/spring/pom.xml (original)
+++ geronimo/server/trunk/plugins/spring/pom.xml Fri Apr 25 12:11:52 2008
@@ -36,7 +36,7 @@
     <description>
         Geronimo module that supplies the Spring framework in a single classloader.
     </description>
-
+    
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>

Modified: geronimo/server/trunk/plugins/system-database/geronimo-derby/src/main/java/org/apache/geronimo/derby/DerbyNetworkGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/geronimo-derby/src/main/java/org/apache/geronimo/derby/DerbyNetworkGBean.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/geronimo-derby/src/main/java/org/apache/geronimo/derby/DerbyNetworkGBean.java (original)
+++ geronimo/server/trunk/plugins/system-database/geronimo-derby/src/main/java/org/apache/geronimo/derby/DerbyNetworkGBean.java Fri Apr 25 12:11:52 2008
@@ -19,8 +19,8 @@
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.derby.drda.NetworkServerControl;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
@@ -33,7 +33,7 @@
  * @version $Rev$ $Date$
  */
 public class DerbyNetworkGBean implements GBeanLifecycle {
-    private static final Log log = LogFactory.getLog("DerbyNetwork");
+    private final Logger log = LoggerFactory.getLogger(getClass());
 
     private NetworkServerControl network;
     private String host = "localhost";

Modified: geronimo/server/trunk/plugins/system-database/geronimo-derby/src/main/java/org/apache/geronimo/derby/DerbySystemGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/geronimo-derby/src/main/java/org/apache/geronimo/derby/DerbySystemGBean.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/geronimo-derby/src/main/java/org/apache/geronimo/derby/DerbySystemGBean.java (original)
+++ geronimo/server/trunk/plugins/system-database/geronimo-derby/src/main/java/org/apache/geronimo/derby/DerbySystemGBean.java Fri Apr 25 12:11:52 2008
@@ -17,8 +17,8 @@
 
 package org.apache.geronimo.derby;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
@@ -34,7 +34,7 @@
  * @version $Rev$ $Date$
  */
 public class DerbySystemGBean implements DerbySystem, GBeanLifecycle {
-    private static final Log log = LogFactory.getLog("DerbySystem");
+    private final Logger log = LoggerFactory.getLogger(getClass());
     private static final String SYSTEM_HOME = "derby.system.home";
     private static final String SHUTDOWN_ALL = "jdbc:derby:;shutdown=true";
 

Modified: geronimo/server/trunk/plugins/system-database/geronimo-timer/src/main/java/org/apache/geronimo/timer/ExecutorFeedingTimerTask.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/geronimo-timer/src/main/java/org/apache/geronimo/timer/ExecutorFeedingTimerTask.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/geronimo-timer/src/main/java/org/apache/geronimo/timer/ExecutorFeedingTimerTask.java (original)
+++ geronimo/server/trunk/plugins/system-database/geronimo-timer/src/main/java/org/apache/geronimo/timer/ExecutorFeedingTimerTask.java Fri Apr 25 12:11:52 2008
@@ -24,8 +24,8 @@
 import javax.transaction.Synchronization;
 import javax.transaction.Status;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  *
@@ -35,7 +35,7 @@
  * */
 public class ExecutorFeedingTimerTask extends TimerTask {
 
-    private static final Log log = LogFactory.getLog(ExecutorFeedingTimerTask.class);
+    private final Logger log = LoggerFactory.getLogger(getClass());
 
     private final WorkInfo workInfo;
     private final ThreadPooledTimer threadPooledTimer;

Modified: geronimo/server/trunk/plugins/system-database/geronimo-timer/src/main/java/org/apache/geronimo/timer/NontransactionalExecutorTask.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/geronimo-timer/src/main/java/org/apache/geronimo/timer/NontransactionalExecutorTask.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/geronimo-timer/src/main/java/org/apache/geronimo/timer/NontransactionalExecutorTask.java (original)
+++ geronimo/server/trunk/plugins/system-database/geronimo-timer/src/main/java/org/apache/geronimo/timer/NontransactionalExecutorTask.java Fri Apr 25 12:11:52 2008
@@ -17,15 +17,15 @@
 
 package org.apache.geronimo.timer;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @version $Rev$ $Date$
  */
 public class NontransactionalExecutorTask implements ExecutorTask {
 
-    private static final Log log = LogFactory.getLog(NontransactionalExecutorTask.class);
+    private final Logger log = LoggerFactory.getLogger(getClass());
 
     private final Runnable userTask;
     private final WorkInfo workInfo;

Modified: geronimo/server/trunk/plugins/system-database/geronimo-timer/src/main/java/org/apache/geronimo/timer/ThreadPooledTimer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/geronimo-timer/src/main/java/org/apache/geronimo/timer/ThreadPooledTimer.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/geronimo-timer/src/main/java/org/apache/geronimo/timer/ThreadPooledTimer.java (original)
+++ geronimo/server/trunk/plugins/system-database/geronimo-timer/src/main/java/org/apache/geronimo/timer/ThreadPooledTimer.java Fri Apr 25 12:11:52 2008
@@ -35,8 +35,8 @@
 
 import java.util.concurrent.Executor;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 
 /**
@@ -47,7 +47,7 @@
  * */
 public class ThreadPooledTimer implements PersistentTimer, GBeanLifecycle {
 
-    private static final Log log = LogFactory.getLog(ThreadPooledTimer.class);
+    private final Logger log = LoggerFactory.getLogger(getClass());
 
     private final ExecutorTaskFactory executorTaskFactory;
     private final WorkerPersistence workerPersistence;

Modified: geronimo/server/trunk/plugins/system-database/geronimo-timer/src/main/java/org/apache/geronimo/timer/TransactionalExecutorTask.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/geronimo-timer/src/main/java/org/apache/geronimo/timer/TransactionalExecutorTask.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/geronimo-timer/src/main/java/org/apache/geronimo/timer/TransactionalExecutorTask.java (original)
+++ geronimo/server/trunk/plugins/system-database/geronimo-timer/src/main/java/org/apache/geronimo/timer/TransactionalExecutorTask.java Fri Apr 25 12:11:52 2008
@@ -20,14 +20,14 @@
 import javax.transaction.TransactionManager;
 import javax.transaction.Status;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @version $Rev$ $Date$
  */
 public class TransactionalExecutorTask implements ExecutorTask {
-    private static final Log log = LogFactory.getLog(TransactionalExecutorTask.class);
+    private final Logger log = LoggerFactory.getLogger(getClass());
 
     private final Runnable userTask;
     private final WorkInfo workInfo;

Modified: geronimo/server/trunk/plugins/system-database/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/pom.xml?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/pom.xml Fri Apr 25 12:11:52 2008
@@ -26,7 +26,6 @@
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
         <version>2.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
     
     <artifactId>system-database</artifactId>
@@ -36,15 +35,7 @@
     <description>
         Geronimo System Database Plugin
     </description>
-    
-    <dependencies>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-    
+
     <modules>
         <module>geronimo-derby</module>
         <module>geronimo-timer</module>

Modified: geronimo/server/trunk/plugins/system-database/sysdb-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-portlets/pom.xml?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-portlets/pom.xml Fri Apr 25 12:11:52 2008
@@ -46,7 +46,6 @@
         <dependency>
             <groupId>org.apache.pluto</groupId>
             <artifactId>pluto-taglib</artifactId>
-            <version>${plutoVersion}</version>
             <scope>provided</scope>
         </dependency>
 

Modified: geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java Fri Apr 25 12:11:52 2008
@@ -73,8 +73,8 @@
 import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.apache.commons.fileupload.portlet.PortletFileUpload;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.geronimo.connector.deployment.jsr88.ConfigPropertySetting;
 import org.apache.geronimo.connector.deployment.jsr88.ConnectionDefinition;
 import org.apache.geronimo.connector.deployment.jsr88.ConnectionDefinitionInstance;
@@ -117,7 +117,7 @@
  * @version $Rev$ $Date$
  */
 public class DatabasePoolPortlet extends BasePortlet {
-    private final static Log log = LogFactory.getLog(DatabasePoolPortlet.class);
+    private static final Logger log = LoggerFactory.getLogger(DatabasePoolPortlet.class);
     private final static Set<String> INCLUDE_ARTIFACTIDS = new HashSet<String>(Arrays.asList("system-database"));
 
     private final static Set<String> EXCLUDE_GROUPIDS = new HashSet<String>(Arrays.asList("org.apache.geronimo.modules",

Modified: geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DriverDownloader.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DriverDownloader.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DriverDownloader.java (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DriverDownloader.java Fri Apr 25 12:11:52 2008
@@ -36,8 +36,8 @@
 import java.util.Set;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.kernel.repository.FileWriteMonitor;
 import org.apache.geronimo.kernel.repository.WriteableRepository;
@@ -49,7 +49,7 @@
  * @version $Rev$ $Date$
  */
 public class DriverDownloader {
-    private final static Log log = LogFactory.getLog(DriverDownloader.class);
+    private final Logger log = LoggerFactory.getLogger(getClass());
     Random random;
 
     public Properties readDriverFile(URL url) {

Modified: geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/DBViewerPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/DBViewerPortlet.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/DBViewerPortlet.java (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/DBViewerPortlet.java Fri Apr 25 12:11:52 2008
@@ -29,12 +29,12 @@
 import javax.portlet.WindowState;
 
 import org.apache.geronimo.console.BasePortlet;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class DBViewerPortlet extends BasePortlet {
 
-    private final static Log log = LogFactory.getLog(DBViewerPortlet.class);
+    private final Logger log = LoggerFactory.getLogger(getClass());
 
     private static final int RDBMS_DERBY = 1;
 

Modified: geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/DerbyConnectionUtil.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/DerbyConnectionUtil.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/DerbyConnectionUtil.java (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/DerbyConnectionUtil.java Fri Apr 25 12:11:52 2008
@@ -24,8 +24,8 @@
 
 import javax.sql.DataSource;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.geronimo.console.util.KernelManagementHelper;
 import org.apache.geronimo.console.util.ManagementHelper;
 import org.apache.geronimo.derby.DerbySystemGBean;
@@ -48,7 +48,7 @@
  */
 public class DerbyConnectionUtil {
 
-    private final static Log log = LogFactory.getLog(DerbyConnectionUtil.class);
+    private static final Logger log = LoggerFactory.getLogger(DerbyConnectionUtil.class);
 
 	public static final String CREATE_DB_PROP = ";create=true";
 

Modified: geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/InternalDBHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/InternalDBHelper.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/InternalDBHelper.java (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/InternalDBHelper.java Fri Apr 25 12:11:52 2008
@@ -17,8 +17,8 @@
 
 package org.apache.geronimo.console.internaldb;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
@@ -29,7 +29,7 @@
 import java.util.Map;
 
 public class InternalDBHelper {
-    private final static Log log = LogFactory.getLog(InternalDBHelper.class);
+    private final Logger log = LoggerFactory.getLogger(getClass());
 
     private static final int RDBMS_DERBY = 1;
 

Modified: geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/RunSQLHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/RunSQLHelper.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/RunSQLHelper.java (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/RunSQLHelper.java Fri Apr 25 12:11:52 2008
@@ -17,8 +17,8 @@
 
 package org.apache.geronimo.console.internaldb;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.sql.Connection;
@@ -27,7 +27,7 @@
 
 public class RunSQLHelper {
 
-    private final static Log log = LogFactory.getLog(RunSQLHelper.class);
+    private final Logger log = LoggerFactory.getLogger(getClass());
 
     public static final String SQL_SUCCESS_MSG = "SQL command/s successful";
 

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java Fri Apr 25 12:11:52 2008
@@ -34,8 +34,8 @@
 
 import javax.servlet.Servlet;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.deployment.ModuleIDBuilder;
 import org.apache.geronimo.deployment.NamespaceDrivenBuilder;
@@ -105,7 +105,7 @@
  */
 public class TomcatModuleBuilder extends AbstractWebModuleBuilder implements GBeanLifecycle {
 
-    private static final Log log = LogFactory.getLog(TomcatModuleBuilder.class);
+    private static final Logger log = LoggerFactory.getLogger(TomcatModuleBuilder.class);
 
     private static final String TOMCAT_NAMESPACE = TomcatWebAppDocument.type.getDocumentElementName().getNamespaceURI();
     private static final String IS_JAVAEE = "IS_JAVAEE";
@@ -301,7 +301,7 @@
                     }
                 }
             } catch (IOException e) {
-                log.warn(e);
+                log.warn("Failed to load geronimo-web.xml", e);
             }
 
             TomcatWebAppType tomcatWebApp;

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/EngineGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/EngineGBean.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/EngineGBean.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/EngineGBean.java Fri Apr 25 12:11:52 2008
@@ -28,8 +28,8 @@
 import org.apache.catalina.Realm;
 import org.apache.catalina.Valve;
 import org.apache.catalina.core.StandardEngine;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
@@ -46,7 +46,7 @@
  */
 public class EngineGBean extends BaseGBean implements GBeanLifecycle, ObjectRetriever {
 
-    private static final Log log = LogFactory.getLog(EngineGBean.class);
+    private final Logger log = LoggerFactory.getLogger(getClass());
 
     private static final String NAME = "name";
     private static final String DEFAULTHOST = "defaultHost";

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/HostGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/HostGBean.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/HostGBean.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/HostGBean.java Fri Apr 25 12:11:52 2008
@@ -28,8 +28,8 @@
 import org.apache.catalina.Valve;
 import org.apache.catalina.core.StandardEngine;
 import org.apache.catalina.core.StandardHost;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
@@ -41,7 +41,7 @@
  */
 public class HostGBean extends BaseGBean implements GBeanLifecycle, ObjectRetriever {
 
-    private static final Log log = LogFactory.getLog(HostGBean.class);
+    private final Logger log = LoggerFactory.getLogger(getClass());
     
     public static final String J2EE_TYPE = "Host";
     private static final String WORKDIR = "workDir";

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/LifecycleListenerGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/LifecycleListenerGBean.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/LifecycleListenerGBean.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/LifecycleListenerGBean.java Fri Apr 25 12:11:52 2008
@@ -19,8 +19,8 @@
 import java.util.Map;
 
 import org.apache.catalina.LifecycleListener;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
@@ -30,7 +30,7 @@
  */
 public class LifecycleListenerGBean extends BaseGBean implements GBeanLifecycle, ObjectRetriever {
 
-    private static final Log log = LogFactory.getLog(LifecycleListenerGBean.class);
+    private final Logger log = LoggerFactory.getLogger(getClass());
 
     public static final String J2EE_TYPE = "TomcatLifecycleListener";
         

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/ManagerGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/ManagerGBean.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/ManagerGBean.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/ManagerGBean.java Fri Apr 25 12:11:52 2008
@@ -19,15 +19,15 @@
 import java.util.Map;
 
 import org.apache.catalina.Manager;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 
 public class ManagerGBean extends BaseGBean implements GBeanLifecycle, ObjectRetriever{
 
-    private static final Log log = LogFactory.getLog(ManagerGBean.class);
+    private final Logger log = LoggerFactory.getLogger(getClass());
     
     public static final String J2EE_TYPE = "Manager";
     

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java Fri Apr 25 12:11:52 2008
@@ -31,8 +31,8 @@
 import org.apache.catalina.Realm;
 import org.apache.catalina.connector.Connector;
 import org.apache.catalina.realm.JAASRealm;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
@@ -57,7 +57,7 @@
  */
 public class TomcatContainer implements SoapHandler, GBeanLifecycle, TomcatWebContainer {
 
-    private static final Log log = LogFactory.getLog(TomcatContainer.class);
+    private final Logger log = LoggerFactory.getLogger(getClass());
 
     /**
      * The default value of CATALINA_HOME variable

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatEJBWebServiceContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatEJBWebServiceContext.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatEJBWebServiceContext.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatEJBWebServiceContext.java Fri Apr 25 12:11:52 2008
@@ -42,14 +42,14 @@
 import org.apache.catalina.deploy.SecurityCollection;
 import org.apache.catalina.deploy.SecurityConstraint;
 import org.apache.catalina.valves.ValveBase;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.geronimo.tomcat.realm.TomcatEJBWSGeronimoRealm;
 import org.apache.geronimo.webservices.WebServiceContainer;
 
 public class TomcatEJBWebServiceContext extends StandardContext{
 
-    private static final Log log = LogFactory.getLog(TomcatEJBWebServiceContext.class);
+    private final Logger log = LoggerFactory.getLogger(getClass());
 
     private final String contextPath;
     private final WebServiceContainer webServiceContainer;
@@ -161,7 +161,7 @@
                 } catch (IOException e) {
                     throw e;
                 } catch (Exception e) {
-                    log.error(e);
+                    log.error("Failed to get WSDL", e);
                     res.sendError(500,"Could not fetch wsdl!");
                     return;
                 }

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatGeronimoEmbedded.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatGeronimoEmbedded.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatGeronimoEmbedded.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatGeronimoEmbedded.java Fri Apr 25 12:11:52 2008
@@ -20,8 +20,8 @@
 import org.apache.catalina.Lifecycle;
 import org.apache.catalina.startup.ContextConfig;
 import org.apache.catalina.startup.Embedded;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.geronimo.webservices.WebServiceContainer;
 
 /**
@@ -29,7 +29,7 @@
  */
 public class TomcatGeronimoEmbedded extends Embedded{
     
-    private static final Log log = LogFactory.getLog(TomcatGeronimoEmbedded.class);
+    private final Logger log = LoggerFactory.getLogger(getClass());
     
     public Context createContext(String path, String docBase, ClassLoader cl) {
 

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatLogManagerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatLogManagerImpl.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatLogManagerImpl.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatLogManagerImpl.java Fri Apr 25 12:11:52 2008
@@ -19,8 +19,8 @@
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.system.serverinfo.ServerInfo;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.catalina.valves.AccessLogValve;
 
 import java.util.*;
@@ -42,7 +42,7 @@
  * @version $Rev$ $Date$
  */
 public class TomcatLogManagerImpl implements TomcatLogManager {
-    private final static Log log = LogFactory.getLog(TomcatLogManagerImpl.class);
+    private final Logger log = LoggerFactory.getLogger(getClass());
 
     // Pattern that matches the date in the logfile name
     private final static Pattern FILENAME_DATE_PATTERN = Pattern.compile("[-_ /.](((19|20)\\d\\d)[-_ /.](0[1-9]|1[012])[-_ /.](0[1-9]|[12][0-9]|3[01]))");

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java Fri Apr 25 12:11:52 2008
@@ -27,8 +27,8 @@
 
 import javax.net.ssl.KeyManagerFactory;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.AbstractNameQuery;
 import org.apache.geronimo.gbean.GBeanData;
@@ -65,7 +65,7 @@
  * @version $Rev$ $Date$
  */
 public class TomcatManagerImpl implements WebManager {
-    private final static Log log = LogFactory.getLog(TomcatManagerImpl.class);
+    private final Logger log = LoggerFactory.getLogger(getClass());
     private final Kernel kernel;
     
     private static final ConnectorType HTTP_BIO = new ConnectorType(Messages.getString("TomcatManagerImpl.0")); //$NON-NLS-1$
@@ -241,7 +241,7 @@
         } catch (GBeanNotFoundException e) {
             log.warn("No such GBean '" + connectorName + "'"); //todo: what if we want to remove a failed GBean?
         } catch (Exception e) {
-            log.error(e);
+            log.error("Failed to remove connector", e);
         }
     }
 
@@ -537,7 +537,7 @@
         } catch (GBeanNotFoundException e) {
             log.warn("No such GBean '" + connectorName + "'");
         } catch (Exception e) {
-            log.error(e);
+            log.error("Failed to get connector type", e);
         }
             
         return connectorType;

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java Fri Apr 25 12:11:52 2008
@@ -42,8 +42,8 @@
 import org.apache.catalina.Valve;
 import org.apache.catalina.core.StandardContext;
 import org.apache.catalina.ha.CatalinaCluster;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.geronimo.connector.outbound.connectiontracking.TrackedConnectionAssociator;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.GBeanInfo;
@@ -77,7 +77,7 @@
  */
 public class TomcatWebAppContext implements GBeanLifecycle, TomcatContext, WebModule, StatisticsProvider {
 
-    private static Log log = LogFactory.getLog(TomcatWebAppContext.class);
+    private final Logger log = LoggerFactory.getLogger(getClass());
 
     protected final TomcatContainer container;
     private final ClassLoader classLoader;

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/ValveGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/ValveGBean.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/ValveGBean.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/ValveGBean.java Fri Apr 25 12:11:52 2008
@@ -19,8 +19,8 @@
 import java.util.Map;
 
 import org.apache.catalina.Valve;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
@@ -30,7 +30,7 @@
  */
 public class ValveGBean extends BaseGBean implements GBeanLifecycle, ObjectRetriever {
 
-    private static final Log log = LogFactory.getLog(ValveGBean.class);
+    private final Logger log = LoggerFactory.getLogger(getClass());
 
     public static final String J2EE_TYPE = "TomcatValve";
         

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/CatalinaClusterGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/CatalinaClusterGBean.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/CatalinaClusterGBean.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/CatalinaClusterGBean.java Fri Apr 25 12:11:52 2008
@@ -23,8 +23,8 @@
 import org.apache.catalina.ha.ClusterDeployer;
 import org.apache.catalina.ha.ClusterListener;
 import org.apache.catalina.tribes.Channel;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
@@ -37,7 +37,7 @@
 */
 public class CatalinaClusterGBean extends BaseGBean implements GBeanLifecycle, ObjectRetriever {
 
-   private static final Log log = LogFactory.getLog(CatalinaClusterGBean.class);
+   private final Logger log = LoggerFactory.getLogger(getClass());
    
    public static final String J2EE_TYPE = "Cluster";
    

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/ChannelGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/ChannelGBean.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/ChannelGBean.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/ChannelGBean.java Fri Apr 25 12:11:52 2008
@@ -24,8 +24,8 @@
 import org.apache.catalina.tribes.ChannelSender;
 import org.apache.catalina.tribes.MembershipService;
 import org.apache.catalina.tribes.group.GroupChannel;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
@@ -37,7 +37,7 @@
 */
 public class ChannelGBean extends BaseGBean implements GBeanLifecycle, ObjectRetriever {
 
-   private static final Log log = LogFactory.getLog(ChannelGBean.class);
+   private final Logger log = LoggerFactory.getLogger(getClass());
    
    public static final String J2EE_TYPE = "Channel";
    

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/ChannelInterceptorGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/ChannelInterceptorGBean.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/ChannelInterceptorGBean.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/ChannelInterceptorGBean.java Fri Apr 25 12:11:52 2008
@@ -21,13 +21,13 @@
 import org.apache.geronimo.tomcat.BaseGBean;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.catalina.tribes.ChannelInterceptor;
 
 public class ChannelInterceptorGBean extends BaseGBean {
 
-    private static final Log log = LogFactory.getLog(SenderGBean.class);
+    private final Logger log = LoggerFactory.getLogger(getClass());
 
     public static final String J2EE_TYPE = "ChannelInterceptor";
 

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/ClusterDeployerGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/ClusterDeployerGBean.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/ClusterDeployerGBean.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/ClusterDeployerGBean.java Fri Apr 25 12:11:52 2008
@@ -19,8 +19,8 @@
 import java.util.Map;
 
 import org.apache.catalina.ha.ClusterDeployer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
@@ -29,8 +29,7 @@
 
 public class ClusterDeployerGBean  extends BaseGBean implements GBeanLifecycle, ObjectRetriever {
 
-    private static final Log log = LogFactory
-            .getLog(ClusterDeployerGBean.class);
+    private final Logger log = LoggerFactory.getLogger(getClass());
 
     public static final String J2EE_TYPE = "ClusterDeployer";
 



Mime
View raw message