continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r369115 - in /maven/continuum/trunk/continuum-core: ./ src/main/java/org/apache/maven/continuum/buildcontroller/ src/main/java/org/apache/maven/continuum/configuration/ src/main/java/org/apache/maven/continuum/core/action/ src/main/java/org...
Date Sat, 14 Jan 2006 23:32:31 GMT
Author: evenisse
Date: Sat Jan 14 15:32:28 2006
New Revision: 369115

URL: http://svn.apache.org/viewcvs?rev=369115&view=rev
Log:
Clean imports

Modified:
    maven/continuum/trunk/continuum-core/   (props changed)
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutor.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java
    maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/security/DefaultContinuumSecurityTest.java

Propchange: maven/continuum/trunk/continuum-core/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Jan 14 15:32:28 2006
@@ -6,3 +6,4 @@
 *.ipr
 *.iws
 *.iml
+.wtpmodules

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutor.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutor.java?rev=369115&r1=369114&r2=369115&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutor.java
(original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutor.java
Sat Jan 14 15:32:28 2006
@@ -50,6 +50,7 @@
     {
         BuildProjectTask buildProjectTask = (BuildProjectTask) task;
 
-        controller.build( buildProjectTask.getProjectId(), buildProjectTask.getBuildDefinitionId(),
buildProjectTask.getTrigger() );
+        controller.build( buildProjectTask.getProjectId(), buildProjectTask.getBuildDefinitionId(),
buildProjectTask
+            .getTrigger() );
     }
 }

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java?rev=369115&r1=369114&r2=369115&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java
(original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java
Sat Jan 14 15:32:28 2006
@@ -23,12 +23,7 @@
 import org.codehaus.plexus.util.FileUtils;
 
 import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
 import java.io.IOException;
-import java.io.Writer;
-import java.util.Date;
 import java.util.Map;
 
 /**

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java?rev=369115&r1=369114&r2=369115&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java
(original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java
Sat Jan 14 15:32:28 2006
@@ -31,7 +31,6 @@
 
 import java.io.File;
 import java.util.Date;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -80,10 +79,8 @@
         // This is really a precondition for this action to execute
         // ----------------------------------------------------------------------
 
-        if ( project.getOldState() != ContinuumProjectState.NEW &&
-             scmResult.getChanges().size() == 0 &&
-             trigger != ContinuumProjectState.TRIGGER_FORCED &&
-            !isNew( project ) )
+        if ( project.getOldState() != ContinuumProjectState.NEW && scmResult.getChanges().size()
== 0
+            && trigger != ContinuumProjectState.TRIGGER_FORCED && !isNew(
project ) )
         {
             getLogger().info( "No files updated, not building. Project id '" + project.getId()
+ "'." );
 
@@ -151,7 +148,8 @@
 
             build.setBuildNumber( project.getBuildNumber() );
 
-            if ( build.getState() != ContinuumProjectState.OK && build.getState()
!= ContinuumProjectState.FAILED && build.getState() != ContinuumProjectState.ERROR
)
+            if ( build.getState() != ContinuumProjectState.OK && build.getState()
!= ContinuumProjectState.FAILED
+                && build.getState() != ContinuumProjectState.ERROR )
             {
                 build.setState( ContinuumProjectState.ERROR );
             }

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java?rev=369115&r1=369114&r2=369115&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java
(original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java
Sat Jan 14 15:32:28 2006
@@ -162,8 +162,7 @@
 
             if ( StringUtils.isEmpty( scmConnection ) )
             {
-                throw new MavenOneMetadataHelperException(
-                    "Missing both anonymous and developer SCM connection URLs." );
+                throw new MavenOneMetadataHelperException( "Missing both anonymous and developer
SCM connection URLs." );
             }
         }
 
@@ -255,8 +254,6 @@
         }
         else
         {
-            String currentNagEmailAddress = null;
-
             String nagEmailAddress = getValue( build, "nagEmailAddress", null );
 
             if ( nagEmailAddress != null )

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java?rev=369115&r1=369114&r2=369115&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java
(original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java
Sat Jan 14 15:32:28 2006
@@ -23,14 +23,13 @@
 import org.apache.maven.continuum.model.project.ProjectDependency;
 import org.apache.maven.continuum.model.project.ProjectDeveloper;
 import org.apache.maven.continuum.model.project.ProjectNotifier;
-import org.apache.maven.model.CiManagement;
 import org.apache.maven.model.Dependency;
 import org.apache.maven.model.Developer;
 import org.apache.maven.model.Notifier;
 import org.apache.maven.model.Scm;
+import org.apache.maven.project.DefaultMavenProjectBuilder;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectBuilder;
-import org.apache.maven.project.DefaultMavenProjectBuilder;
 import org.apache.maven.settings.MavenSettingsBuilder;
 import org.apache.maven.settings.Settings;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
@@ -40,7 +39,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
@@ -237,7 +235,7 @@
         }
 
         continuumProject.setNotifiers( getNotifiers( mavenProject ) );
-        
+
         for ( Iterator i = userNotifiers.iterator(); i.hasNext(); )
         {
             ProjectNotifier notifier = (ProjectNotifier) i.next();
@@ -257,7 +255,7 @@
             //   This seems like code that is shared with DefaultMaven, so it should be mobed
to the project
             //   builder perhaps
             // TODO: Remove cast
-            project = ( (DefaultMavenProjectBuilder) projectBuilder).build( file, getRepository(),
null, false );
+            project = ( (DefaultMavenProjectBuilder) projectBuilder ).build( file, getRepository(),
null, false );
         }
         catch ( Exception e )
         {
@@ -277,14 +275,16 @@
 
         if ( scm == null )
         {
-            throw new MavenBuilderHelperException( "Missing 'scm' element in the " + getProjectName(
project ) + " POM." );
+            throw new MavenBuilderHelperException( "Missing 'scm' element in the " + getProjectName(
project )
+                + " POM." );
         }
 
         String url = scm.getConnection();
 
         if ( StringUtils.isEmpty( url ) )
         {
-            throw new MavenBuilderHelperException( "Missing 'connection' element in the 'scm'
element in the " + getProjectName( project ) + " POM." );
+            throw new MavenBuilderHelperException( "Missing 'connection' element in the 'scm'
element in the "
+                + getProjectName( project ) + " POM." );
         }
 
         return project;

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java?rev=369115&r1=369114&r2=369115&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java
(original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java
Sat Jan 14 15:32:28 2006
@@ -16,7 +16,6 @@
  * limitations under the License.
  */
 
-import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.configuration.ConfigurationService;
 import org.apache.maven.continuum.model.project.BuildResult;
 import org.apache.maven.continuum.model.project.Project;
@@ -201,7 +200,7 @@
     }
 
     private void buildComplete( Project project, BuildResult build, String buildOutput, String
source, Set recipients,
-                                Map configuration )
+                               Map configuration )
         throws NotificationException
     {
         // ----------------------------------------------------------------------
@@ -354,8 +353,10 @@
 
         if ( fromMailbox == null )
         {
-            getLogger().warn( project.getName() +
-                ": Project is missing nag email and global from mailbox is missing, not sending
mail." );
+            getLogger()
+                .warn(
+                       project.getName()
+                           + ": Project is missing nag email and global from mailbox is missing,
not sending mail." );
 
             return;
         }
@@ -448,8 +449,8 @@
 
         if ( currentBuild != null && build.getId() != currentBuild.getId() )
         {
-            throw new NotificationException( "INTERNAL ERROR: The current build wasn't the
first in the build list. " +
-                "Current build: '" + currentBuild.getId() + "', " + "first build: '" + build.getId()
+ "'." );
+            throw new NotificationException( "INTERNAL ERROR: The current build wasn't the
first in the build list. "
+                + "Current build: '" + currentBuild.getId() + "', " + "first build: '" +
build.getId() + "'." );
         }
 
         return (BuildResult) builds.get( builds.size() - 2 );

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java?rev=369115&r1=369114&r2=369115&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java
(original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java
Sat Jan 14 15:32:28 2006
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-import org.apache.maven.continuum.model.project.Project;
 import org.apache.maven.continuum.model.project.BuildResult;
+import org.apache.maven.continuum.model.project.Project;
 import org.apache.maven.continuum.model.scm.ChangeFile;
 import org.apache.maven.continuum.model.scm.ChangeSet;
 import org.apache.maven.continuum.model.scm.ScmResult;
@@ -28,9 +28,8 @@
 import org.apache.maven.scm.ScmFileSet;
 import org.apache.maven.scm.command.checkout.CheckOutScmResult;
 import org.apache.maven.scm.command.update.UpdateScmResult;
-import org.apache.maven.scm.manager.ScmManager;
 import org.apache.maven.scm.manager.NoSuchScmProviderException;
-import org.apache.maven.scm.provider.ScmProviderRepository;
+import org.apache.maven.scm.manager.ScmManager;
 import org.apache.maven.scm.repository.ScmRepository;
 import org.apache.maven.scm.repository.ScmRepositoryException;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
@@ -95,8 +94,6 @@
 
             ScmRepository repository = getScmRepositorty( project );
 
-            ScmProviderRepository providerRepository = repository.getProviderRepository();
-
             ScmResult result;
 
             synchronized ( this )
@@ -211,8 +208,6 @@
             }
 
             ScmRepository repository = getScmRepositorty( project );
-
-            ScmProviderRepository providerRepository = repository.getProviderRepository();
 
             ScmResult result;
 

Modified: maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/security/DefaultContinuumSecurityTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/security/DefaultContinuumSecurityTest.java?rev=369115&r1=369114&r2=369115&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/security/DefaultContinuumSecurityTest.java
(original)
+++ maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/security/DefaultContinuumSecurityTest.java
Sat Jan 14 15:32:28 2006
@@ -19,7 +19,6 @@
 import org.apache.maven.continuum.AbstractContinuumTest;
 import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.model.system.ContinuumUser;
-import org.apache.maven.continuum.model.system.UserGroup;
 
 /**
  * @author <a href="mailto:evenisse@apache">Emmanuel Venisse</a>



Mime
View raw message