continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r749538 [1/2] - in /continuum/trunk: continuum-core/src/test/java/org/apache/maven/continuum/execution/ continuum-core/src/test/java/org/apache/maven/continuum/project/builder/ continuum-webapp/src/main/java/org/apache/continuum/web/action/...
Date Tue, 03 Mar 2009 05:54:50 GMT
Author: evenisse
Date: Tue Mar  3 05:54:49 2009
New Revision: 749538

URL: http://svn.apache.org/viewvc?rev=749538&view=rev
Log:
Remove some plexus logger

Modified:
    continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/ContinuumBuildExecutorTest.java
    continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilderTest.java
    continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ReleaseResultAction.java
    continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/BuildAgentAction.java
    continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java
    continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectGroupAction.java
    continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java
    continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CancelBuildAction.java
    continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java
    continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PlexusActionSupport.java
    continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
    continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java
    continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectsListAction.java
    continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java
    continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java
    continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigurationAction.java
    continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java
    continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/QueuesAction.java
    continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java
    continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/NotifierSummaryAction.java
    continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/validator/InstallationValidator.java
    continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/TestAction.java

Modified: continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/ContinuumBuildExecutorTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/ContinuumBuildExecutorTest.java?rev=749538&r1=749537&r2=749538&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/ContinuumBuildExecutorTest.java (original)
+++ continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/ContinuumBuildExecutorTest.java Tue Mar  3 05:54:49 2009
@@ -33,8 +33,6 @@
 import org.apache.maven.continuum.model.project.Project;
 import org.apache.maven.continuum.model.project.ProjectGroup;
 import org.apache.maven.continuum.utils.ChrootJailWorkingDirectoryService;
-import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.logging.console.ConsoleLogger;
 import org.jmock.Expectations;
 import org.jmock.Mockery;
 
@@ -88,8 +86,9 @@
         projectGroup.setGroupId( project.getGroupId() );
         project.setProjectGroup( projectGroup );
 
-        assertEquals( toSystemPath( chrootJailFile.getPath() + "/" + project.getGroupId() + workingDirectory.getPath() +
-            "/" + project.getId() ), directoryService.getWorkingDirectory( project ).getPath() );
+        assertEquals( toSystemPath(
+            chrootJailFile.getPath() + "/" + project.getGroupId() + workingDirectory.getPath() + "/" +
+                project.getId() ), directoryService.getWorkingDirectory( project ).getPath() );
 
         String executable = "mvn";
         final String arguments = "-o clean install";
@@ -105,11 +104,10 @@
         context.checking( new Expectations()
         {
             {
-                one( helper ).executeShellCommand( chrootJailFile, "sudo", toSystemPath( cmd ), output,
-                                                   project.getId(), environments );
+                one( helper ).executeShellCommand( chrootJailFile, "sudo", toSystemPath( cmd ), output, project.getId(),
+                                                   environments );
                 will( returnValue( result ) );
-            }
-        } );
+            }} );
 
         executor.executeShellCommand( project, executable, arguments, output, environments );
 

Modified: continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilderTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilderTest.java?rev=749538&r1=749537&r2=749538&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilderTest.java (original)
+++ continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilderTest.java Tue Mar  3 05:54:49 2009
@@ -24,8 +24,6 @@
 import junit.framework.TestCase;
 
 import org.apache.maven.continuum.model.project.BuildDefinitionTemplate;
-import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.logging.console.ConsoleLogger;
 
 /**
  * Test for {@link AbstractContinuumProjectBuilder}
@@ -44,7 +42,6 @@
     {
         super.setUp();
         builder = new ContinuumProjectBuilder();
-        //builder.enableLogging( new ConsoleLogger( Logger.LEVEL_DEBUG, "" ) );
     }
 
     /**
@@ -86,7 +83,7 @@
             return null;
         }
 
-        public BuildDefinitionTemplate  getDefaultBuildDefinitionTemplate()
+        public BuildDefinitionTemplate getDefaultBuildDefinitionTemplate()
             throws ContinuumProjectBuilderException
         {
             return null;

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ReleaseResultAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ReleaseResultAction.java?rev=749538&r1=749537&r2=749538&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ReleaseResultAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ReleaseResultAction.java Tue Mar  3 05:54:49 2009
@@ -32,6 +32,8 @@
 import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
 import org.apache.maven.shared.release.ReleaseResult;
 import org.codehaus.plexus.util.FileUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author <a href="mailto:ctan@apache.org">Maria Catherine Tan</a>
@@ -40,18 +42,20 @@
 public class ReleaseResultAction
     extends ContinuumConfirmAction
 {
+    private Logger logger = LoggerFactory.getLogger( this.getClass() );
+
     private int projectGroupId;
-    
+
     private int releaseResultId;
-    
+
     private List<ContinuumReleaseResult> releaseResults;
-    
+
     private List<String> selectedReleaseResults;
-    
+
     private ProjectGroup projectGroup;
-    
+
     private ReleaseResult result;
-    
+
     private boolean confirmed;
 
     private String projectName;
@@ -70,13 +74,13 @@
             addActionError( authzE.getMessage() );
             return REQUIRES_AUTHORIZATION;
         }
-        
+
         releaseResults = getContinuum().getContinuumReleaseResultsByProjectGroup( projectGroupId );
-        
+
         return SUCCESS;
 
     }
-    
+
     public String remove()
         throws ContinuumException
     {
@@ -88,7 +92,7 @@
         {
             return REQUIRES_AUTHORIZATION;
         }
-     
+
         if ( confirmed )
         {
             if ( selectedReleaseResults != null && !selectedReleaseResults.isEmpty() )
@@ -99,23 +103,23 @@
 
                     try
                     {
-                        getLogger().info( "Removing ContinuumReleaseResult with id=" + resultId );
+                        logger.info( "Removing ContinuumReleaseResult with id=" + resultId );
 
                         getContinuum().removeContinuumReleaseResult( resultId );
                     }
                     catch ( ContinuumException e )
                     {
-                        getLogger().error( "Error removing ContinuumReleaseResult with id=" + resultId );
+                        logger.error( "Error removing ContinuumReleaseResult with id=" + resultId );
                         addActionError( getText( "Unable to remove ContinuumReleaseResult with id=" + resultId ) );
                     }
                 }
             }
             return SUCCESS;
         }
-        
+
         return CONFIRM;
     }
-    
+
     public String viewResult()
         throws ContinuumException
     {
@@ -128,9 +132,9 @@
             addActionError( authzE.getMessage() );
             return REQUIRES_AUTHORIZATION;
         }
-        
+
         ContinuumReleaseResult releaseResult = getContinuum().getContinuumReleaseResult( releaseResultId );
-        
+
         result = new ReleaseResult();
         result.setStartTime( releaseResult.getStartTime() );
         result.setEndTime( releaseResult.getEndTime() );
@@ -141,7 +145,10 @@
 
         try
         {
-            File releaseOutputFile = getContinuum().getConfiguration().getReleaseOutputFile( projectGroupId, "releases-" + releaseResult.getStartTime() );
+            File releaseOutputFile = getContinuum().getConfiguration().getReleaseOutputFile( projectGroupId,
+                                                                                             "releases-" +
+                                                                                                 releaseResult.getStartTime() )
+                ;
 
             if ( releaseOutputFile.exists() )
             {
@@ -157,17 +164,17 @@
         {
             //getLogger().error( "" );
         }
-        
+
         return SUCCESS;
     }
-    
+
     public String getProjectGroupName()
         throws ContinuumException
     {
-    
+
         return getProjectGroup( projectGroupId ).getName();
     }
-    
+
     public ProjectGroup getProjectGroup( int projectGroupId )
         throws ContinuumException
     {
@@ -182,45 +189,45 @@
                 projectGroup = getContinuum().getProjectGroup( projectGroupId );
             }
         }
-    
+
         return projectGroup;
     }
-    
+
     public ProjectGroup getProjectGroup()
     {
         return projectGroup;
     }
-    
+
     public void setProjectGroup( ProjectGroup projectGroup )
     {
         this.projectGroup = projectGroup;
     }
-    
+
     public int getProjectGroupId()
     {
         return projectGroupId;
     }
-    
+
     public void setProjectGroupId( int projectGroupId )
     {
         this.projectGroupId = projectGroupId;
     }
-    
+
     public int getReleaseResultId()
     {
         return releaseResultId;
     }
-    
+
     public void setReleaseResultId( int releaseResultId )
     {
         this.releaseResultId = releaseResultId;
     }
-    
+
     public List<ContinuumReleaseResult> getReleaseResults()
     {
         return releaseResults;
     }
-    
+
     public void setReleaseResults( List<ContinuumReleaseResult> releaseResults )
     {
         this.releaseResults = releaseResults;
@@ -230,27 +237,27 @@
     {
         return selectedReleaseResults;
     }
-    
+
     public void setSelectedReleaseResults( List<String> selectedReleaseResults )
     {
         this.selectedReleaseResults = selectedReleaseResults;
     }
-    
+
     public ReleaseResult getResult()
     {
         return result;
     }
-    
+
     public void setResult( ReleaseResult result )
     {
         this.result = result;
     }
-    
+
     public boolean isConfirmed()
     {
         return confirmed;
     }
-    
+
     public void setConfirmed( boolean confirmed )
     {
         this.confirmed = confirmed;

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/BuildAgentAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/BuildAgentAction.java?rev=749538&r1=749537&r2=749538&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/BuildAgentAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/BuildAgentAction.java Tue Mar  3 05:54:49 2009
@@ -34,6 +34,8 @@
 import org.codehaus.redback.integration.interceptor.SecureAction;
 import org.codehaus.redback.integration.interceptor.SecureActionBundle;
 import org.codehaus.redback.integration.interceptor.SecureActionException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -48,11 +50,13 @@
     extends ContinuumConfirmAction
     implements SecureAction
 {
+    private Logger logger = LoggerFactory.getLogger( this.getClass() );
+
     /**
      * @plexus.requirement
      */
     private DistributedBuildManager distributedBuildManager;
-    
+
     private List<BuildAgentConfiguration> buildAgents;
 
     private BuildAgentConfiguration buildAgent;
@@ -88,7 +92,7 @@
         if ( buildAgent != null && !StringUtils.isBlank( buildAgent.getUrl() ) )
         {
             List<BuildAgentConfiguration> agents = getContinuum().getConfiguration().getBuildAgents();
-            
+
             for ( BuildAgentConfiguration agent : agents )
             {
                 if ( agent.getUrl().equals( buildAgent.getUrl() ) )
@@ -139,7 +143,7 @@
                 }
                 catch ( ContinuumException e )
                 {
-                    getLogger().error( "Unable to retrieve installations of build agent '" + agent.getUrl() + "'", e );
+                    logger.error( "Unable to retrieve installations of build agent '" + agent.getUrl() + "'", e );
                 }
 
                 break;
@@ -242,11 +246,11 @@
         List<Profile> profiles = getContinuum().getProfileService().getAllProfiles();
         for ( Profile profile : profiles )
         {
-            if (buildAgentGroup.getName().equals( profile.getBuildAgentGroup() ) )
-            {                
+            if ( buildAgentGroup.getName().equals( profile.getBuildAgentGroup() ) )
+            {
                 message = getText( "buildAgentGroup.error.remove.in.use" );
                 return ERROR;
-            }                
+            }
         }
 
         ConfigurationService configuration = getContinuum().getConfiguration();
@@ -301,7 +305,7 @@
         }
 
         if ( !found )
-        {            
+        {
             buildAgentGroup.setBuildAgents( selectedbuildAgents );
             configuration.addBuildAgentGroup( buildAgentGroup );
         }
@@ -347,7 +351,8 @@
                     this.selectedBuildAgentIds = new ArrayList<String>();
                     if ( this.buildAgentGroup.getBuildAgents() != null )
                     {
-                        for ( Iterator<BuildAgentConfiguration> iterator = buildAgentGroup.getBuildAgents().iterator(); iterator.hasNext(); )
+                        for ( Iterator<BuildAgentConfiguration> iterator = buildAgentGroup.getBuildAgents().iterator();
+                              iterator.hasNext(); )
                         {
                             this.selectedBuildAgentIds.add( iterator.next().getUrl() );
                         }
@@ -386,7 +391,7 @@
         return bundle;
     }
 
-    private List<BuildAgentConfiguration>getBuildAgentsFromSelectedBuildAgents()
+    private List<BuildAgentConfiguration> getBuildAgentsFromSelectedBuildAgents()
     {
         if ( this.selectedBuildAgentIds == null )
         {
@@ -394,10 +399,10 @@
         }
 
         List<BuildAgentConfiguration> selectedbuildAgents = new ArrayList<BuildAgentConfiguration>();
-        for ( String ids: selectedBuildAgentIds )
+        for ( String ids : selectedBuildAgentIds )
         {
             BuildAgentConfiguration buildAgent = getContinuum().getConfiguration().getBuildAgent( ids );
-            if (buildAgent!=null)
+            if ( buildAgent != null )
             {
                 selectedbuildAgents.add( buildAgent );
             }
@@ -449,7 +454,7 @@
     {
         return this.message;
     }
-    
+
     public void setMessage( String message )
     {
         this.message = message;

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java?rev=749538&r1=749537&r2=749538&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java Tue Mar  3 05:54:49 2009
@@ -31,6 +31,8 @@
 import org.apache.maven.continuum.profile.ProfileService;
 import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
 import org.codehaus.plexus.util.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -46,6 +48,8 @@
     extends ContinuumActionSupport
     implements Validateable
 {
+    private Logger logger = LoggerFactory.getLogger( this.getClass() );
+
     private String projectName;
 
     private String projectDescription;
@@ -90,29 +94,30 @@
         boolean projectNameAlreadyExist = false;
 
         clearErrorsAndMessages();
-        
+
         try
         {
-            if ( ( projectName.trim().length() > 0 ) && ( projectVersion.trim().length() > 0 ) && ( projectScmUrl.trim().length() > 0 ) )
+            if ( ( projectName.trim().length() > 0 ) && ( projectVersion.trim().length() > 0 ) &&
+                ( projectScmUrl.trim().length() > 0 ) )
             {
-            Iterator<Project> projects = getContinuum().getProjects().iterator();
-            while ( projects.hasNext() )
-            {
-                Project project = projects.next();
-                // CONTINUUM-1445
-                if ( StringUtils.equalsIgnoreCase( project.getName(), projectName.trim() ) &&
-                    StringUtils.equalsIgnoreCase( project.getVersion(), projectVersion.trim() ) &&
-                    StringUtils.equalsIgnoreCase( project.getScmUrl(), projectScmUrl.trim() ) )
+                Iterator<Project> projects = getContinuum().getProjects().iterator();
+                while ( projects.hasNext() )
                 {
-                    projectNameAlreadyExist = true;
-                    break;
+                    Project project = projects.next();
+                    // CONTINUUM-1445
+                    if ( StringUtils.equalsIgnoreCase( project.getName(), projectName.trim() ) &&
+                        StringUtils.equalsIgnoreCase( project.getVersion(), projectVersion.trim() ) &&
+                        StringUtils.equalsIgnoreCase( project.getScmUrl(), projectScmUrl.trim() ) )
+                    {
+                        projectNameAlreadyExist = true;
+                        break;
+                    }
+                }
+                if ( projectNameAlreadyExist )
+                {
+                    addActionError( getText( "projectName.already.exist.error" ) );
+                    this.input();
                 }
-            }
-            if ( projectNameAlreadyExist )
-            {
-                addActionError( getText( "projectName.already.exist.error" ) );
-                this.input();
-            }
             }
             else
             {
@@ -133,11 +138,11 @@
         }
         catch ( ContinuumException e )
         {
-            getLogger().error( e.getMessage(), e );
+            logger.error( e.getMessage(), e );
         }
         catch ( BuildDefinitionServiceException e )
         {
-            getLogger().error( e.getMessage(), e );
+            logger.error( e.getMessage(), e );
         }
     }
 
@@ -168,7 +173,9 @@
         project.setName( projectName.trim() );
 
         if ( projectDescription != null )
+        {
             project.setDescription( projectDescription.trim() );
+        }
 
         project.setVersion( projectVersion.trim() );
 
@@ -231,8 +238,8 @@
 
         if ( !disableGroupSelection )
         {
-            selectedProjectGroup = getContinuum().getProjectGroupByGroupId( Continuum.DEFAULT_PROJECT_GROUP_GROUP_ID )
-                .getId();
+            selectedProjectGroup =
+                getContinuum().getProjectGroupByGroupId( Continuum.DEFAULT_PROJECT_GROUP_GROUP_ID ).getId();
         }
         this.profiles = profileService.getAllProfiles();
         buildDefinitionTemplates = getContinuum().getBuildDefinitionService().getAllBuildDefinitionTemplate();
@@ -427,11 +434,13 @@
         }
     }
 
-    public String getProjectDescription() {
+    public String getProjectDescription()
+    {
         return projectDescription;
     }
 
-    public void setProjectDescription(String projectDescription) {
+    public void setProjectDescription( String projectDescription )
+    {
         this.projectDescription = projectDescription;
     }
 }

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectGroupAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectGroupAction.java?rev=749538&r1=749537&r2=749538&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectGroupAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectGroupAction.java Tue Mar  3 05:54:49 2009
@@ -27,6 +27,8 @@
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.model.project.ProjectGroup;
 import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.opensymphony.xwork2.Validateable;
 
@@ -38,24 +40,26 @@
     extends ContinuumActionSupport
     implements Validateable
 {
+    private Logger logger = LoggerFactory.getLogger( this.getClass() );
+
     private String name;
 
     private String groupId;
 
     private String description;
-    
+
     private int repositoryId;
-    
+
     private List<LocalRepository> repositories;
 
     public void prepare()
         throws Exception
     {
         super.prepare();
-        
+
         repositories = getContinuum().getRepositoryService().getAllLocalRepositories();
     }
-    
+
     public void validate()
     {
         clearErrorsAndMessages();
@@ -124,7 +128,7 @@
         projectGroup.setGroupId( groupId );
 
         projectGroup.setDescription( description );
-        
+
         try
         {
             if ( repositoryId > 0 )
@@ -135,8 +139,8 @@
         }
         catch ( RepositoryServiceException e )
         {
-            getLogger().error( "Error adding project group" + e.getLocalizedMessage() );
-            
+            logger.error( "Error adding project group" + e.getLocalizedMessage() );
+
             return ERROR;
         }
 
@@ -146,7 +150,7 @@
         }
         catch ( ContinuumException e )
         {
-            getLogger().error( "Error adding project group: " + e.getLocalizedMessage() );
+            logger.error( "Error adding project group: " + e.getLocalizedMessage() );
 
             return ERROR;
         }
@@ -198,22 +202,22 @@
     {
         this.name = name;
     }
-    
+
     public int getRepositoryId()
     {
         return repositoryId;
     }
-    
+
     public void setRepositoryId( int repositoryId )
     {
         this.repositoryId = repositoryId;
     }
-    
+
     public List<LocalRepository> getRepositories()
     {
         return repositories;
     }
-    
+
     public void setRepositories( List<LocalRepository> repositories )
     {
         this.repositories = repositories;

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java?rev=749538&r1=749537&r2=749538&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java Tue Mar  3 05:54:49 2009
@@ -28,6 +28,8 @@
 import org.apache.maven.continuum.model.project.Project;
 import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
 import org.codehaus.plexus.util.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
@@ -37,20 +39,22 @@
 public class BuildResultsListAction
     extends AbstractBuildAction
 {
+    private Logger logger = LoggerFactory.getLogger( this.getClass() );
+
     private Project project;
 
     private Collection buildResults;
-    
+
     private Collection<String> selectedBuildResults;
 
     private int projectId;
-    
+
     private int projectGroupId;
 
     private String projectName;
 
     private String projectGroupName = "";
-    
+
     public String execute()
         throws ContinuumException
     {
@@ -69,7 +73,7 @@
 
         return SUCCESS;
     }
-    
+
     public String remove()
         throws ContinuumException
     {
@@ -91,13 +95,13 @@
 
                     try
                     {
-                        getLogger().info( "Removing BuildResult with id=" + buildId );
+                        logger.info( "Removing BuildResult with id=" + buildId );
 
                         getContinuum().removeBuildResult( buildId );
                     }
                     catch ( ContinuumException e )
                     {
-                        getLogger().error( "Error removing BuildResult with id=" + buildId );
+                        logger.error( "Error removing BuildResult with id=" + buildId );
                         addActionError( getText( "Unable to remove BuildResult with id=" + buildId ) );
                     }
                 }
@@ -126,8 +130,8 @@
                     }
                     catch ( BuildManagerException e )
                     {
-                        getLogger().error( e.getMessage() );
-                        throw new ContinuumException( e.getMessage(), e ); 
+                        logger.error( e.getMessage() );
+                        throw new ContinuumException( e.getMessage(), e );
                     }
                 }
             }
@@ -195,5 +199,5 @@
     public void setProjectGroupId( int projectGroupId )
     {
         this.projectGroupId = projectGroupId;
-    }    
+    }
 }

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CancelBuildAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CancelBuildAction.java?rev=749538&r1=749537&r2=749538&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CancelBuildAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CancelBuildAction.java Tue Mar  3 05:54:49 2009
@@ -35,6 +35,8 @@
 import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
 import org.codehaus.plexus.taskqueue.Task;
 import org.codehaus.plexus.util.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
@@ -44,6 +46,8 @@
 public class CancelBuildAction
 	extends ContinuumActionSupport
 {
+    private Logger logger = LoggerFactory.getLogger( this.getClass() );
+
 	private int projectId;
 	
 	private int projectGroupId;
@@ -104,7 +108,7 @@
 	    }
 	    catch ( BuildManagerException e )
 	    {
-	        getLogger().error( e.getMessage() );
+	        logger.error( e.getMessage() );
 	        throw new ContinuumException( e.getMessage(), e );
 	    }
 	

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java?rev=749538&r1=749537&r2=749538&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java Tue Mar  3 05:54:49 2009
@@ -28,6 +28,8 @@
 import org.apache.maven.continuum.model.project.ProjectGroup;
 import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
 import org.apache.maven.continuum.web.model.GroupSummary;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
@@ -37,6 +39,8 @@
 public class GroupSummaryAction
     extends ContinuumActionSupport
 {
+    private Logger logger = LoggerFactory.getLogger( this.getClass() );
+
     private String infoMessage;
 
     private List<GroupSummary> groups;
@@ -53,7 +57,7 @@
 
             if ( isAuthorized( projectGroup.getName() ) )
             {
-                getLogger().debug( "GroupSummaryAction: building group " + projectGroup.getName() );
+                logger.debug( "GroupSummaryAction: building group " + projectGroup.getName() );
 
                 GroupSummary groupModel = new GroupSummary();
                 groupModel.setId( projectGroup.getId() );
@@ -72,7 +76,7 @@
 
                 for ( Project project : projects )
                 {
-                    
+
                     if ( project.getState() == 2 )
                     {
                         numSuccesses++;
@@ -94,7 +98,7 @@
                 groupModel.setNumSuccesses( numSuccesses );
                 groupModel.setNumFailures( numFailures );
                 groupModel.setNumErrors( numErrors );
-                getLogger().debug( "GroupSummaryAction: adding group to groups list " + groupModel.getName() );
+                logger.debug( "GroupSummaryAction: adding group to groups list " + groupModel.getName() );
                 groups.add( groupModel );
             }
         }

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PlexusActionSupport.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PlexusActionSupport.java?rev=749538&r1=749537&r2=749538&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PlexusActionSupport.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PlexusActionSupport.java Tue Mar  3 05:54:49 2009
@@ -34,25 +34,13 @@
  */
 public abstract class PlexusActionSupport
     extends ActionSupport
-    implements LogEnabled, SessionAware
+    implements SessionAware
 {
     protected Map session;
 
-    private Logger logger;
-
     public void setSession( Map map )
     {
         //noinspection AssignmentToCollectionOrArrayFieldFromParameter
         this.session = map;
     }
-
-    public void enableLogging( Logger logger )
-    {
-        this.logger = logger;
-    }
-
-    protected Logger getLogger()
-    {
-        return logger;
-    }
 }

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java?rev=749538&r1=749537&r2=749538&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java Tue Mar  3 05:54:49 2009
@@ -42,6 +42,8 @@
 import org.codehaus.plexus.redback.users.User;
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.dag.CycleDetectedException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -62,6 +64,8 @@
 public class ProjectGroupAction
     extends ContinuumConfirmAction
 {
+    private Logger logger = LoggerFactory.getLogger( this.getClass() );
+
     private final static Map FILTER_CRITERIA = new HashMap();
 
     static
@@ -80,7 +84,7 @@
      * @plexus.requirement role-hint="default"
      */
     private RoleManager roleManager;
-    
+
     /**
      * @plexus.requirement role-hint="parallel"
      */
@@ -161,8 +165,7 @@
                 if ( !buildDefinition.isDefaultForProject() )
                 {
                     String key = StringUtils.isEmpty( buildDefinition.getDescription() ) ? buildDefinition.getGoals()
-                        : buildDefinition
-                            .getDescription();
+                        : buildDefinition.getDescription();
                     buildDefinitions.put( key, Integer.valueOf( buildDefinition.getId() ) );
                 }
             }
@@ -346,7 +349,7 @@
             {
                 Project p = (Project) proj.next();
                 try
-                {   
+                {
                     if ( parallelBuildsManager.isInAnyCheckoutQueue( p.getId() ) )
                     {
                         projectInCOQueue = true;
@@ -386,7 +389,7 @@
         {
             Project rootProject = ( getContinuum().getProjectsInBuildOrder( projList ) ).get( 0 );
 
-            if (rootProject != null)
+            if ( rootProject != null )
             {
                 setUrl( rootProject.getUrl() );
             }
@@ -500,13 +503,12 @@
                 }
             }
 
-            ProjectGroup newProjectGroup =
-                getContinuum().getProjectGroupWithProjects( new Integer( id[0] ).intValue() );
+            ProjectGroup newProjectGroup = getContinuum().getProjectGroupWithProjects( new Integer( id[0] ).intValue() )
+                ;
 
             if ( newProjectGroup.getId() != projectGroup.getId() && isAuthorized( newProjectGroup.getName() ) )
             {
-                getLogger().info(
-                    "Moving project " + project.getName() + " to project group " + newProjectGroup.getName() );
+                logger.info( "Moving project " + project.getName() + " to project group " + newProjectGroup.getName() );
                 project.setProjectGroup( newProjectGroup );
 
                 //CONTINUUM-1512
@@ -685,7 +687,7 @@
         }
         catch ( Exception e )
         {
-            getLogger().error( "Can't get the users list", e );
+            logger.error( "Can't get the users list", e );
         }
 
         if ( !StringUtils.isEmpty( filterKey ) )

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java?rev=749538&r1=749537&r2=749538&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java Tue Mar  3 05:54:49 2009
@@ -26,6 +26,8 @@
 import org.apache.maven.continuum.model.project.Project;
 import org.apache.maven.continuum.model.project.ProjectGroup;
 import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
@@ -35,11 +37,12 @@
 public class ProjectViewAction
     extends ContinuumActionSupport
 {
+    private Logger logger = LoggerFactory.getLogger( this.getClass() );
 
     private Project project;
 
     private int projectId;
-    
+
     private String lastBuildDateTime;
 
     /**
@@ -66,20 +69,21 @@
         {
             try
             {
-            BuildResult lastBuildResult = getContinuum().getBuildResult( project.getLatestBuildId() );
-            if ( lastBuildResult != null )
-            {
-                this.setLastBuildDateTime( dateFormatter.format( new Date( lastBuildResult.getEndTime() ) ) );
+                BuildResult lastBuildResult = getContinuum().getBuildResult( project.getLatestBuildId() );
+                if ( lastBuildResult != null )
+                {
+                    this.setLastBuildDateTime( dateFormatter.format( new Date( lastBuildResult.getEndTime() ) ) );
+                }
             }
-            } catch (ContinuumException e)
+            catch ( ContinuumException e )
             {
-                getLogger().info( "buildResult with id " + project.getLatestBuildId() + " has been deleted" );
+                logger.info( "buildResult with id " + project.getLatestBuildId() + " has been deleted" );
             }
         }
 
         return SUCCESS;
     }
-    
+
     public void setProjectId( int projectId )
     {
         this.projectId = projectId;

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectsListAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectsListAction.java?rev=749538&r1=749537&r2=749538&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectsListAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectsListAction.java Tue Mar  3 05:54:49 2009
@@ -29,6 +29,8 @@
 import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.dag.CycleDetectedException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
@@ -38,8 +40,10 @@
 public class ProjectsListAction
     extends ContinuumActionSupport
 {
+    private Logger logger = LoggerFactory.getLogger( this.getClass() );
+
     private List<String> selectedProjects;
-    
+
     private List<String> selectedProjectsNames;
 
     private String projectGroupName = "";
@@ -66,14 +70,14 @@
         {
             return remove();
         }
-        else if ("confirmRemove".equals( methodToCall ))
+        else if ( "confirmRemove".equals( methodToCall ) )
         {
             return confirmRemove();
         }
 
         return SUCCESS;
     }
-   
+
     private String remove()
         throws ContinuumException
     {
@@ -94,13 +98,13 @@
 
                 try
                 {
-                    getLogger().info( "Removing Project with id=" + projectId );
+                    logger.info( "Removing Project with id=" + projectId );
 
                     getContinuum().removeProject( projectId );
                 }
                 catch ( ContinuumException e )
                 {
-                    getLogger().error( "Error removing Project with id=" + projectId );
+                    logger.error( "Error removing Project with id=" + projectId );
                     addActionError( getText( "Unable to remove Project with id=" + projectId ) );
                 }
             }
@@ -123,7 +127,7 @@
         }
         return "confirmRemove";
     }
-    
+
     private String build()
         throws ContinuumException
     {
@@ -158,7 +162,8 @@
 
             if ( this.getBuildDefinitionId() <= 0 )
             {
-                List<BuildDefinition> groupDefaultBDs = getContinuum().getDefaultBuildDefinitionsForProjectGroup( projectGroupId );
+                List<BuildDefinition> groupDefaultBDs =
+                    getContinuum().getDefaultBuildDefinitionsForProjectGroup( projectGroupId );
                 getContinuum().buildProjectsWithBuildDefinition( sortedProjects, groupDefaultBDs );
             }
             else

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java?rev=749538&r1=749537&r2=749538&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java Tue Mar  3 05:54:49 2009
@@ -28,6 +28,8 @@
 import org.apache.maven.continuum.model.project.Schedule;
 import org.apache.maven.continuum.web.exception.AuthenticationRequiredException;
 import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.opensymphony.xwork2.Preparable;
 
@@ -40,6 +42,8 @@
     extends ContinuumConfirmAction
     implements Preparable
 {
+    private Logger logger = LoggerFactory.getLogger( this.getClass() );
+
     private int id;
 
     private boolean active = false;
@@ -71,16 +75,16 @@
     private String dayOfWeek = "?";
 
     private String year;
-    
+
     private List<String> availableBuildQueues;
-    
+
     private List<String> selectedBuildQueues = new ArrayList<String>();
 
     public void prepare()
         throws Exception
     {
         super.prepare();
-        
+
         populateBuildQueues();
     }
 
@@ -88,28 +92,28 @@
         throws ContinuumException
     {
         List<BuildQueue> buildQueues = null;
-        if( schedule != null )
+        if ( schedule != null )
         {
             buildQueues = schedule.getBuildQueues();
-            for( BuildQueue buildQueue : buildQueues )
+            for ( BuildQueue buildQueue : buildQueues )
             {
                 selectedBuildQueues.add( buildQueue.getName() );
             }
 
         }
-            
+
         availableBuildQueues = new ArrayList<String>();
-        
+
         buildQueues = getContinuum().getAllBuildQueues();
-        for( BuildQueue buildQueue : buildQueues )
+        for ( BuildQueue buildQueue : buildQueues )
         {
             availableBuildQueues.add( buildQueue.getName() );
         }
-        
+
         // remove selected build queues from available build queues
-        for( String buildQueue : selectedBuildQueues )
+        for ( String buildQueue : selectedBuildQueues )
         {
-            if( availableBuildQueues.contains( buildQueue ) )
+            if ( availableBuildQueues.contains( buildQueue ) )
             {
                 availableBuildQueues.remove( buildQueue );
             }
@@ -134,7 +138,7 @@
             return REQUIRES_AUTHENTICATION;
 
         }
-        
+
         schedules = getContinuum().getSchedules();
 
         return SUCCESS;
@@ -213,7 +217,7 @@
 
         if ( ( "".equals( name ) ) || ( name == null ) )
         {
-            getLogger().error( "Can't create schedule. No schedule name was supplied." );
+            logger.error( "Can't create schedule. No schedule name was supplied." );
             addActionError( getText( "buildDefinition.noname.save.error.message" ) );
             return ERROR;
         }
@@ -258,15 +262,15 @@
         schedule.setName( name );
         schedule.setMaxJobExecutionTime( maxJobExecutionTime );
 
-     // remove old build queues
+        // remove old build queues
         schedule.setBuildQueues( null );
 
-        for( String name : selectedBuildQueues )
+        for ( String name : selectedBuildQueues )
         {
             BuildQueue buildQueue = getContinuum().getBuildQueueByName( name );
             schedule.addBuildQueue( buildQueue );
         }
-        
+
         return schedule;
     }
 
@@ -492,7 +496,8 @@
 
     private String getCronExpression()
     {
-        return ( second + " " + minute + " " + hour + " " + dayOfMonth + " " + month + " " + dayOfWeek + " " + year ).trim();
+        return ( second + " " + minute + " " + hour + " " + dayOfMonth + " " + month + " " + dayOfWeek + " " +
+            year ).trim();
     }
 
     public List<String> getAvailableBuildQueues()

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java?rev=749538&r1=749537&r2=749538&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java Tue Mar  3 05:54:49 2009
@@ -28,6 +28,8 @@
 import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
 import org.apache.maven.continuum.web.model.GroupSummary;
 import org.apache.maven.continuum.web.model.ProjectSummary;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -47,6 +49,8 @@
 public class SummaryAction
     extends ContinuumActionSupport
 {
+    private Logger logger = LoggerFactory.getLogger( this.getClass() );
+
     private int projectGroupId;
 
     private String projectGroupName;
@@ -59,7 +63,7 @@
      * @plexus.requirement role-hint="parallel"
      */
     private BuildsManager parallelBuildsManager;
-    
+
     public String execute()
         throws ContinuumException
     {
@@ -110,11 +114,11 @@
             model.setProjectType( project.getExecutorId() );
 
             try
-            {                
+            {
                 if ( parallelBuildsManager.isInAnyBuildQueue( project.getId() ) )
                 {
                     model.setInBuildingQueue( true );
-                }             
+                }
                 else if ( parallelBuildsManager.isInAnyCheckoutQueue( project.getId() ) )
                 {
                     model.setInCheckoutQueue( true );
@@ -189,7 +193,7 @@
             default:
                 if ( latestBuild.getState() == 5 || latestBuild.getState() > 10 )
                 {
-                    getLogger().warn(
+                    logger.warn(
                         "unknown buildState value " + latestBuild.getState() + " with build " + latestBuild.getId() );
                 }
         }

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigurationAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigurationAction.java?rev=749538&r1=749537&r2=749538&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigurationAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigurationAction.java Tue Mar  3 05:54:49 2009
@@ -35,6 +35,8 @@
 import org.codehaus.redback.integration.interceptor.SecureAction;
 import org.codehaus.redback.integration.interceptor.SecureActionBundle;
 import org.codehaus.redback.integration.interceptor.SecureActionException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.opensymphony.xwork2.Preparable;
 
@@ -47,6 +49,8 @@
     extends ContinuumActionSupport
     implements Preparable, SecureAction
 {
+    private Logger logger = LoggerFactory.getLogger( this.getClass() );
+
     private String workingDirectory;
 
     private String buildOutputDirectory;
@@ -54,11 +58,11 @@
     private String deploymentRepositoryDirectory;
 
     private String baseUrl;
-    
+
     private String releaseOutputDirectory;
 
     private int numberOfAllowedBuildsinParallel = 1;
-    
+
     private boolean requireReleaseOutput;
 
     private boolean distributedBuildEnabled;
@@ -92,7 +96,7 @@
             HttpServletRequest request = ServletActionContext.getRequest();
             baseUrl = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() +
                 request.getContextPath();
-            getLogger().info( "baseUrl='" + baseUrl + "'" );
+            logger.info( "baseUrl='" + baseUrl + "'" );
         }
 
         File releaseOutputDirectoryFile = configuration.getReleaseOutputDirectory();
@@ -100,14 +104,14 @@
         {
             releaseOutputDirectory = releaseOutputDirectoryFile.getAbsolutePath();
         }
-        
+
         numberOfAllowedBuildsinParallel = configuration.getNumberOfBuildsInParallel();
-        
-        if( numberOfAllowedBuildsinParallel == 0 )
+
+        if ( numberOfAllowedBuildsinParallel == 0 )
         {
             numberOfAllowedBuildsinParallel = 1;
         }
-               
+
         String requireRelease = ServletActionContext.getRequest().getParameter( "requireReleaseOutput" );
         setRequireReleaseOutput( new Boolean( requireRelease ) );
 
@@ -120,32 +124,32 @@
         {
             addActionError( getText( "configuration.releaseOutputDirectory.required" ) );
         }
-                
-        if( numberOfAllowedBuildsinParallel <= 0 )
+
+        if ( numberOfAllowedBuildsinParallel <= 0 )
         {
             addActionError( "configuration.numberOfBuildsInParallel.invalid" );
         }
-        
+
         return INPUT;
     }
 
     public String save()
         throws ConfigurationStoringException, ContinuumStoreException, ContinuumConfigurationException
     {
-        if( numberOfAllowedBuildsinParallel <= 0 )
+        if ( numberOfAllowedBuildsinParallel <= 0 )
         {
             addActionError( "Number of Allowed Builds in Parallel must be greater than zero." );
             return ERROR;
         }
-        
+
         ConfigurationService configuration = getContinuum().getConfiguration();
 
         configuration.setWorkingDirectory( new File( workingDirectory ) );
 
         configuration.setBuildOutputDirectory( new File( buildOutputDirectory ) );
-        
-        configuration.setNumberOfBuildsInParallel( numberOfAllowedBuildsinParallel );	
-        
+
+        configuration.setNumberOfBuildsInParallel( numberOfAllowedBuildsinParallel );
+
         if ( StringUtils.isNotEmpty( deploymentRepositoryDirectory ) )
         {
             configuration.setDeploymentRepositoryDirectory( new File( deploymentRepositoryDirectory ) );
@@ -244,21 +248,21 @@
     {
         return requireReleaseOutput;
     }
-    
+
     public void setRequireReleaseOutput( boolean requireReleaseOutput )
     {
         this.requireReleaseOutput = requireReleaseOutput;
     }
-    
-	public int getNumberOfAllowedBuildsinParallel() 
-	{
-	    return numberOfAllowedBuildsinParallel;
-	}
-
-	public void setNumberOfAllowedBuildsinParallel( int numberOfAllowedBuildsinParallel ) 
-	{
-	    this.numberOfAllowedBuildsinParallel = numberOfAllowedBuildsinParallel;
-	}
+
+    public int getNumberOfAllowedBuildsinParallel()
+    {
+        return numberOfAllowedBuildsinParallel;
+    }
+
+    public void setNumberOfAllowedBuildsinParallel( int numberOfAllowedBuildsinParallel )
+    {
+        this.numberOfAllowedBuildsinParallel = numberOfAllowedBuildsinParallel;
+    }
 
     public boolean isDistributedBuildEnabled()
     {

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java?rev=749538&r1=749537&r2=749538&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java Tue Mar  3 05:54:49 2009
@@ -39,6 +39,8 @@
 import org.codehaus.redback.integration.interceptor.SecureAction;
 import org.codehaus.redback.integration.interceptor.SecureActionBundle;
 import org.codehaus.redback.integration.interceptor.SecureActionException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.opensymphony.xwork2.Preparable;
 
@@ -51,8 +53,9 @@
 public class ProfileAction
     extends ContinuumActionSupport
     implements Preparable, SecureAction
-
 {
+    private Logger logger = LoggerFactory.getLogger( this.getClass() );
+
     /**
      * @plexus.requirement role-hint="default"
      */
@@ -110,7 +113,7 @@
         {
             addActionError( errorMessage );
         }
-        
+
         this.profiles = profileService.getAllProfiles();
         return SUCCESS;
     }
@@ -118,9 +121,9 @@
     public String edit()
         throws Exception
     {
-        if ( getLogger().isDebugEnabled() )
+        if ( logger.isDebugEnabled() )
         {
-            getLogger().debug( "edit profile with id " + profile.getId() );
+            logger.debug( "edit profile with id " + profile.getId() );
         }
         this.profile = profileService.getProfile( profile.getId() );
         return SUCCESS;
@@ -161,7 +164,8 @@
                 profile = profileService.getProfile( profile.getId() );
                 // CONTINUUM-1746 we update the profile only if the name has changed 
                 // jancajas: added build agent group. updated profile if agent group is changed also.
-                if ( !StringUtils.equals( name, profile.getName() ) || !StringUtils.equals( buildAgentGroup, profile.getBuildAgentGroup() ))
+                if ( !StringUtils.equals( name, profile.getName() ) ||
+                    !StringUtils.equals( buildAgentGroup, profile.getBuildAgentGroup() ) )
                 {
                     profile.setName( name );
                     profile.setBuildAgentGroup( buildAgentGroup );
@@ -180,7 +184,7 @@
 
     public String delete()
         throws Exception
-    {   
+    {
         try
         {
             profileService.deleteProfile( profile.getId() );
@@ -200,7 +204,7 @@
         this.profile = getContinuum().getProfileService().getProfile( profile.getId() );
         return SUCCESS;
     }
-    
+
     public String addInstallation()
         throws Exception
     {
@@ -227,7 +231,7 @@
     // -----------------------------------------------------
     // security
     // -----------------------------------------------------    
-    
+
     public SecureActionBundle getSecureActionBundle()
         throws SecureActionException
     {
@@ -236,8 +240,8 @@
         bundle.addRequiredAuthorization( ContinuumRoleConstants.CONTINUUM_MANAGE_PROFILES, Resource.GLOBAL );
 
         return bundle;
-    }    
-    
+    }
+
     // -------------------------------------------------------
     // Webwork setter/getter
     // -------------------------------------------------------
@@ -270,7 +274,7 @@
             this.allInstallations = installationService.getAllInstallations();
         }
         // CONTINUUM-1742 (olamy) don't display already attached en var
-        if (this.profile != null)
+        if ( this.profile != null )
         {
             this.allInstallations.removeAll( this.profile.getEnvironmentVariables() );
         }



Mime
View raw message