svn commit: r730081 - in /continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server: ConfiguredBeanProcessorFactory.java Listener.java PropertiesHandlerMapping.java

[ev...@apache.org]

Author: evenisse
Date: Tue Dec 30 01:53:46 2008
New Revision: 730081

URL: http://svn.apache.org/viewvc?rev=730081&view=rev
Log:
Remove AbstractLogEnabled

Removed:
    continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/Listener.java
Modified:
    continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ConfiguredBeanProcessorFactory.java
    continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/PropertiesHandlerMapping.java

Modified: continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ConfiguredBeanProcessorFactory.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ConfiguredBeanProcessorFactory.java?rev=730081&r1=730080&r2=730081&view=diff
==============================================================================
--- continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ConfiguredBeanProcessorFactory.java (original)
+++ continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ConfiguredBeanProcessorFactory.java Tue Dec 30 01:53:46 2008
@@ -30,6 +30,8 @@
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -43,16 +45,13 @@
 public class ConfiguredBeanProcessorFactory
     implements RequestProcessorFactoryFactory, Initializable, Contextualizable
 {
+    private Logger log = LoggerFactory.getLogger( ConfiguredBeanProcessorFactory.class );
+
     /**
      * @plexus.requirement role="org.apache.maven.continuum.xmlrpc.server.ContinuumXmlRpcComponent"
      */
     private Map xmlrpcComponents;
 
-    /**
-     * @plexus.requirement
-     */
-    private Listener listener;
-
     private Map componentsMapping = new HashMap();
 
     PlexusContainer container;
@@ -91,7 +90,7 @@
     protected Object getRequestProcessor( Class cls )
         throws XmlRpcException
     {
-        listener.getLogger().debug( "Load '" + cls.getName() + "' handler." );
+        log.debug( "Load '" + cls.getName() + "' handler." );
 
         Object obj = null;
         try
@@ -100,7 +99,7 @@
         }
         catch ( ComponentLookupException e )
         {
-            listener.getLogger().error( "Can't load component.", e );
+            log.error( "Can't load component.", e );
         }
 
         if ( obj == null )
@@ -120,7 +119,7 @@
         throws ComponentLookupException
     {
         String key = getComponentKey( cls );
-        listener.getLogger().debug( "load component:" );
+        log.debug( "load component:" + key );
         return container.lookup( ContinuumXmlRpcComponent.class.getName(), key );
     }
 

Modified: continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/PropertiesHandlerMapping.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/PropertiesHandlerMapping.java?rev=730081&r1=730080&r2=730081&view=diff
==============================================================================
--- continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/PropertiesHandlerMapping.java (original)
+++ continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/PropertiesHandlerMapping.java Tue Dec 30 01:53:46 2008
@@ -28,6 +28,8 @@
 import org.codehaus.plexus.context.Context;
 import org.codehaus.plexus.context.ContextException;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.lang.reflect.Method;
 import java.util.Iterator;
@@ -42,16 +44,13 @@
     extends PropertyHandlerMapping
     implements Contextualizable
 {
+    private Logger log = LoggerFactory.getLogger( PropertiesHandlerMapping.class );
+
     /**
      * @plexus.requirement role="org.apache.maven.continuum.xmlrpc.server.ContinuumXmlRpcComponent"
      */
     private Map xmlrpcComponents;
 
-    /**
-     * @plexus.requirement
-     */
-    private Listener listener;
-
     private PlexusContainer container;
 
     public void load()
@@ -61,17 +60,20 @@
         {
             String key = (String) i.next();
             Class cl = xmlrpcComponents.get( key ).getClass();
-            listener.getLogger().debug( key + " => " + cl.getName() );
+            if ( log.isDebugEnabled() )
+            {
+                log.debug( key + " => " + cl.getName() );
+            }
 
             registerPublicMethods( key, cl );
         }
 
-        if ( listener.getLogger().isDebugEnabled() )
+        if ( log.isDebugEnabled() )
         {
             String[] methods = getListMethods();
             for ( int i = 0; i < methods.length; i++ )
             {
-                listener.getLogger().debug( methods[i] );
+                log.debug( methods[i] );
             }
         }
     }