continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r729932 - in /continuum/trunk: continuum-commons/src/main/java/org/apache/continuum/installation/ continuum-commons/src/main/java/org/apache/maven/continuum/utils/ continuum-purge/src/main/java/org/apache/continuum/purge/controller/ continu...
Date Mon, 29 Dec 2008 16:32:23 GMT
Author: evenisse
Date: Mon Dec 29 08:32:22 2008
New Revision: 729932

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

Modified:
    continuum/trunk/continuum-commons/src/main/java/org/apache/continuum/installation/DefaultInstallationService.java
    continuum/trunk/continuum-commons/src/main/java/org/apache/maven/continuum/utils/ChrootJailWorkingDirectoryService.java
    continuum/trunk/continuum-commons/src/main/java/org/apache/maven/continuum/utils/DefaultWorkingDirectoryService.java
    continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/controller/DirectoryPurgeController.java
    continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/controller/RepositoryPurgeController.java
    continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/checks/security/RoleProfileEnvironmentCheck.java
    continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/interceptor/ForceContinuumConfigurationInterceptor.java
    continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/util/WorkingCopyContentGenerator.java

Modified: continuum/trunk/continuum-commons/src/main/java/org/apache/continuum/installation/DefaultInstallationService.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-commons/src/main/java/org/apache/continuum/installation/DefaultInstallationService.java?rev=729932&r1=729931&r2=729932&view=diff
==============================================================================
--- continuum/trunk/continuum-commons/src/main/java/org/apache/continuum/installation/DefaultInstallationService.java
(original)
+++ continuum/trunk/continuum-commons/src/main/java/org/apache/continuum/installation/DefaultInstallationService.java
Mon Dec 29 08:32:22 2008
@@ -42,7 +42,6 @@
 import org.apache.maven.continuum.profile.ProfileException;
 import org.apache.maven.continuum.profile.ProfileService;
 import org.apache.maven.continuum.store.ContinuumStoreException;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
 import org.codehaus.plexus.util.StringUtils;
@@ -50,6 +49,8 @@
 import org.codehaus.plexus.util.cli.CommandLineUtils;
 import org.codehaus.plexus.util.cli.Commandline;
 import org.codehaus.plexus.util.cli.StreamConsumer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 /**
@@ -61,9 +62,9 @@
  */
 @Service("installationService")
 public class DefaultInstallationService
-    extends AbstractLogEnabled
     implements InstallationService, Initializable
 {
+    private Logger log = LoggerFactory.getLogger( DefaultInstallationService.class );
 
     @Resource
     private InstallationDao installationDao;
@@ -440,7 +441,7 @@
         }
         catch ( CommandLineException e )
         {
-            getLogger().error(
+            log.error(
                 "fail to execute " + executable + " with arg " + executorConfigurator.getVersionArgument()
);
             throw new InstallationException( e.getMessage(), e );
         }

Modified: continuum/trunk/continuum-commons/src/main/java/org/apache/maven/continuum/utils/ChrootJailWorkingDirectoryService.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-commons/src/main/java/org/apache/maven/continuum/utils/ChrootJailWorkingDirectoryService.java?rev=729932&r1=729931&r2=729932&view=diff
==============================================================================
--- continuum/trunk/continuum-commons/src/main/java/org/apache/maven/continuum/utils/ChrootJailWorkingDirectoryService.java
(original)
+++ continuum/trunk/continuum-commons/src/main/java/org/apache/maven/continuum/utils/ChrootJailWorkingDirectoryService.java
Mon Dec 29 08:32:22 2008
@@ -20,11 +20,11 @@
  */
 
 import java.io.File;
+import javax.annotation.Resource;
 
 import org.apache.maven.continuum.configuration.ConfigurationService;
 import org.apache.maven.continuum.model.project.Project;
 import org.apache.maven.continuum.model.project.ProjectGroup;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.springframework.stereotype.Service;
 
 /**
@@ -33,12 +33,9 @@
  */
 @Service("workingDirectoryService#chrootJail")
 public class ChrootJailWorkingDirectoryService
-    extends AbstractLogEnabled
     implements WorkingDirectoryService
 {
-    /**
-     * @plexus.requirement
-     */
+    @Resource
     private ConfigurationService configurationService;
 
     /**

Modified: continuum/trunk/continuum-commons/src/main/java/org/apache/maven/continuum/utils/DefaultWorkingDirectoryService.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-commons/src/main/java/org/apache/maven/continuum/utils/DefaultWorkingDirectoryService.java?rev=729932&r1=729931&r2=729932&view=diff
==============================================================================
--- continuum/trunk/continuum-commons/src/main/java/org/apache/maven/continuum/utils/DefaultWorkingDirectoryService.java
(original)
+++ continuum/trunk/continuum-commons/src/main/java/org/apache/maven/continuum/utils/DefaultWorkingDirectoryService.java
Mon Dec 29 08:32:22 2008
@@ -21,7 +21,6 @@
 
 import org.apache.maven.continuum.configuration.ConfigurationService;
 import org.apache.maven.continuum.model.project.Project;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.springframework.stereotype.Service;
 
 import java.io.File;
@@ -34,7 +33,6 @@
  */
 @Service("workingDirectoryService")
 public class DefaultWorkingDirectoryService
-    extends AbstractLogEnabled
     implements WorkingDirectoryService
 {
     @Resource

Modified: continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/controller/DirectoryPurgeController.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/controller/DirectoryPurgeController.java?rev=729932&r1=729931&r2=729932&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/controller/DirectoryPurgeController.java
(original)
+++ continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/controller/DirectoryPurgeController.java
Mon Dec 29 08:32:22 2008
@@ -26,7 +26,8 @@
 import org.apache.continuum.purge.executor.ContinuumPurgeExecutorException;
 import org.apache.continuum.purge.executor.DaysOldDirectoryPurgeExecutor;
 import org.apache.continuum.purge.executor.RetentionCountDirectoryPurgeExecutor;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * DirectoryPurgeController
@@ -35,9 +36,10 @@
  * @plexus.component role="org.apache.continuum.purge.controller.PurgeController" role-hint="purge-directory"
  */
 public class DirectoryPurgeController
-    extends AbstractLogEnabled
     implements PurgeController
 {
+    private Logger log = LoggerFactory.getLogger( DirectoryPurgeController.class );
+
     private ContinuumPurgeExecutor purgeExecutor;
 
     public void doPurge( String path )
@@ -48,7 +50,7 @@
         }
         catch ( ContinuumPurgeExecutorException e )
         {
-            getLogger().error( e.getMessage(), e );
+            log.error( e.getMessage(), e );
         }
     }
 

Modified: continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/controller/RepositoryPurgeController.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/controller/RepositoryPurgeController.java?rev=729932&r1=729931&r2=729932&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/controller/RepositoryPurgeController.java
(original)
+++ continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/controller/RepositoryPurgeController.java
Mon Dec 29 08:32:22 2008
@@ -31,7 +31,8 @@
 import org.apache.continuum.purge.executor.ReleasedSnapshotsRepositoryPurgeExecutor;
 import org.apache.continuum.purge.executor.RetentionCountRepositoryPurgeExecutor;
 import org.apache.continuum.purge.repository.content.RepositoryManagedContent;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * DefaultPurgeController
@@ -40,9 +41,10 @@
  * @plexus.component role="org.apache.continuum.purge.controller.PurgeController" role-hint="purge-repository"
  */
 public class RepositoryPurgeController
-    extends AbstractLogEnabled
     implements PurgeController
 {
+    private Logger log = LoggerFactory.getLogger( RepositoryPurgeController.class );
+
     private ContinuumPurgeExecutor purgeExecutor;
 
     private ContinuumPurgeExecutor purgeReleasedSnapshotsExecutor;
@@ -106,7 +108,7 @@
         }
         catch ( ContinuumPurgeExecutorException e )
         {
-            getLogger().error( e.getMessage(), e );
+            log.error( e.getMessage(), e );
         }
     }
 }
\ No newline at end of file

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/checks/security/RoleProfileEnvironmentCheck.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/checks/security/RoleProfileEnvironmentCheck.java?rev=729932&r1=729931&r2=729932&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/checks/security/RoleProfileEnvironmentCheck.java
(original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/checks/security/RoleProfileEnvironmentCheck.java
Mon Dec 29 08:32:22 2008
@@ -21,10 +21,11 @@
 
 import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.model.project.ProjectGroup;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.redback.role.RoleManager;
 import org.codehaus.plexus.redback.role.RoleManagerException;
 import org.codehaus.plexus.redback.system.check.EnvironmentCheck;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.Collection;
 import java.util.Iterator;
@@ -39,9 +40,10 @@
  * role-hint="continuum-role-profile-check"
  */
 public class RoleProfileEnvironmentCheck
-    extends AbstractLogEnabled
     implements EnvironmentCheck
 {
+    private Logger log = LoggerFactory.getLogger( RoleProfileEnvironmentCheck.class );
+
     /**
      * @plexus.requirement role-hint="default"
      */
@@ -56,7 +58,7 @@
     {
         try
         {
-            getLogger().info( "Checking roles list." );
+            log.info( "Checking roles list." );
 
             Collection projectGroups = continuum.getAllProjectGroups();
 

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/interceptor/ForceContinuumConfigurationInterceptor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/interceptor/ForceContinuumConfigurationInterceptor.java?rev=729932&r1=729931&r2=729932&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/interceptor/ForceContinuumConfigurationInterceptor.java
(original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/interceptor/ForceContinuumConfigurationInterceptor.java
Mon Dec 29 08:32:22 2008
@@ -23,7 +23,6 @@
 import com.opensymphony.xwork2.interceptor.Interceptor;
 import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.configuration.ConfigurationService;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
 
 /**
  * ForceContinuumConfigurationInterceptor:
@@ -34,7 +33,6 @@
  * role-hint="forceContinuumConfigurationInterceptor"
  */
 public class ForceContinuumConfigurationInterceptor
-    extends AbstractLogEnabled
     implements Interceptor
 {
     private static boolean checked = false;

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/util/WorkingCopyContentGenerator.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/util/WorkingCopyContentGenerator.java?rev=729932&r1=729931&r2=729932&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/util/WorkingCopyContentGenerator.java
(original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/util/WorkingCopyContentGenerator.java
Mon Dec 29 08:32:22 2008
@@ -19,7 +19,6 @@
  * under the License.
  */
 
-import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.util.StringUtils;
 
 import java.io.File;
@@ -34,7 +33,6 @@
  * @version $Id$
  */
 public class WorkingCopyContentGenerator
-    extends AbstractLogEnabled
 {
     private File basedir;
 



Mime
View raw message