continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r548742 [2/3] - in /maven/continuum/trunk: continuum-api/src/main/java/org/apache/maven/continuum/ continuum-api/src/main/java/org/apache/maven/continuum/execution/ continuum-api/src/main/java/org/apache/maven/continuum/installation/ contin...
Date Tue, 19 Jun 2007 14:40:57 GMT
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/installation/DefaultInstallationService.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/installation/DefaultInstallationService.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/installation/DefaultInstallationService.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/installation/DefaultInstallationService.java Tue Jun 19 07:40:51 2007
@@ -19,15 +19,6 @@
  * under the License.
  */
 
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
 import org.apache.maven.continuum.model.system.Installation;
 import org.apache.maven.continuum.store.ContinuumStore;
 import org.apache.maven.continuum.store.ContinuumStoreException;
@@ -39,12 +30,21 @@
 import org.codehaus.plexus.util.cli.Commandline;
 import org.codehaus.plexus.util.cli.StreamConsumer;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
 /**
  * @author <a href="mailto:olamy@codehaus.org">olamy</a>
- * @since 13 juin 07
  * @version $Id$
  * @plexus.component role="org.apache.maven.continuum.installation.InstallationService"
  * TODO use some cache mechanism to prevent always reading from store ?
+ * @since 13 juin 07
  */
 public class DefaultInstallationService
     implements InstallationService, Initializable
@@ -73,7 +73,7 @@
         this.typesValues.put( InstallationService.MAVEN2_TYPE, "M2_HOME" );
     }
 
-    /** 
+    /**
      * @see org.apache.maven.continuum.installation.InstallationService#add(org.apache.maven.continuum.model.system.Installation)
      */
     public Installation add( Installation installation )
@@ -95,7 +95,7 @@
         }
     }
 
-    /** 
+    /**
      * @see org.apache.maven.continuum.installation.InstallationService#delete(org.apache.maven.continuum.model.system.Installation)
      */
     public void delete( Installation installation )
@@ -113,7 +113,7 @@
 
     }
 
-    /** 
+    /**
      * @see org.apache.maven.continuum.installation.InstallationService#getAllInstallations()
      */
     public List<Installation> getAllInstallations()
@@ -130,7 +130,7 @@
         }
     }
 
-    /** 
+    /**
      * @see org.apache.maven.continuum.installation.InstallationService#getInstallation(java.lang.String)
      */
     public Installation getInstallation( String name )
@@ -146,7 +146,7 @@
         }
     }
 
-    /** 
+    /**
      * @see org.apache.maven.continuum.installation.InstallationService#update(org.apache.maven.continuum.model.system.Installation)
      */
     public void update( Installation installation )
@@ -182,7 +182,7 @@
 
     }
 
-    /** 
+    /**
      * @see org.apache.maven.continuum.installation.InstallationService#getTypeEnvVar(java.lang.String)
      */
     public String getEnvVar( String type )
@@ -194,7 +194,7 @@
     // versions informations on jdk and builders (mvn, maven, ant )
     // -------------------------------------------------------------
 
-    /** 
+    /**
      * @see org.apache.maven.continuum.installation.InstallationService#getDefaultJdkInformations()
      */
     public List<String> getDefaultJdkInformations()
@@ -217,7 +217,7 @@
         }
     }
 
-    /** 
+    /**
      * @see org.apache.maven.continuum.installation.InstallationService#getJdkInformations(org.apache.maven.continuum.model.system.Installation)
      */
     public List<String> getJdkInformations( Installation installation )
@@ -254,7 +254,7 @@
         }
         */
         commandline.setExecutable( executable );
-        commandline.addArguments( new String[] { "-version" } );
+        commandline.addArguments( new String[]{"-version"} );
         final List<String> cliOutput = new ArrayList<String>();
         //TODO ShellCommandHelper ?
         int result = CommandLineUtils.executeCommandLine( commandline, new StreamConsumer()

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/DefaultContinuumNotificationDispatcher.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/DefaultContinuumNotificationDispatcher.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/DefaultContinuumNotificationDispatcher.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/DefaultContinuumNotificationDispatcher.java Tue Jun 19 07:40:51 2007
@@ -142,7 +142,8 @@
                 context.put( CONTEXT_UPDATE_SCM_RESULT, buildResult.getScmResult() );
             }
 
-            ProjectGroup projectGroup = store.getProjectGroupWithBuildDetailsByProjectGroupId( project.getProjectGroup().getId() );
+            ProjectGroup projectGroup =
+                store.getProjectGroupWithBuildDetailsByProjectGroupId( project.getProjectGroup().getId() );
 
             // perform the project lvl notifications
             for ( Iterator i = project.getNotifiers().iterator(); i.hasNext(); )

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/console/ConsoleNotifier.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/console/ConsoleNotifier.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/console/ConsoleNotifier.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/console/ConsoleNotifier.java Tue Jun 19 07:40:51 2007
@@ -33,10 +33,8 @@
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  * @version $Id$
- *
- * @plexus.component
- *   role="org.codehaus.plexus.notification.notifier.Notifier"
- *   role-hint="console"
+ * @plexus.component role="org.codehaus.plexus.notification.notifier.Notifier"
+ * role-hint="console"
  */
 public class ConsoleNotifier
     extends AbstractNotifier
@@ -141,7 +139,7 @@
     }
 
     /**
-     * @see org.codehaus.plexus.notification.notifier.Notifier#sendNotification(java.lang.String, java.util.Set, java.util.Properties)
+     * @see org.codehaus.plexus.notification.notifier.Notifier#sendNotification(java.lang.String,java.util.Set,java.util.Properties)
      */
     public void sendNotification( String arg0, Set arg1, Properties arg2 )
         throws NotificationException

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/FormatterTool.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/FormatterTool.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/FormatterTool.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/FormatterTool.java Tue Jun 19 07:40:51 2007
@@ -87,7 +87,8 @@
 
     public String formatTimestamp( long timestamp )
     {
-        if (timestamp <= 0) {
+        if ( timestamp <= 0 )
+        {
             return null;
         }
         return getSimpleDateFormat( timestampFormat, timestampFormatString ).format( new Date( timestamp ) );
@@ -140,8 +141,10 @@
         return dateFormat;
     }
 
-    public String trim(String str) {
-        if (str == null) {
+    public String trim( String str )
+    {
+        if ( str == null )
+        {
             return "";
         }
         return str.trim();

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- 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 Tue Jun 19 07:40:51 2007
@@ -19,15 +19,6 @@
  * under the License.
  */
 
-import java.io.StringWriter;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
 import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.configuration.ConfigurationService;
 import org.apache.maven.continuum.installation.InstallationException;
@@ -52,6 +43,15 @@
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.velocity.VelocityComponent;
 
+import java.io.StringWriter;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+
 /**
  * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
  * @version $Id$
@@ -222,9 +222,8 @@
         }
     }
 
-    private void buildComplete( Project project, ProjectNotifier projectNotifier, BuildResult build,
-                                String buildOutput, String source, Set recipients, Map configuration,
-                                BuildDefinition buildDefinition )
+    private void buildComplete( Project project, ProjectNotifier projectNotifier, BuildResult build, String buildOutput,
+                                String source, Set recipients, Map configuration, BuildDefinition buildDefinition )
         throws NotificationException
     {
 
@@ -295,12 +294,12 @@
 
                 context.put( "osName", osName );
 
-                context.put( "javaVersion", System.getProperty( "java.version" ) + "("
-                    + System.getProperty( "java.vendor" ) + ")" );
+                context.put( "javaVersion",
+                             System.getProperty( "java.version" ) + "(" + System.getProperty( "java.vendor" ) + ")" );
 
                 // TODO only in case of a java project ?
                 context.put( "javaHomeInformations", getJavaHomeInformations( buildDefinition ) );
-                
+
                 // TODO add other informations on profile : builder version other envVars used
 
                 // ----------------------------------------------------------------------
@@ -402,9 +401,8 @@
         if ( fromMailbox == null )
         {
             getLogger()
-                .warn(
-                       project.getName()
-                           + ": Project is missing nag email and global from mailbox is missing, not sending mail." );
+                .warn( project.getName() +
+                    ": Project is missing nag email and global from mailbox is missing, not sending mail." );
 
             return;
         }
@@ -497,8 +495,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/profile/DefaultProfileService.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/profile/DefaultProfileService.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/profile/DefaultProfileService.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/profile/DefaultProfileService.java Tue Jun 19 07:40:51 2007
@@ -19,20 +19,20 @@
  * under the License.
  */
 
-import java.util.List;
-
 import org.apache.maven.continuum.model.system.Installation;
 import org.apache.maven.continuum.model.system.Profile;
 import org.apache.maven.continuum.store.ContinuumObjectNotFoundException;
 import org.apache.maven.continuum.store.ContinuumStore;
 import org.apache.maven.continuum.store.ContinuumStoreException;
 
+import java.util.List;
+
 /**
  * @author <a href="mailto:olamy@codehaus.org">olamy</a>
- * @since 15 juin 07
  * @version $Id$
  * @plexus.component role="org.apache.maven.continuum.profile.ProfileService"
  * TODO use some cache mechanism to prevent always reading from store ?
+ * @since 15 juin 07
  */
 public class DefaultProfileService
     implements ProfileService
@@ -43,7 +43,7 @@
      */
     private ContinuumStore store;
 
-    /** 
+    /**
      * @see org.apache.maven.continuum.profile.ProfileService#updateProfile(org.apache.maven.continuum.model.system.Profile)
      */
     public void updateProfile( Profile profile )
@@ -67,7 +67,7 @@
         }
     }
 
-    /** 
+    /**
      * @see org.apache.maven.continuum.profile.ProfileService#addProfile(org.apache.maven.continuum.model.system.Profile)
      */
     public Profile addProfile( Profile profile )
@@ -80,7 +80,7 @@
         return store.addProfile( profile );
     }
 
-    /** 
+    /**
      * @see org.apache.maven.continuum.profile.ProfileService#deletedProfile(int)
      */
     public void deleteProfile( int profileId )
@@ -89,7 +89,7 @@
         store.removeProfile( getProfile( profileId ) );
     }
 
-    /** 
+    /**
      * @see org.apache.maven.continuum.profile.ProfileService#getAllProfiles()
      */
     public List<Profile> getAllProfiles()
@@ -98,7 +98,7 @@
         return store.getAllProfilesByName();
     }
 
-    /** 
+    /**
      * @see org.apache.maven.continuum.profile.ProfileService#getProfile(int)
      */
     public Profile getProfile( int profileId )
@@ -119,8 +119,8 @@
         }
     }
 
-    /** 
-     * @see org.apache.maven.continuum.profile.ProfileService#setBuilderInProfile(org.apache.maven.continuum.model.system.Profile, org.apache.maven.continuum.model.system.Installation)
+    /**
+     * @see org.apache.maven.continuum.profile.ProfileService#setBuilderInProfile(org.apache.maven.continuum.model.system.Profile,org.apache.maven.continuum.model.system.Installation)
      */
     public void setBuilderInProfile( Profile profile, Installation builder )
         throws ProfileException
@@ -137,8 +137,8 @@
         }
     }
 
-    /** 
-     * @see org.apache.maven.continuum.profile.ProfileService#setJdkInProfile(org.apache.maven.continuum.model.system.Profile, org.apache.maven.continuum.model.system.Installation)
+    /**
+     * @see org.apache.maven.continuum.profile.ProfileService#setJdkInProfile(org.apache.maven.continuum.model.system.Profile,org.apache.maven.continuum.model.system.Installation)
      */
     public void setJdkInProfile( Profile profile, Installation jdk )
         throws ProfileException
@@ -155,8 +155,8 @@
         }
     }
 
-    /** 
-     * @see org.apache.maven.continuum.profile.ProfileService#addEnvVarInProfile(org.apache.maven.continuum.model.system.Profile, org.apache.maven.continuum.model.system.Installation)
+    /**
+     * @see org.apache.maven.continuum.profile.ProfileService#addEnvVarInProfile(org.apache.maven.continuum.model.system.Profile,org.apache.maven.continuum.model.system.Installation)
      */
     public void addEnvVarInProfile( Profile profile, Installation envVar )
         throws ProfileException

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/manager/DefaultContinuumProjectBuilderManager.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/manager/DefaultContinuumProjectBuilderManager.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/manager/DefaultContinuumProjectBuilderManager.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/manager/DefaultContinuumProjectBuilderManager.java Tue Jun 19 07:40:51 2007
@@ -27,10 +27,8 @@
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  * @version $Id$
- *
- * @plexus.component
- *   role="org.apache.maven.continuum.project.builder.manager.ContinuumProjectBuilderManager"
- *   role-hint="default"
+ * @plexus.component role="org.apache.maven.continuum.project.builder.manager.ContinuumProjectBuilderManager"
+ * role-hint="default"
  */
 public class DefaultContinuumProjectBuilderManager
     extends AbstractLogEnabled
@@ -48,7 +46,7 @@
     public ContinuumProjectBuilder getProjectBuilder( String id )
         throws ContinuumProjectBuilderManagerException
     {
-        ContinuumProjectBuilder projectBuilder = ( ContinuumProjectBuilder ) projectBuilders.get( id );
+        ContinuumProjectBuilder projectBuilder = (ContinuumProjectBuilder) projectBuilders.get( id );
 
         if ( projectBuilder == null )
         {

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilder.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilder.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilder.java Tue Jun 19 07:40:51 2007
@@ -40,10 +40,8 @@
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  * @version $Id$
- *
- * @plexus.component
- *   role="org.apache.maven.continuum.project.builder.ContinuumProjectBuilder"
- *   role-hint="maven-one-builder"
+ * @plexus.component role="org.apache.maven.continuum.project.builder.ContinuumProjectBuilder"
+ * role-hint="maven-one-builder"
  */
 public class MavenOneContinuumProjectBuilder
     extends AbstractContinuumProjectBuilder
@@ -72,7 +70,7 @@
         File pomFile;
 
         pomFile = createMetadataFile( result, url, username, password );
-        
+
         if ( pomFile == null )
         {
             return result;
@@ -83,7 +81,7 @@
         try
         {
             metadataHelper.mapMetadata( result, pomFile, project );
-            
+
             if ( result.hasErrors() )
             {
                 return result;
@@ -117,7 +115,7 @@
         catch ( MavenOneMetadataHelperException e )
         {
             getLogger().error( "Unknown error while processing metadata", e );
-            
+
             result.addError( ContinuumProjectBuildingResult.ERROR_UNKNOWN );
         }
 

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scheduler/ContinuumBuildJob.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scheduler/ContinuumBuildJob.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scheduler/ContinuumBuildJob.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scheduler/ContinuumBuildJob.java Tue Jun 19 07:40:51 2007
@@ -77,7 +77,7 @@
                 Thread.sleep( schedule.getDelay() * 1000 );
             }
         }
-        catch( InterruptedException e )
+        catch ( InterruptedException e )
         {
         }
     }

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scheduler/ContinuumSchedulerConstants.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scheduler/ContinuumSchedulerConstants.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scheduler/ContinuumSchedulerConstants.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scheduler/ContinuumSchedulerConstants.java Tue Jun 19 07:40:51 2007
@@ -25,26 +25,38 @@
  */
 public class ContinuumSchedulerConstants
 {
-    /** Checkout before performing a build */
+    /**
+     * Checkout before performing a build
+     */
     public static final int SCM_MODE_CHECKOUT = 0;
 
-    /** Update before performing a build */
+    /**
+     * Update before performing a build
+     */
     public static final int SCM_MODE_UPDATE = 1;
 
     // ----------------------------------------------------------------------
     // Default Schedule
     // ----------------------------------------------------------------------
 
-    /** Default schedule name */
+    /**
+     * Default schedule name
+     */
     public static final String DEFAULT_SCHEDULE_NAME = "Default";
 
-    /** Default schedule description */
+    /**
+     * Default schedule description
+     */
     public static final String DEFAULT_SCHEDULE_DESC = "Default Continuum Schedule";
 
-    /** Default scm mode which is to update */
+    /**
+     * Default scm mode which is to update
+     */
     public static final int DEFAULT_SCHEDULE_SCM_MODE = SCM_MODE_UPDATE;
 
-    /** Every hour on the hour */
+    /**
+     * Every hour on the hour
+     */
     public static final String DEFAULT_CRON_EXPRESSION = "0 0 * * * ?";
 
     // ----------------------------------------------------------------------

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTaskExecutor.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTaskExecutor.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTaskExecutor.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTaskExecutor.java Tue Jun 19 07:40:51 2007
@@ -35,10 +35,8 @@
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  * @version $Id$
- *
- * @plexus.component
- *   role="org.codehaus.plexus.taskqueue.execution.TaskExecutor"
- *   role-hint="check-out-project"
+ * @plexus.component role="org.codehaus.plexus.taskqueue.execution.TaskExecutor"
+ * role-hint="check-out-project"
  */
 public class CheckOutTaskExecutor
     extends AbstractLogEnabled

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/DefaultWorkingDirectoryService.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/DefaultWorkingDirectoryService.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/DefaultWorkingDirectoryService.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/DefaultWorkingDirectoryService.java Tue Jun 19 07:40:51 2007
@@ -28,10 +28,8 @@
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  * @version $Id$
- *
- * @plexus.component
- *   role="org.apache.maven.continuum.utils.WorkingDirectoryService"
- *   role-hint="default"
+ * @plexus.component role="org.apache.maven.continuum.utils.WorkingDirectoryService"
+ * role-hint="default"
  */
 public class DefaultWorkingDirectoryService
     extends AbstractLogEnabled
@@ -57,9 +55,9 @@
         File workDir;
         if ( project.getWorkingDirectory() == null )
         {
-           workDir  = new File( configurationService.getWorkingDirectory(), Integer.toString( project.getId() ) );
+            workDir = new File( configurationService.getWorkingDirectory(), Integer.toString( project.getId() ) );
 
-           project.setWorkingDirectory( workDir.getAbsolutePath() );
+            project.setWorkingDirectory( workDir.getAbsolutePath() );
         }
         else
         {

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/PlexusContainerManager.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/PlexusContainerManager.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/PlexusContainerManager.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/PlexusContainerManager.java Tue Jun 19 07:40:51 2007
@@ -34,6 +34,7 @@
     private PlexusContainerManager()
     {
     }
+
     public static synchronized PlexusContainerManager getInstance()
     {
         if ( instance == null )

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/shell/DefaultShellCommandHelper.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/shell/DefaultShellCommandHelper.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/shell/DefaultShellCommandHelper.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/shell/DefaultShellCommandHelper.java Tue Jun 19 07:40:51 2007
@@ -35,10 +35,8 @@
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  * @version $Id$
- *
- * @plexus.component
- *   role="org.apache.maven.continuum.utils.shell.ShellCommandHelper"
- *   role-hint="default"
+ * @plexus.component role="org.apache.maven.continuum.utils.shell.ShellCommandHelper"
+ * role-hint="default"
  */
 public class DefaultShellCommandHelper
     extends AbstractLogEnabled
@@ -48,8 +46,8 @@
     // ShellCommandHelper Implementation
     // ----------------------------------------------------------------------
 
-    public ExecutionResult executeShellCommand( File workingDirectory, String executable, String arguments,
-                                                File output, long idCommand, Map<String, String> environments )
+    public ExecutionResult executeShellCommand( File workingDirectory, String executable, String arguments, File output,
+                                                long idCommand, Map<String, String> environments )
         throws Exception
     {
         Commandline cl = new Commandline();
@@ -58,7 +56,8 @@
 
         argument.setLine( arguments );
 
-        return executeShellCommand( workingDirectory, executable, argument.getParts(), output, idCommand, environments );
+        return executeShellCommand( workingDirectory, executable, argument.getParts(), output, idCommand,
+                                    environments );
     }
 
     public ExecutionResult executeShellCommand( File workingDirectory, String executable, String[] arguments,
@@ -73,8 +72,6 @@
 
         cl.setPid( idCommand );
 
-        
-
         cl.addEnvironment( "MAVEN_TERMINATE_CMD", "on" );
 
         if ( environments != null && !environments.isEmpty() )
@@ -88,7 +85,7 @@
         }
 
         cl.addSystemEnvironment();
-        
+
         cl.setExecutable( executable );
 
         cl.setWorkingDirectory( workingDirectory.getAbsolutePath() );

Modified: maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutorTest.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutorTest.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutorTest.java (original)
+++ maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutorTest.java Tue Jun 19 07:40:51 2007
@@ -42,9 +42,7 @@
 import java.util.Map;
 
 /**
- *
  * @author <a href="mailto:kenney@apache.org">Kenney Westerhof</a>
- *
  */
 public class BuildProjectTaskExecutorTest
     extends AbstractContinuumTest
@@ -64,8 +62,8 @@
     {
         super.setUp();
 
-        projectBuilder = (ContinuumProjectBuilder) lookup( ContinuumProjectBuilder.ROLE,
-                                                           MavenTwoContinuumProjectBuilder.ID );
+        projectBuilder =
+            (ContinuumProjectBuilder) lookup( ContinuumProjectBuilder.ROLE, MavenTwoContinuumProjectBuilder.ID );
 
         buildQueue = (TaskQueue) lookup( TaskQueue.ROLE, "build-project" );
 
@@ -168,8 +166,7 @@
      * Runs the timeout test project through the build queue and return when the unit test in it has started. The
      * project contains a unit test that sleeps for 15 seconds.
      *
-     * @param maxRunTime
-     *            maximum time the build may run before it's auto cancelled; 0 means forever.
+     * @param maxRunTime maximum time the build may run before it's auto cancelled; 0 means forever.
      * @return
      * @throws Exception
      */

Modified: maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/buildcontroller/DefaultBuildControllerTest.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/buildcontroller/DefaultBuildControllerTest.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/buildcontroller/DefaultBuildControllerTest.java (original)
+++ maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/buildcontroller/DefaultBuildControllerTest.java Tue Jun 19 07:40:51 2007
@@ -57,14 +57,14 @@
         BuildResult buildResult1 = new BuildResult();
         buildResult1.setStartTime( Calendar.getInstance().getTimeInMillis() );
         buildResult1.setEndTime( Calendar.getInstance().getTimeInMillis() );
-        buildResult1.setState( ContinuumProjectState.OK);
+        buildResult1.setState( ContinuumProjectState.OK );
         buildResult1.setSuccess( true );
         getStore().addBuildResult( project1, buildResult1 );
         BuildResult buildResult2 = new BuildResult();
         buildResult2.setStartTime( Calendar.getInstance().getTimeInMillis() - 7200000 );
         buildResult2.setEndTime( Calendar.getInstance().getTimeInMillis() - 7200000 );
         buildResult2.setSuccess( true );
-        buildResult2.setState( ContinuumProjectState.OK);
+        buildResult2.setState( ContinuumProjectState.OK );
         getStore().addBuildResult( project1, buildResult2 );
 
         Project project2 = createProject( "project2" );

Modified: maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadataTest.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadataTest.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadataTest.java (original)
+++ maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadataTest.java Tue Jun 19 07:40:51 2007
@@ -46,27 +46,27 @@
         action = new CreateProjectsFromMetadataAction();
         action.enableLogging( new ConsoleLogger( Logger.LEVEL_DEBUG, "" ) );
         projectBuilderManagerMock = mock( ContinuumProjectBuilderManager.class );
-        mavenSettingsBuilderMock = mock ( MavenSettingsBuilder.class );
+        mavenSettingsBuilderMock = mock( MavenSettingsBuilder.class );
         action.setProjectBuilderManager( (ContinuumProjectBuilderManager) projectBuilderManagerMock.proxy() );
         action.setMavenSettingsBuilder( (MavenSettingsBuilder) mavenSettingsBuilderMock.proxy() );
 
         projectBuilder = mock( ContinuumProjectBuilder.class );
 
-
         projectBuilderManagerMock.expects( once() ).method( "getProjectBuilder" )
-            .will(returnValue( projectBuilder.proxy() ) );
+            .will( returnValue( projectBuilder.proxy() ) );
         projectBuilder.expects( once() ).method( "buildProjectsFromMetadata" )
             .will( returnValue( new ContinuumProjectBuildingResult() ) );
 
         mavenSettingsBuilderMock.expects( once() ).method( "buildSettings" )
-            .will(returnValue( new Settings() ) );
+            .will( returnValue( new Settings() ) );
     }
 
     public void testExecute()
         throws Exception
     {
         Map context = new HashMap();
-        context.put( CreateProjectsFromMetadataAction.KEY_URL, "http://svn.apache.org/repos/asf/maven/continuum/trunk/pom.xml" );
+        context.put( CreateProjectsFromMetadataAction.KEY_URL,
+                     "http://svn.apache.org/repos/asf/maven/continuum/trunk/pom.xml" );
         context.put( CreateProjectsFromMetadataAction.KEY_PROJECT_BUILDER_ID, "id" );
 
         action.execute( context );

Modified: maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializerTest.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializerTest.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializerTest.java (original)
+++ maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializerTest.java Tue Jun 19 07:40:51 2007
@@ -25,8 +25,8 @@
 
 /**
  * @author <a href="mailto:olamy@codehaus.org">olamy</a>
- * @since 4 juin 07
  * @version $Id$
+ * @since 4 juin 07
  */
 public class DefaultContinuumInitializerTest
     extends AbstractContinuumTest
@@ -36,7 +36,8 @@
         throws Exception
     {
         super.setUp();
-        ContinuumInitializer continuumInitializer = (ContinuumInitializer) lookup( ContinuumInitializer.ROLE, "default" );
+        ContinuumInitializer continuumInitializer =
+            (ContinuumInitializer) lookup( ContinuumInitializer.ROLE, "default" );
         continuumInitializer.initialize();
     }
 

Modified: maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/installation/DefaultInstallationServiceTest.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/installation/DefaultInstallationServiceTest.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/installation/DefaultInstallationServiceTest.java (original)
+++ maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/installation/DefaultInstallationServiceTest.java Tue Jun 19 07:40:51 2007
@@ -1,11 +1,11 @@
 package org.apache.maven.continuum.installation;
 
-import java.util.List;
-
 import org.apache.maven.continuum.AbstractContinuumTest;
 import org.apache.maven.continuum.model.system.Installation;
 import org.apache.maven.continuum.store.ContinuumStore;
 
+import java.util.List;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -27,8 +27,8 @@
 
 /**
  * @author <a href="mailto:olamy@codehaus.org">olamy</a>
- * @since 13 juin 07
  * @version $Id$
+ * @since 13 juin 07
  */
 public class DefaultInstallationServiceTest
     extends AbstractContinuumTest

Modified: maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/notification/ContinuumNotificationDispatcherTest.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/notification/ContinuumNotificationDispatcherTest.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/notification/ContinuumNotificationDispatcherTest.java (original)
+++ maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/notification/ContinuumNotificationDispatcherTest.java Tue Jun 19 07:40:51 2007
@@ -35,8 +35,8 @@
     public void testNotificationDispatcher()
         throws Exception
     {
-        ContinuumNotificationDispatcher notificationDispatcher = (ContinuumNotificationDispatcher) lookup(
-            ContinuumNotificationDispatcher.ROLE );
+        ContinuumNotificationDispatcher notificationDispatcher =
+            (ContinuumNotificationDispatcher) lookup( ContinuumNotificationDispatcher.ROLE );
 
         ContinuumStore store = getStore();
 
@@ -47,9 +47,9 @@
         BuildResult build = new BuildResult();
 
         build.setStartTime( System.currentTimeMillis() );
- 
+
         build.setState( ContinuumProjectState.BUILDING );
- 
+
         build.setTrigger( ContinuumProjectState.TRIGGER_SCHEDULED );
 
         store.addBuildResult( project, build );

Modified: maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/notification/mail/FormatterToolTest.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/notification/mail/FormatterToolTest.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/notification/mail/FormatterToolTest.java (original)
+++ maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/notification/mail/FormatterToolTest.java Tue Jun 19 07:40:51 2007
@@ -39,9 +39,9 @@
 
         assertEquals( "1m 10s", tool.formatInterval( 0, makeTime( 0, 1, 10 ) ) );
 
-        assertEquals( "1h 0m 0s", tool.formatInterval( 0, makeTime( 1, 0, 0) ) );
+        assertEquals( "1h 0m 0s", tool.formatInterval( 0, makeTime( 1, 0, 0 ) ) );
 
-        assertEquals( "1h 10m 0s", tool.formatInterval( 0, makeTime( 1, 10, 0) ) );
+        assertEquals( "1h 10m 0s", tool.formatInterval( 0, makeTime( 1, 10, 0 ) ) );
 
         assertEquals( "1h 1m 10s", tool.formatInterval( 0, makeTime( 1, 1, 10 ) ) );
 

Modified: maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifierTest.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifierTest.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifierTest.java (original)
+++ maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifierTest.java Tue Jun 19 07:40:51 2007
@@ -84,8 +84,10 @@
 
     private void dumpContent( MailMessage mailMessage )
     {
-        assertTrue( "The template isn't loaded correctly.", mailMessage.getContent().indexOf( "#shellBuildResult()" ) < 0 );
-        assertTrue( "The template isn't loaded correctly.", mailMessage.getContent().indexOf( "Build statistics" ) > 0 );
+        assertTrue( "The template isn't loaded correctly.",
+                    mailMessage.getContent().indexOf( "#shellBuildResult()" ) < 0 );
+        assertTrue( "The template isn't loaded correctly.",
+                    mailMessage.getContent().indexOf( "Build statistics" ) > 0 );
 
         if ( true )
         {

Modified: maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/profile/DefaultProfileServiceTest.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/profile/DefaultProfileServiceTest.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/profile/DefaultProfileServiceTest.java (original)
+++ maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/profile/DefaultProfileServiceTest.java Tue Jun 19 07:40:51 2007
@@ -1,12 +1,12 @@
 package org.apache.maven.continuum.profile;
 
-import java.util.List;
-
 import org.apache.maven.continuum.AbstractContinuumTest;
 import org.apache.maven.continuum.installation.InstallationService;
 import org.apache.maven.continuum.model.system.Installation;
 import org.apache.maven.continuum.model.system.Profile;
 
+import java.util.List;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -28,8 +28,8 @@
 
 /**
  * @author <a href="mailto:olamy@codehaus.org">olamy</a>
- * @since 15 juin 07
  * @version $Id$
+ * @since 15 juin 07
  */
 public class DefaultProfileServiceTest
     extends AbstractContinuumTest

Modified: maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilderTest.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilderTest.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilderTest.java (original)
+++ maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilderTest.java Tue Jun 19 07:40:51 2007
@@ -37,8 +37,8 @@
     public void testBuildingAProjectFromMetadataWithACompleteMaven1Pom()
         throws Exception
     {
-        ContinuumProjectBuilder projectBuilder = (ContinuumProjectBuilder) lookup( ContinuumProjectBuilder.ROLE,
-                                                                                   MavenOneContinuumProjectBuilder.ID );
+        ContinuumProjectBuilder projectBuilder =
+            (ContinuumProjectBuilder) lookup( ContinuumProjectBuilder.ROLE, MavenOneContinuumProjectBuilder.ID );
 
         ContinuumProjectBuildingResult result = projectBuilder.buildProjectsFromMetadata(
             getTestFile( "src/test/resources/projects/maven-1.pom.xml" ).toURL(), null, null );

Modified: maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/utils/ProjectSorterTest.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/utils/ProjectSorterTest.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/utils/ProjectSorterTest.java (original)
+++ maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/utils/ProjectSorterTest.java Tue Jun 19 07:40:51 2007
@@ -19,14 +19,13 @@
  * under the License.
  */
 
+import junit.framework.TestCase;
 import org.apache.maven.continuum.model.project.Project;
 import org.apache.maven.continuum.model.project.ProjectDependency;
 
-import java.util.List;
 import java.util.ArrayList;
 import java.util.Collections;
-
-import junit.framework.TestCase;
+import java.util.List;
 
 /**
  * @author <a href="mailto:jmcconnell@apache.org">Jesse McConnell</a>
@@ -62,11 +61,11 @@
 
         assertNotNull( sortedList );
 
-        Project p1 = (Project)sortedList.get( 0 );
+        Project p1 = (Project) sortedList.get( 0 );
         assertEquals( top.getArtifactId(), p1.getArtifactId() );
-        Project p2 = (Project)sortedList.get( 1 );
+        Project p2 = (Project) sortedList.get( 1 );
         assertEquals( c1.getArtifactId(), p2.getArtifactId() );
-        Project p3 = (Project)sortedList.get( 2 );
+        Project p3 = (Project) sortedList.get( 2 );
         assertEquals( c2.getArtifactId(), p3.getArtifactId() );
     }
 
@@ -97,11 +96,11 @@
 
         assertNotNull( sortedList );
 
-        Project p1 = (Project)sortedList.get( 0 );
+        Project p1 = (Project) sortedList.get( 0 );
         assertEquals( top.getArtifactId(), p1.getArtifactId() );
-        Project p2 = (Project)sortedList.get( 1 );
+        Project p2 = (Project) sortedList.get( 1 );
         assertEquals( c1.getArtifactId(), p2.getArtifactId() );
-        Project p3 = (Project)sortedList.get( 2 );
+        Project p3 = (Project) sortedList.get( 2 );
         assertEquals( c2.getArtifactId(), p3.getArtifactId() );
 
     }

Modified: maven/continuum/trunk/continuum-notifiers/continuum-notifier-api/src/main/java/org/apache/maven/continuum/notification/AbstractContinuumNotifier.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-notifiers/continuum-notifier-api/src/main/java/org/apache/maven/continuum/notification/AbstractContinuumNotifier.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-notifiers/continuum-notifier-api/src/main/java/org/apache/maven/continuum/notification/AbstractContinuumNotifier.java (original)
+++ maven/continuum/trunk/continuum-notifiers/continuum-notifier-api/src/main/java/org/apache/maven/continuum/notification/AbstractContinuumNotifier.java Tue Jun 19 07:40:51 2007
@@ -89,8 +89,8 @@
     /**
      * Determine if message must be sent
      *
-     * @param build         The current build result
-     * @param previousBuild The previous build result
+     * @param build           The current build result
+     * @param previousBuild   The previous build result
      * @param projectNotifier The project notifier
      * @return True if a message must be sent
      */

Modified: maven/continuum/trunk/continuum-notifiers/continuum-notifier-irc/src/main/java/org/apache/maven/continuum/notification/irc/IrcContinuumNotifier.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-notifiers/continuum-notifier-irc/src/main/java/org/apache/maven/continuum/notification/irc/IrcContinuumNotifier.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-notifiers/continuum-notifier-irc/src/main/java/org/apache/maven/continuum/notification/irc/IrcContinuumNotifier.java (original)
+++ maven/continuum/trunk/continuum-notifiers/continuum-notifier-irc/src/main/java/org/apache/maven/continuum/notification/irc/IrcContinuumNotifier.java Tue Jun 19 07:40:51 2007
@@ -259,7 +259,7 @@
     }
 
     /**
-     * @see org.codehaus.plexus.notification.notifier.Notifier#sendNotification(java.lang.String, java.util.Set, java.util.Properties)
+     * @see org.codehaus.plexus.notification.notifier.Notifier#sendNotification(java.lang.String,java.util.Set,java.util.Properties)
      */
     public void sendNotification( String arg0, Set arg1, Properties arg2 )
         throws NotificationException

Modified: maven/continuum/trunk/continuum-notifiers/continuum-notifier-msn/src/main/java/org/apache/maven/continuum/notification/msn/MsnContinuumNotifier.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-notifiers/continuum-notifier-msn/src/main/java/org/apache/maven/continuum/notification/msn/MsnContinuumNotifier.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-notifiers/continuum-notifier-msn/src/main/java/org/apache/maven/continuum/notification/msn/MsnContinuumNotifier.java (original)
+++ maven/continuum/trunk/continuum-notifiers/continuum-notifier-msn/src/main/java/org/apache/maven/continuum/notification/msn/MsnContinuumNotifier.java Tue Jun 19 07:40:51 2007
@@ -257,7 +257,7 @@
     }
 
     /**
-     * @see org.codehaus.plexus.notification.notifier.Notifier#sendNotification(java.lang.String, java.util.Set, java.util.Properties)
+     * @see org.codehaus.plexus.notification.notifier.Notifier#sendNotification(java.lang.String,java.util.Set,java.util.Properties)
      */
     public void sendNotification( String arg0, Set arg1, Properties arg2 )
         throws NotificationException

Modified: maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java (original)
+++ maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java Tue Jun 19 07:40:51 2007
@@ -67,18 +67,20 @@
 
     /**
      * contains previous release:prepare descriptors; one per project
+     *
      * @todo remove static when singleton strategy is working
      */
     private static Map preparedReleases;
 
     /**
      * contains results
+     *
      * @todo remove static when singleton strategy is working
      */
     private static Map releaseResults;
 
-    public String prepare( Project project, Properties releaseProperties, Map relVersions,
-                           Map devVersions, ContinuumReleaseManagerListener listener )
+    public String prepare( Project project, Properties releaseProperties, Map relVersions, Map devVersions,
+                           ContinuumReleaseManagerListener listener )
         throws ContinuumReleaseException
     {
         String releaseId = project.getGroupId() + ":" + project.getArtifactId();
@@ -89,8 +91,8 @@
 
         try
         {
-            prepareReleaseQueue.put( new PrepareReleaseProjectTask( releaseId, descriptor,
-                                                                    (ReleaseManagerListener) listener ) );
+            prepareReleaseQueue.put(
+                new PrepareReleaseProjectTask( releaseId, descriptor, (ReleaseManagerListener) listener ) );
 
         }
         catch ( TaskQueueException e )
@@ -112,8 +114,8 @@
         }
     }
 
-    public void perform( String releaseId, String workingDirectory, File buildDirectory,
-                         String goals, boolean useReleaseProfile, ContinuumReleaseManagerListener listener )
+    public void perform( String releaseId, String workingDirectory, File buildDirectory, String goals,
+                         boolean useReleaseProfile, ContinuumReleaseManagerListener listener )
         throws ContinuumReleaseException
     {
         ReleaseDescriptor descriptor = readReleaseDescriptor( workingDirectory );
@@ -121,16 +123,16 @@
         perform( releaseId, descriptor, buildDirectory, goals, useReleaseProfile, listener );
     }
 
-    private void perform( String releaseId, ReleaseDescriptor descriptor, File buildDirectory,
-                          String goals, boolean useReleaseProfile, ContinuumReleaseManagerListener listener )
+    private void perform( String releaseId, ReleaseDescriptor descriptor, File buildDirectory, String goals,
+                          boolean useReleaseProfile, ContinuumReleaseManagerListener listener )
         throws ContinuumReleaseException
     {
         try
         {
             getListeners().put( releaseId, listener );
 
-            performReleaseQueue.put( new PerformReleaseProjectTask( releaseId, descriptor, buildDirectory,
-                                                                    goals, useReleaseProfile,
+            performReleaseQueue.put( new PerformReleaseProjectTask( releaseId, descriptor, buildDirectory, goals,
+                                                                    useReleaseProfile,
                                                                     (ReleaseManagerListener) listener ) );
         }
         catch ( TaskQueueException e )
@@ -150,8 +152,7 @@
     private void rollback( String releaseId, ReleaseDescriptor descriptor, ContinuumReleaseManagerListener listener )
         throws ContinuumReleaseException
     {
-        Task releaseTask =
-            new RollbackReleaseProjectTask( releaseId, descriptor, (ReleaseManagerListener) listener );
+        Task releaseTask = new RollbackReleaseProjectTask( releaseId, descriptor, (ReleaseManagerListener) listener );
 
         try
         {
@@ -183,8 +184,8 @@
         return releaseResults;
     }
 
-    private ReleaseDescriptor getReleaseDescriptor( Project project, Properties releaseProperties,
-                                                    Map relVersions, Map devVersions )
+    private ReleaseDescriptor getReleaseDescriptor( Project project, Properties releaseProperties, Map relVersions,
+                                                    Map devVersions )
     {
         ReleaseDescriptor descriptor = new ReleaseDescriptor();
 

Modified: maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultReleaseManagerListener.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultReleaseManagerListener.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultReleaseManagerListener.java (original)
+++ maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultReleaseManagerListener.java Tue Jun 19 07:40:51 2007
@@ -21,9 +21,9 @@
 
 import org.apache.maven.shared.release.ReleaseManagerListener;
 
-import java.util.List;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.List;
 
 /**
  * @author Edwin Punzalan

Modified: maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PrepareReleaseTaskExecutor.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PrepareReleaseTaskExecutor.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PrepareReleaseTaskExecutor.java (original)
+++ maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PrepareReleaseTaskExecutor.java Tue Jun 19 07:40:51 2007
@@ -40,8 +40,8 @@
 
         ReleaseDescriptor descriptor = prepareTask.getDescriptor();
 
-        ReleaseResult result = releaseManager.prepareWithResult( descriptor, settings, new ArrayList(),
-                                                                 false, false, prepareTask.getListener() );
+        ReleaseResult result = releaseManager.prepareWithResult( descriptor, settings, new ArrayList(), false, false,
+                                                                 prepareTask.getListener() );
 
         //override to show the actual start time
         result.setStartTime( getStartTime() );

Modified: maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/RollbackReleaseTaskExecutor.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/RollbackReleaseTaskExecutor.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/RollbackReleaseTaskExecutor.java (original)
+++ maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/RollbackReleaseTaskExecutor.java Tue Jun 19 07:40:51 2007
@@ -37,8 +37,8 @@
     {
         try
         {
-            releaseManager.rollback( releaseTask.getDescriptor(), settings,
-                                     new ArrayList(), releaseTask.getListener() );
+            releaseManager.rollback( releaseTask.getDescriptor(), settings, new ArrayList(),
+                                     releaseTask.getListener() );
         }
         catch ( ReleaseExecutionException e )
         {

Modified: maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/phase/GenerateReactorProjectsPhase.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/phase/GenerateReactorProjectsPhase.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/phase/GenerateReactorProjectsPhase.java (original)
+++ maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/phase/GenerateReactorProjectsPhase.java Tue Jun 19 07:40:51 2007
@@ -19,39 +19,39 @@
  * under the License.
  */
 
-import org.apache.maven.shared.release.phase.AbstractReleasePhase;
-import org.apache.maven.shared.release.ReleaseResult;
-import org.apache.maven.shared.release.ReleaseExecutionException;
-import org.apache.maven.shared.release.ReleaseFailureException;
-import org.apache.maven.shared.release.config.ReleaseDescriptor;
-import org.apache.maven.settings.Settings;
-import org.apache.maven.settings.MavenSettingsBuilder;
-import org.apache.maven.continuum.release.ContinuumReleaseException;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.ProjectBuildingException;
-import org.apache.maven.project.ProjectSorter;
-import org.apache.maven.project.DuplicateProjectException;
-import org.apache.maven.project.MavenProjectBuilder;
-import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
-import org.apache.maven.artifact.resolver.ArtifactResolutionException;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.DefaultArtifactRepository;
 import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
-import org.apache.maven.profiles.ProfileManager;
+import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
+import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+import org.apache.maven.continuum.release.ContinuumReleaseException;
 import org.apache.maven.profiles.DefaultProfileManager;
-import org.codehaus.plexus.util.dag.CycleDetectedException;
-import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import org.codehaus.plexus.PlexusContainer;
+import org.apache.maven.profiles.ProfileManager;
+import org.apache.maven.project.DuplicateProjectException;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.MavenProjectBuilder;
+import org.apache.maven.project.ProjectBuildingException;
+import org.apache.maven.project.ProjectSorter;
+import org.apache.maven.settings.MavenSettingsBuilder;
+import org.apache.maven.settings.Settings;
+import org.apache.maven.shared.release.ReleaseExecutionException;
+import org.apache.maven.shared.release.ReleaseFailureException;
+import org.apache.maven.shared.release.ReleaseResult;
+import org.apache.maven.shared.release.config.ReleaseDescriptor;
+import org.apache.maven.shared.release.phase.AbstractReleasePhase;
 import org.codehaus.plexus.PlexusConstants;
+import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.context.Context;
 import org.codehaus.plexus.context.ContextException;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
+import org.codehaus.plexus.util.dag.CycleDetectedException;
+import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Iterator;
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
 
 /**
  * Generate the reactor projects
@@ -102,10 +102,10 @@
         try
         {
             project = projectBuilder.buildWithDependencies( getProjectDescriptorFile( descriptor ),
-                                            getLocalRepository(), getProfileManager( getSettings() ) );
+                                                            getLocalRepository(), getProfileManager( getSettings() ) );
 
             reactorProjects.add( project );
-            
+
             addModules( reactorProjects, project );
         }
         catch ( ProjectBuildingException e )
@@ -136,11 +136,11 @@
 
         return reactorProjects;
     }
-    
+
     private void addModules( List reactorProjects, MavenProject project )
         throws ContinuumReleaseException
     {
-        for( Iterator modules = project.getModules().iterator(); modules.hasNext(); )
+        for ( Iterator modules = project.getModules().iterator(); modules.hasNext(); )
         {
             String moduleDir = modules.next().toString();
 
@@ -149,10 +149,11 @@
             try
             {
                 MavenProject reactorProject = projectBuilder.buildWithDependencies( pomFile, getLocalRepository(),
-                                                                    getProfileManager( getSettings() ) );
+                                                                                    getProfileManager(
+                                                                                        getSettings() ) );
 
                 reactorProjects.add( reactorProject );
-                
+
                 addModules( reactorProjects, reactorProject );
             }
             catch ( ProjectBuildingException e )
@@ -187,7 +188,7 @@
         throws ContinuumReleaseException
     {
         return new DefaultArtifactRepository( "local-repository", "file://" + getSettings().getLocalRepository(),
-                                                                                   new DefaultRepositoryLayout() );
+                                              new DefaultRepositoryLayout() );
     }
 
     private ProfileManager getProfileManager( Settings settings )

Modified: maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/phase/UpdateWorkingCopyPhase.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/phase/UpdateWorkingCopyPhase.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/phase/UpdateWorkingCopyPhase.java (original)
+++ maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/phase/UpdateWorkingCopyPhase.java Tue Jun 19 07:40:51 2007
@@ -19,26 +19,26 @@
  * under the License.
  */
 
-import org.apache.maven.shared.release.ReleaseResult;
+import org.apache.maven.scm.ScmException;
+import org.apache.maven.scm.ScmFileSet;
+import org.apache.maven.scm.ScmVersion;
+import org.apache.maven.scm.command.update.UpdateScmResult;
+import org.apache.maven.scm.manager.NoSuchScmProviderException;
+import org.apache.maven.scm.provider.ScmProvider;
+import org.apache.maven.scm.repository.ScmRepository;
+import org.apache.maven.scm.repository.ScmRepositoryException;
+import org.apache.maven.settings.Settings;
 import org.apache.maven.shared.release.ReleaseExecutionException;
 import org.apache.maven.shared.release.ReleaseFailureException;
+import org.apache.maven.shared.release.ReleaseResult;
+import org.apache.maven.shared.release.config.ReleaseDescriptor;
 import org.apache.maven.shared.release.phase.AbstractReleasePhase;
-import org.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
-import org.apache.maven.shared.release.scm.ReleaseScmRepositoryException;
 import org.apache.maven.shared.release.scm.ReleaseScmCommandException;
-import org.apache.maven.shared.release.config.ReleaseDescriptor;
-import org.apache.maven.settings.Settings;
-import org.apache.maven.scm.repository.ScmRepository;
-import org.apache.maven.scm.repository.ScmRepositoryException;
-import org.apache.maven.scm.provider.ScmProvider;
-import org.apache.maven.scm.manager.NoSuchScmProviderException;
-import org.apache.maven.scm.ScmFileSet;
-import org.apache.maven.scm.ScmException;
-import org.apache.maven.scm.ScmVersion;
-import org.apache.maven.scm.command.update.UpdateScmResult;
+import org.apache.maven.shared.release.scm.ReleaseScmRepositoryException;
+import org.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
 
-import java.util.List;
 import java.io.File;
+import java.util.List;
 
 /**
  * Update working copy
@@ -83,13 +83,13 @@
         UpdateScmResult result;
         try
         {
-            result = provider.update(
-                repository, new ScmFileSet( new File( releaseDescriptor.getWorkingDirectory() ) ), (ScmVersion)null );
+            result = provider.update( repository, new ScmFileSet( new File( releaseDescriptor.getWorkingDirectory() ) ),
+                                      (ScmVersion) null );
         }
         catch ( ScmException e )
         {
-            throw new ReleaseExecutionException( "An error occurred while updating your local copy: "
-                + e.getMessage(), e );
+            throw new ReleaseExecutionException( "An error occurred while updating your local copy: " + e.getMessage(),
+                                                 e );
         }
 
         if ( !result.isSuccess() )

Modified: maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/AbstractReleaseProjectTask.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/AbstractReleaseProjectTask.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/AbstractReleaseProjectTask.java (original)
+++ maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/AbstractReleaseProjectTask.java Tue Jun 19 07:40:51 2007
@@ -37,8 +37,7 @@
 
     private long maxExecutionTime;
 
-    public AbstractReleaseProjectTask( String releaseId, ReleaseDescriptor descriptor,
-                                       ReleaseManagerListener listener )
+    public AbstractReleaseProjectTask( String releaseId, ReleaseDescriptor descriptor, ReleaseManagerListener listener )
     {
         this.releaseId = releaseId;
         this.descriptor = descriptor;
@@ -77,7 +76,7 @@
 
     public long getMaxExecutionTime()
     {
-         return maxExecutionTime;
+        return maxExecutionTime;
     }
 
     public void setMaxExecutionTime( long maxTime )

Modified: maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PerformReleaseProjectTask.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PerformReleaseProjectTask.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PerformReleaseProjectTask.java (original)
+++ maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PerformReleaseProjectTask.java Tue Jun 19 07:40:51 2007
@@ -36,8 +36,8 @@
 
     private boolean useReleaseProfile = true;
 
-    public PerformReleaseProjectTask( String releaseId, ReleaseDescriptor descriptor, File buildDirectory,
-                                      String goals, boolean useReleaseProfile, ReleaseManagerListener listener )
+    public PerformReleaseProjectTask( String releaseId, ReleaseDescriptor descriptor, File buildDirectory, String goals,
+                                      boolean useReleaseProfile, ReleaseManagerListener listener )
     {
         super( releaseId, descriptor, listener );
         setBuildDirectory( buildDirectory );

Modified: maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PrepareReleaseProjectTask.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PrepareReleaseProjectTask.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PrepareReleaseProjectTask.java (original)
+++ maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PrepareReleaseProjectTask.java Tue Jun 19 07:40:51 2007
@@ -28,8 +28,7 @@
 public class PrepareReleaseProjectTask
     extends AbstractReleaseProjectTask
 {
-    public PrepareReleaseProjectTask( String releaseId, ReleaseDescriptor descriptor,
-                                      ReleaseManagerListener listener )
+    public PrepareReleaseProjectTask( String releaseId, ReleaseDescriptor descriptor, ReleaseManagerListener listener )
     {
         super( releaseId, descriptor, listener );
     }

Modified: maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/ReleaseProjectTask.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/ReleaseProjectTask.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/ReleaseProjectTask.java (original)
+++ maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/ReleaseProjectTask.java Tue Jun 19 07:40:51 2007
@@ -19,8 +19,8 @@
  * under the License.
  */
 
-import org.apache.maven.shared.release.config.ReleaseDescriptor;
 import org.apache.maven.shared.release.ReleaseManagerListener;
+import org.apache.maven.shared.release.config.ReleaseDescriptor;
 
 /**
  * @author Edwin Punzalan

Modified: maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/RollbackReleaseProjectTask.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/RollbackReleaseProjectTask.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/RollbackReleaseProjectTask.java (original)
+++ maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/RollbackReleaseProjectTask.java Tue Jun 19 07:40:51 2007
@@ -1,7 +1,7 @@
 package org.apache.maven.continuum.release.tasks;
 
-import org.apache.maven.shared.release.config.ReleaseDescriptor;
 import org.apache.maven.shared.release.ReleaseManagerListener;
+import org.apache.maven.shared.release.config.ReleaseDescriptor;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -28,8 +28,7 @@
 public class RollbackReleaseProjectTask
     extends AbstractReleaseProjectTask
 {
-    public RollbackReleaseProjectTask( String releaseId, ReleaseDescriptor descriptor,
-                                      ReleaseManagerListener listener )
+    public RollbackReleaseProjectTask( String releaseId, ReleaseDescriptor descriptor, ReleaseManagerListener listener )
     {
         super( releaseId, descriptor, listener );
     }

Modified: maven/continuum/trunk/continuum-release/src/test/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutorTest.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-release/src/test/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutorTest.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-release/src/test/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutorTest.java (original)
+++ maven/continuum/trunk/continuum-release/src/test/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutorTest.java Tue Jun 19 07:40:51 2007
@@ -19,23 +19,23 @@
  * under the License.
  */
 
-import org.apache.maven.continuum.release.tasks.PrepareReleaseProjectTask;
+import org.apache.maven.continuum.release.ContinuumReleaseManager;
 import org.apache.maven.continuum.release.tasks.PerformReleaseProjectTask;
+import org.apache.maven.continuum.release.tasks.PrepareReleaseProjectTask;
 import org.apache.maven.continuum.release.tasks.RollbackReleaseProjectTask;
-import org.apache.maven.continuum.release.ContinuumReleaseManager;
-import org.apache.maven.shared.release.config.ReleaseDescriptor;
-import org.apache.maven.shared.release.ReleaseResult;
+import org.apache.maven.scm.ScmFileSet;
+import org.apache.maven.scm.ScmVersion;
 import org.apache.maven.scm.manager.NoSuchScmProviderException;
 import org.apache.maven.scm.manager.ScmManager;
 import org.apache.maven.scm.repository.ScmRepository;
 import org.apache.maven.scm.repository.ScmRepositoryException;
-import org.apache.maven.scm.ScmFileSet;
-import org.apache.maven.scm.ScmVersion;
+import org.apache.maven.shared.release.ReleaseResult;
+import org.apache.maven.shared.release.config.ReleaseDescriptor;
 import org.codehaus.plexus.PlexusTestCase;
-import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.taskqueue.Task;
-import org.codehaus.plexus.taskqueue.execution.TaskExecutor;
 import org.codehaus.plexus.taskqueue.execution.TaskExecutionException;
+import org.codehaus.plexus.taskqueue.execution.TaskExecutor;
+import org.codehaus.plexus.util.FileUtils;
 
 import java.io.File;
 
@@ -86,7 +86,7 @@
         }
         File scmPath = new File( getBasedir(), "target/scm-src" ).getAbsoluteFile();
         File scmTargetPath = new File( getBasedir(), "target/scm-test" ).getAbsoluteFile();
-        FileUtils.copyDirectoryStructure(scmPath, scmTargetPath);
+        FileUtils.copyDirectoryStructure( scmPath, scmTargetPath );
     }
 
     public void releaseSimpleProject()
@@ -105,7 +105,7 @@
 
         ScmRepository repository = getScmRepositorty( descriptor.getScmSourceUrl() );
         ScmFileSet fileSet = new ScmFileSet( workDir );
-        scmManager.getProviderByRepository( repository ).checkOut( repository, fileSet, (ScmVersion)null );
+        scmManager.getProviderByRepository( repository ).checkOut( repository, fileSet, (ScmVersion) null );
 
         String pom = FileUtils.fileRead( new File( workDir, "pom.xml" ) );
         assertTrue( "Test dev version", pom.indexOf( "<version>1.0-SNAPSHOT</version>" ) > 0 );
@@ -117,7 +117,7 @@
 
         repository = getScmRepositorty( "scm:svn:file://localhost/" + scmPath + "/tags/test-artifact-1.0" );
         fileSet = new ScmFileSet( testDir );
-        scmManager.getProviderByRepository( repository ).checkOut( repository, fileSet, (ScmVersion)null );
+        scmManager.getProviderByRepository( repository ).checkOut( repository, fileSet, (ScmVersion) null );
 
         pom = FileUtils.fileRead( new File( testDir, "pom.xml" ) );
         assertTrue( "Test released version", pom.indexOf( "<version>1.0</version>" ) > 0 );
@@ -149,7 +149,7 @@
 
         ScmRepository repository = getScmRepositorty( descriptor.getScmSourceUrl() );
         ScmFileSet fileSet = new ScmFileSet( workDir );
-        scmManager.getProviderByRepository( repository ).checkOut( repository, fileSet, (ScmVersion)null );
+        scmManager.getProviderByRepository( repository ).checkOut( repository, fileSet, (ScmVersion) null );
 
         String pom = FileUtils.fileRead( new File( workDir, "pom.xml" ) );
         assertTrue( "Test dev version", pom.indexOf( "<version>1.1-SNAPSHOT</version>" ) > 0 );
@@ -161,12 +161,13 @@
 
         repository = getScmRepositorty( "scm:svn:file://localhost/" + scmPath + "/tags/test-artifact-2.0" );
         fileSet = new ScmFileSet( testDir );
-        scmManager.getProviderByRepository( repository ).checkOut( repository, fileSet, (ScmVersion)null );
+        scmManager.getProviderByRepository( repository ).checkOut( repository, fileSet, (ScmVersion) null );
 
         pom = FileUtils.fileRead( new File( testDir, "pom.xml" ) );
         assertTrue( "Test released version", pom.indexOf( "<version>2.0</version>" ) > 0 );
 
-        performExec.executeTask( getPerformTask( "testRelease", descriptor, new File( getBasedir(), "target/test-classes/build-dir" ) ) );
+        performExec.executeTask(
+            getPerformTask( "testRelease", descriptor, new File( getBasedir(), "target/test-classes/build-dir" ) ) );
 
         ReleaseResult result = (ReleaseResult) releaseManager.getReleaseResults().get( "testRelease" );
         if ( result.getResultCode() != ReleaseResult.SUCCESS )
@@ -191,7 +192,7 @@
 
         ScmRepository repository = getScmRepositorty( descriptor.getScmSourceUrl() );
         ScmFileSet fileSet = new ScmFileSet( workDir );
-        scmManager.getProviderByRepository( repository ).checkOut( repository, fileSet, (ScmVersion)null );
+        scmManager.getProviderByRepository( repository ).checkOut( repository, fileSet, (ScmVersion) null );
 
         String pom = FileUtils.fileRead( new File( workDir, "pom.xml" ) );
         assertTrue( "Test dev version", pom.indexOf( "<version>1.1-SNAPSHOT</version>" ) > 0 );
@@ -203,7 +204,7 @@
 
         repository = getScmRepositorty( "scm:svn:file://localhost/" + scmPath + "/tags/test-artifact-1.1" );
         fileSet = new ScmFileSet( testDir );
-        scmManager.getProviderByRepository( repository ).checkOut( repository, fileSet, (ScmVersion)null );
+        scmManager.getProviderByRepository( repository ).checkOut( repository, fileSet, (ScmVersion) null );
 
         pom = FileUtils.fileRead( new File( testDir, "pom.xml" ) );
         assertTrue( "Test released version", pom.indexOf( "<version>1.1</version>" ) > 0 );
@@ -213,7 +214,8 @@
         pom = FileUtils.fileRead( new File( workDir, "pom.xml" ) );
         assertTrue( "Test rollback version", pom.indexOf( "<version>1.1-SNAPSHOT</version>" ) > 0 );
 
-        assertFalse( "Test that release.properties has been cleaned", new File( workDir, "release.properties" ).exists() );
+        assertFalse( "Test that release.properties has been cleaned",
+                     new File( workDir, "release.properties" ).exists() );
         assertFalse( "Test that backup file has been cleaned", new File( workDir, "pom.xml.releaseBackup" ).exists() );
 
         //@todo when implemented already, check if tag was also removed

Modified: maven/continuum/trunk/continuum-security/src/main/java/org/apache/maven/continuum/security/ContinuumRoleConstants.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-security/src/main/java/org/apache/maven/continuum/security/ContinuumRoleConstants.java?view=diff&rev=548742&r1=548741&r2=548742
==============================================================================
--- maven/continuum/trunk/continuum-security/src/main/java/org/apache/maven/continuum/security/ContinuumRoleConstants.java (original)
+++ maven/continuum/trunk/continuum-security/src/main/java/org/apache/maven/continuum/security/ContinuumRoleConstants.java Tue Jun 19 07:40:51 2007
@@ -30,47 +30,82 @@
 
     // globalish roles
     public static final String SYSTEM_ADMINISTRATOR_ROLE = "System Administrator";
+
     public static final String USER_ADMINISTRATOR_ROLE = "User Administrator";
+
     public static final String GROUP_ADMINISTRATOR_ROLE = "Continuum Group Project Administrator";
+
     public static final String REGISTERED_USER_ROLE = "Registered User";
+
     public static final String GUEST_ROLE = "Guest";
 
     // roles
     public static final String CONTINUUM_PROJECT_ADMINISTRATOR_ROLE_PREFIX = "Project Administrator";
+
     public static final String CONTINUUM_PROJECT_DEVELOPER_ROLE_PREFIX = "Project Developer";
+
     public static final String CONTINUUM_PROJECT_USER_ROLE_PREFIX = "Project User";
 
     // global operations
     public static final String CONTINUUM_MANAGE_SCHEDULES = "continuum-manage-schedules";
+
     public static final String CONTINUUM_MANAGE_CONFIGURATION = "continuum-manage-configuration";
+
     public static final String CONTINUUM_MANAGE_USERS = "continuum-manage-users";
+
     public static final String CONTINUUM_ACTIVE_GUEST_OPERATION = "continuum-guest";
 
     // dynamic operations
     public static final String CONTINUUM_VIEW_GROUP_OPERATION = "continuum-view-group";
+
     public static final String CONTINUUM_ADD_GROUP_OPERATION = "continuum-add-group";
+
     public static final String CONTINUUM_REMOVE_GROUP_OPERATION = "continuum-remove-group";
+
     public static final String CONTINUUM_BUILD_GROUP_OPERATION = "continuum-build-group";
+
     public static final String CONTINUUM_MODIFY_GROUP_OPERATION = "continuum-modify-group";
+
     public static final String CONTINUUM_ADD_PROJECT_TO_GROUP_OPERATION = "continuum-add-project-to-group";
-    public static final String CONTINUUM_REMOVE_PROJECT_FROM_GROUP_OPERATION ="continuum-remove-project-from-group";
+
+    public static final String CONTINUUM_REMOVE_PROJECT_FROM_GROUP_OPERATION = "continuum-remove-project-from-group";
+
     public static final String CONTINUUM_MODIFY_PROJECT_IN_GROUP_OPERATION = "continuum-modify-project-in-group";
+
     public static final String CONTINUUM_BUILD_PROJECT_IN_GROUP_OPERATION = "continuum-build-project-in-group";
+
     public static final String CONTINUUM_ADD_GROUP_BUILD_DEFINTION_OPERATION = "continuum-add-group-build-definition";
-    public static final String CONTINUUM_REMOVE_GROUP_BUILD_DEFINITION_OPERATION = "continuum-remove-group-build-definition";
-    public static final String CONTINUUM_MODIFY_GROUP_BUILD_DEFINITION_OPERATION = "continuum-modify-group-build-definition";
+
+    public static final String CONTINUUM_REMOVE_GROUP_BUILD_DEFINITION_OPERATION =
+        "continuum-remove-group-build-definition";
+
+    public static final String CONTINUUM_MODIFY_GROUP_BUILD_DEFINITION_OPERATION =
+        "continuum-modify-group-build-definition";
+
     public static final String CONTINUUM_ADD_GROUP_NOTIFIER_OPERATION = "continuum-add-group-notifier";
+
     public static final String CONTINUUM_REMOVE_GROUP_NOTIFIER_OPERATION = "continuum-remove-group-notifier";
+
     public static final String CONTINUUM_MODIFY_GROUP_NOTIFIER_OPERATION = "continuum-modify-group-notifier";
-    public static final String CONTINUUM_ADD_PROJECT_BUILD_DEFINTION_OPERATION = "continuum-add-project-build-definition";
-    public static final String CONTINUUM_REMOVE_PROJECT_BUILD_DEFINITION_OPERATION = "continuum-remove-project-build-definition";
-    public static final String CONTINUUM_MODIFY_PROJECT_BUILD_DEFINITION_OPERATION = "continuum-modify-project-build-definition";
+
+    public static final String CONTINUUM_ADD_PROJECT_BUILD_DEFINTION_OPERATION =
+        "continuum-add-project-build-definition";
+
+    public static final String CONTINUUM_REMOVE_PROJECT_BUILD_DEFINITION_OPERATION =
+        "continuum-remove-project-build-definition";
+
+    public static final String CONTINUUM_MODIFY_PROJECT_BUILD_DEFINITION_OPERATION =
+        "continuum-modify-project-build-definition";
+
     public static final String CONTINUUM_ADD_PROJECT_NOTIFIER_OPERATION = "continuum-add-project-notifier";
+
     public static final String CONTINUUM_REMOVE_PROJECT_NOTIFIER_OPERATION = "continuum-remove-project-notifier";
+
     public static final String CONTINUUM_MODIFY_PROJECT_NOTIFIER_OPERATION = "continuum-modify-project-notifier";
 
     // operations against user assignment.
     public static final String USER_MANAGEMENT_ROLE_GRANT_OPERATION = "user-management-role-grant";
+
     public static final String USER_MANAGEMENT_USER_ROLE_OPERATION = "user-management-user-role";
 
 }



Mime
View raw message