continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1372260 [19/30] - in /continuum/trunk: ./ continuum-api/ continuum-api/src/main/java/org/apache/continuum/builder/distributed/ continuum-api/src/main/java/org/apache/continuum/builder/distributed/executor/ continuum-api/src/main/java/org/a...
Date Mon, 13 Aug 2012 04:29:28 GMT
Modified: continuum/trunk/continuum-purge/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-purge/pom.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/pom.xml (original)
+++ continuum/trunk/continuum-purge/pom.xml Mon Aug 13 04:29:09 2012
@@ -17,7 +17,8 @@ KIND, either express or implied.  See th
 specific language governing permissions and limitations
 under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>continuum</artifactId>
@@ -115,7 +116,7 @@ under the License.
       <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-repository-layer</artifactId>
     </dependency>
-    
+
     <!-- === Testing Dependencies === -->
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -133,7 +134,7 @@ under the License.
       <scope>test</scope>
     </dependency>
   </dependencies>
-  
+
   <build>
     <plugins>
       <plugin>

Modified: continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/ContinuumPurgeConstants.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/ContinuumPurgeConstants.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/ContinuumPurgeConstants.java (original)
+++ continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/ContinuumPurgeConstants.java Mon Aug 13 04:29:09 2012
@@ -31,16 +31,16 @@ public class ContinuumPurgeConstants
     public static final String PURGE_DIRECTORY_RELEASES = "releases";
 
     public static final String PURGE_DIRECTORY_BUILDOUTPUT = "buildOutput";
-    
+
     public static final String PURGE = "PURGE";
-    
+
     public static final String PURGE_REPO_CONTENTS = "Purge All Repository Contents";
-    
+
     public static final String PURGE_DIR_CONTENTS = "Purge All Directory Contents";
-   
+
     public static final String PURGE_ARTIFACT = "Purge Artifact File";
-    
+
     public static final String PURGE_FILE = "Purge Support File";
-    
+
     public static final String PURGE_PROJECT = "Purge Project";
 }

Modified: continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/DefaultPurgeConfigurationService.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/DefaultPurgeConfigurationService.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/DefaultPurgeConfigurationService.java (original)
+++ continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/DefaultPurgeConfigurationService.java Mon Aug 13 04:29:09 2012
@@ -66,7 +66,7 @@ public class DefaultPurgeConfigurationSe
      * @plexus.requirement
      */
     private RepositoryPurgeConfigurationDao repositoryPurgeConfigurationDao;
-    
+
     /**
      * @plexus.requirement
      */
@@ -89,7 +89,8 @@ public class DefaultPurgeConfigurationSe
         }
         else if ( purgeConfig instanceof DistributedDirectoryPurgeConfiguration )
         {
-            purgeConfiguration = addDistributedDirectoryPurgeConfiguration( ( DistributedDirectoryPurgeConfiguration ) purgeConfig );
+            purgeConfiguration = addDistributedDirectoryPurgeConfiguration(
+                (DistributedDirectoryPurgeConfiguration) purgeConfig );
         }
 
         return purgeConfiguration;
@@ -108,7 +109,7 @@ public class DefaultPurgeConfigurationSe
         }
         else if ( purgeConfig instanceof DistributedDirectoryPurgeConfiguration )
         {
-            updateDistributedDirectoryPurgeConfiguration( ( DistributedDirectoryPurgeConfiguration ) purgeConfig );
+            updateDistributedDirectoryPurgeConfiguration( (DistributedDirectoryPurgeConfiguration) purgeConfig );
         }
     }
 
@@ -127,7 +128,7 @@ public class DefaultPurgeConfigurationSe
         }
         else if ( purgeConfig instanceof DistributedDirectoryPurgeConfiguration )
         {
-            removeDistributedDirectoryPurgeConfiguration( ( DistributedDirectoryPurgeConfiguration ) purgeConfig );
+            removeDistributedDirectoryPurgeConfiguration( (DistributedDirectoryPurgeConfiguration) purgeConfig );
         }
     }
 
@@ -228,7 +229,7 @@ public class DefaultPurgeConfigurationSe
     {
         return directoryPurgeConfigurationDao.getDirectoryPurgeConfigurationsBySchedule( scheduleId );
     }
-    
+
     public List<DirectoryPurgeConfiguration> getEnableDirectoryPurgeConfigurationsBySchedule( int scheduleId )
     {
         return directoryPurgeConfigurationDao.getEnableDirectoryPurgeConfigurationsBySchedule( scheduleId );
@@ -243,7 +244,7 @@ public class DefaultPurgeConfigurationSe
     {
         return repositoryPurgeConfigurationDao.getRepositoryPurgeConfigurationsBySchedule( scheduleId );
     }
-    
+
     public List<RepositoryPurgeConfiguration> getEnableRepositoryPurgeConfigurationsBySchedule( int scheduleId )
     {
         return repositoryPurgeConfigurationDao.getEnableRepositoryPurgeConfigurationsBySchedule( scheduleId );
@@ -359,7 +360,7 @@ public class DefaultPurgeConfigurationSe
                 // purgeConfigId is not of type directory purge configuration
             }
         }
-        
+
         if ( purgeConfig == null )
         {
             try
@@ -384,8 +385,8 @@ public class DefaultPurgeConfigurationSe
 
             RepositoryManagedContent repoContent;
 
-            repoContent =
-                (RepositoryManagedContent) container.lookup( RepositoryManagedContent.class, repository.getLayout() );
+            repoContent = (RepositoryManagedContent) container.lookup( RepositoryManagedContent.class,
+                                                                       repository.getLayout() );
             repoContent.setRepository( repository );
 
             return repoContent;
@@ -412,14 +413,16 @@ public class DefaultPurgeConfigurationSe
         return distributedDirectoryPurgeConfigurationDao.getAllDistributedDirectoryPurgeConfigurations();
     }
 
-    public DistributedDirectoryPurgeConfiguration addDistributedDirectoryPurgeConfiguration( DistributedDirectoryPurgeConfiguration dirPurge )
+    public DistributedDirectoryPurgeConfiguration addDistributedDirectoryPurgeConfiguration(
+        DistributedDirectoryPurgeConfiguration dirPurge )
         throws PurgeConfigurationServiceException
     {
         DistributedDirectoryPurgeConfiguration dirPurgeConfig;
-        
+
         try
         {
-            dirPurgeConfig = distributedDirectoryPurgeConfigurationDao.addDistributedDirectoryPurgeConfiguration( dirPurge );
+            dirPurgeConfig = distributedDirectoryPurgeConfigurationDao.addDistributedDirectoryPurgeConfiguration(
+                dirPurge );
         }
         catch ( ContinuumStoreException e )
         {
@@ -427,7 +430,7 @@ public class DefaultPurgeConfigurationSe
         }
 
         return dirPurgeConfig;
-        
+
     }
 
     public DistributedDirectoryPurgeConfiguration getDistributedDirectoryPurgeConfiguration( int dirPurgeId )
@@ -446,7 +449,7 @@ public class DefaultPurgeConfigurationSe
             throw new PurgeConfigurationServiceException( e.getMessage(), e );
         }
     }
-    
+
     public void updateDistributedDirectoryPurgeConfiguration( DistributedDirectoryPurgeConfiguration dirPurge )
         throws PurgeConfigurationServiceException
     {
@@ -472,10 +475,12 @@ public class DefaultPurgeConfigurationSe
             throw new PurgeConfigurationServiceException( e.getMessage(), e );
         }
     }
-    
-    public List<DistributedDirectoryPurgeConfiguration> getEnableDistributedDirectoryPurgeConfigurationsBySchedule( int scheduleId )
+
+    public List<DistributedDirectoryPurgeConfiguration> getEnableDistributedDirectoryPurgeConfigurationsBySchedule(
+        int scheduleId )
     {
-            return distributedDirectoryPurgeConfigurationDao.getEnableDistributedDirectoryPurgeConfigurationsBySchedule( scheduleId );
+        return distributedDirectoryPurgeConfigurationDao.getEnableDistributedDirectoryPurgeConfigurationsBySchedule(
+            scheduleId );
     }
 
     public void contextualize( Context context )

Modified: continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/controller/DirectoryPurgeController.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/controller/DirectoryPurgeController.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/controller/DirectoryPurgeController.java (original)
+++ continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/controller/DirectoryPurgeController.java Mon Aug 13 04:29:09 2012
@@ -47,7 +47,7 @@ public class DirectoryPurgeController
         DirectoryPurgeConfiguration dirPurge = (DirectoryPurgeConfiguration) purgeConfig;
         doPurge( dirPurge.getLocation() );
     }
-    
+
     public void doPurge( String path )
     {
         log.info( "--- Start: Purging directory path '{}'---", path );
@@ -78,8 +78,8 @@ public class DirectoryPurgeController
         }
         else
         {
-            purgeExecutor =
-                new RetentionCountDirectoryPurgeExecutor( dirPurge.getRetentionCount(), dirPurge.getDirectoryType() );
+            purgeExecutor = new RetentionCountDirectoryPurgeExecutor( dirPurge.getRetentionCount(),
+                                                                      dirPurge.getDirectoryType() );
         }
     }
 }

Modified: continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/controller/DistributedDirectoryPurgeController.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/controller/DistributedDirectoryPurgeController.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/controller/DistributedDirectoryPurgeController.java (original)
+++ continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/controller/DistributedDirectoryPurgeController.java Mon Aug 13 04:29:09 2012
@@ -19,8 +19,6 @@ package org.apache.continuum.purge.contr
  * under the License.
  */
 
-import java.net.URL;
-
 import org.apache.continuum.distributed.transport.slave.SlaveBuildAgentTransportClient;
 import org.apache.continuum.distributed.transport.slave.SlaveBuildAgentTransportService;
 import org.apache.continuum.model.repository.AbstractPurgeConfiguration;
@@ -30,6 +28,8 @@ import org.apache.maven.continuum.config
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.net.URL;
+
 /**
  * DirectoryPurgeController
  *
@@ -45,9 +45,9 @@ public class DistributedDirectoryPurgeCo
      * @plexus.requirement
      */
     private ConfigurationService configurationService;
-    
+
     private SlaveBuildAgentTransportService transportClient;
-    
+
     public void doPurge( String path )
     {
         log.warn( "doPurge( String ) is not supported for DistributedDirectoryPurgeController" );
@@ -60,15 +60,16 @@ public class DistributedDirectoryPurgeCo
         {
             transportClient.ping();
 
-            StringBuilder logMsg = new StringBuilder().append( "Executing directory purge with the following settings[directoryType=" ).
-                                                    append( dirPurge.getDirectoryType() ).append( ",daysOlder=" ).
-                                                    append( dirPurge.getDaysOlder() ).append( ", retentionCount=" ).
-                                                    append( dirPurge.getRetentionCount() ).append( ", deleteAll=" ).
-                                                    append( dirPurge.isDeleteAll() ).append( "]" );
-            
+            StringBuilder logMsg = new StringBuilder().append(
+                "Executing directory purge with the following settings[directoryType=" ).
+                append( dirPurge.getDirectoryType() ).append( ",daysOlder=" ).
+                append( dirPurge.getDaysOlder() ).append( ", retentionCount=" ).
+                append( dirPurge.getRetentionCount() ).append( ", deleteAll=" ).
+                append( dirPurge.isDeleteAll() ).append( "]" );
+
             log.debug( logMsg.toString() );
-            
-            transportClient.executeDirectoryPurge( dirPurge.getDirectoryType(), dirPurge.getDaysOlder(), 
+
+            transportClient.executeDirectoryPurge( dirPurge.getDirectoryType(), dirPurge.getDaysOlder(),
                                                    dirPurge.getRetentionCount(), dirPurge.isDeleteAll() );
         }
         catch ( Exception e )
@@ -84,7 +85,7 @@ public class DistributedDirectoryPurgeCo
 
         try
         {
-            transportClient = new SlaveBuildAgentTransportClient( new URL( dirPurge.getBuildAgentUrl() ), "", 
+            transportClient = new SlaveBuildAgentTransportClient( new URL( dirPurge.getBuildAgentUrl() ), "",
                                                                   configurationService.getSharedSecretPassword() );
         }
         catch ( Exception e )

Modified: continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/controller/RepositoryPurgeController.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/controller/RepositoryPurgeController.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/controller/RepositoryPurgeController.java (original)
+++ continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/controller/RepositoryPurgeController.java Mon Aug 13 04:29:09 2012
@@ -65,8 +65,8 @@ public class RepositoryPurgeController
 
         try
         {
-            repositoryContent =
-                purgeConfigurationService.getManagedRepositoryContent( repoPurge.getRepository().getId() );
+            repositoryContent = purgeConfigurationService.getManagedRepositoryContent(
+                repoPurge.getRepository().getId() );
         }
         catch ( PurgeConfigurationServiceException e )
         {
@@ -86,8 +86,8 @@ public class RepositoryPurgeController
             }
             else
             {
-                purgeExecutor =
-                    new RetentionCountRepositoryPurgeExecutor( repositoryContent, repoPurge.getRetentionCount() );
+                purgeExecutor = new RetentionCountRepositoryPurgeExecutor( repositoryContent,
+                                                                           repoPurge.getRetentionCount() );
             }
 
             purgeReleasedSnapshotsExecutor = new ReleasedSnapshotsRepositoryPurgeExecutor( repositoryContent );
@@ -98,13 +98,13 @@ public class RepositoryPurgeController
     public void doPurge( AbstractPurgeConfiguration purgeConfig )
     {
         RepositoryPurgeConfiguration repoPurge = (RepositoryPurgeConfiguration) purgeConfig;
-        log.info( "--- Start: Purging repository [{}] {} ---", repoPurge.getRepository().getId(), 
+        log.info( "--- Start: Purging repository [{}] {} ---", repoPurge.getRepository().getId(),
                   repoPurge.getRepository().getLocation() );
         doPurge( repoPurge.getRepository().getLocation() );
         log.info( "--- End: Purging repository [{}] {} ---", repoPurge.getRepository().getId(),
                   repoPurge.getRepository().getLocation() );
     }
-    
+
     public void doPurge( String path )
     {
         try

Modified: continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/AbstractContinuumPurgeExecutor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/AbstractContinuumPurgeExecutor.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/AbstractContinuumPurgeExecutor.java (original)
+++ continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/AbstractContinuumPurgeExecutor.java Mon Aug 13 04:29:09 2012
@@ -19,17 +19,17 @@ package org.apache.continuum.purge.execu
  * under the License.
  */
 
-import java.io.File;
-import java.io.FilenameFilter;
-import java.util.Set;
-
-import org.apache.continuum.purge.repository.content.RepositoryManagedContent;
 import org.apache.continuum.purge.ContinuumPurgeConstants;
+import org.apache.continuum.purge.repository.content.RepositoryManagedContent;
 import org.apache.maven.archiva.consumers.core.repository.ArtifactFilenameFilter;
 import org.apache.maven.archiva.model.ArtifactReference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.File;
+import java.io.FilenameFilter;
+import java.util.Set;
+
 /**
  * Some codes were taken from Archiva.
  *

Modified: continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/CleanAllPurgeExecutor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/CleanAllPurgeExecutor.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/CleanAllPurgeExecutor.java (original)
+++ continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/CleanAllPurgeExecutor.java Mon Aug 13 04:29:09 2012
@@ -19,19 +19,18 @@ package org.apache.continuum.purge.execu
  * under the License.
  */
 
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FilenameFilter;
-import java.io.IOException;
-
 import org.apache.commons.io.filefilter.DirectoryFileFilter;
 import org.apache.continuum.purge.ContinuumPurgeConstants;
 import org.apache.maven.archiva.consumers.core.repository.ArtifactFilenameFilter;
 import org.codehaus.plexus.util.FileUtils;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.File;
+import java.io.FileFilter;
+import java.io.FilenameFilter;
+import java.io.IOException;
+
 /**
  * @author Maria Catherine Tan
  */
@@ -39,7 +38,7 @@ public class CleanAllPurgeExecutor
     extends AbstractContinuumPurgeExecutor
 {
     private Logger log = LoggerFactory.getLogger( CleanAllPurgeExecutor.class );
-    
+
     private final String purgeType;
 
     public CleanAllPurgeExecutor( String purgeType )

Modified: continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/DaysOldDirectoryPurgeExecutor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/DaysOldDirectoryPurgeExecutor.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/DaysOldDirectoryPurgeExecutor.java (original)
+++ continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/DaysOldDirectoryPurgeExecutor.java Mon Aug 13 04:29:09 2012
@@ -19,23 +19,22 @@ package org.apache.continuum.purge.execu
  * under the License.
  */
 
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Calendar;
-
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.comparator.LastModifiedFileComparator;
 import org.apache.commons.io.filefilter.DirectoryFileFilter;
 import org.apache.commons.lang.time.DateUtils;
 import org.apache.continuum.purge.ContinuumPurgeConstants;
 import org.apache.maven.archiva.consumers.core.repository.ArtifactFilenameFilter;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.File;
+import java.io.FileFilter;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Calendar;
+
 /**
  * @author Maria Catherine Tan
  */
@@ -44,7 +43,7 @@ public class DaysOldDirectoryPurgeExecut
     implements ContinuumPurgeExecutor
 {
     private Logger log = LoggerFactory.getLogger( DaysOldDirectoryPurgeExecutor.class );
-    
+
     private final int daysOlder;
 
     private final int retentionCount;

Modified: continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/DaysOldRepositoryPurgeExecutor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/DaysOldRepositoryPurgeExecutor.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/DaysOldRepositoryPurgeExecutor.java (original)
+++ continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/DaysOldRepositoryPurgeExecutor.java Mon Aug 13 04:29:09 2012
@@ -19,6 +19,15 @@ package org.apache.continuum.purge.execu
  * under the License.
  */
 
+import org.apache.commons.lang.time.DateUtils;
+import org.apache.continuum.purge.repository.content.RepositoryManagedContent;
+import org.apache.maven.archiva.common.utils.VersionComparator;
+import org.apache.maven.archiva.common.utils.VersionUtil;
+import org.apache.maven.archiva.model.ArtifactReference;
+import org.apache.maven.archiva.model.VersionedReference;
+import org.apache.maven.archiva.repository.ContentNotFoundException;
+import org.apache.maven.archiva.repository.layout.LayoutException;
+
 import java.io.File;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -30,15 +39,6 @@ import java.util.List;
 import java.util.Set;
 import java.util.regex.Matcher;
 
-import org.apache.commons.lang.time.DateUtils;
-import org.apache.continuum.purge.repository.content.RepositoryManagedContent;
-import org.apache.maven.archiva.common.utils.VersionComparator;
-import org.apache.maven.archiva.common.utils.VersionUtil;
-import org.apache.maven.archiva.model.ArtifactReference;
-import org.apache.maven.archiva.model.VersionedReference;
-import org.apache.maven.archiva.repository.ContentNotFoundException;
-import org.apache.maven.archiva.repository.layout.LayoutException;
-
 /**
  * Codes were taken from  Archiva's DaysOldRepositoryPurge and made some few changes.
  *
@@ -107,8 +107,8 @@ public class DaysOldRepositoryPurgeExecu
                     break;
                 }
 
-                ArtifactReference newArtifactReference =
-                    repository.toArtifactReference( artifactFile.getAbsolutePath() );
+                ArtifactReference newArtifactReference = repository.toArtifactReference(
+                    artifactFile.getAbsolutePath() );
                 newArtifactReference.setVersion( version );
 
                 File newArtifactFile = repository.toFile( newArtifactReference );

Modified: continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/ReleasedSnapshotsRepositoryPurgeExecutor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/ReleasedSnapshotsRepositoryPurgeExecutor.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/ReleasedSnapshotsRepositoryPurgeExecutor.java (original)
+++ continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/ReleasedSnapshotsRepositoryPurgeExecutor.java Mon Aug 13 04:29:09 2012
@@ -19,13 +19,7 @@ package org.apache.continuum.purge.execu
  * under the License.
  */
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
 import org.apache.continuum.purge.ContinuumPurgeConstants;
-
 import org.apache.continuum.purge.repository.content.RepositoryManagedContent;
 import org.apache.maven.archiva.common.utils.VersionComparator;
 import org.apache.maven.archiva.common.utils.VersionUtil;
@@ -34,10 +28,14 @@ import org.apache.maven.archiva.model.Pr
 import org.apache.maven.archiva.model.VersionedReference;
 import org.apache.maven.archiva.repository.ContentNotFoundException;
 import org.apache.maven.archiva.repository.layout.LayoutException;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
 /**
  * Codes were taken from Archiva's CleanupReleasedSnapshotsRepositoryPurge and just made some few changes
  *
@@ -57,7 +55,7 @@ public class ReleasedSnapshotsRepository
 
     public void purge( String path )
         throws ContinuumPurgeExecutorException
-    {                         
+    {
         try
         {
             File artifactFile = new File( repository.getRepoRoot(), path );
@@ -113,7 +111,7 @@ public class ReleasedSnapshotsRepository
                 {
                     versionRef.setVersion( version );
                     repository.deleteVersion( versionRef );
-                    
+
                     log.info( ContinuumPurgeConstants.PURGE_PROJECT + " - " + VersionedReference.toKey( versionRef ) );
 
                     removeMetadata( versionRef );

Modified: continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/RetentionCountDirectoryPurgeExecutor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/RetentionCountDirectoryPurgeExecutor.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/RetentionCountDirectoryPurgeExecutor.java (original)
+++ continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/RetentionCountDirectoryPurgeExecutor.java Mon Aug 13 04:29:09 2012
@@ -19,18 +19,18 @@ package org.apache.continuum.purge.execu
  * under the License.
  */
 
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.util.Arrays;
-
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.comparator.LastModifiedFileComparator;
 import org.apache.commons.io.filefilter.DirectoryFileFilter;
 import org.apache.continuum.purge.ContinuumPurgeConstants;
 import org.apache.maven.archiva.consumers.core.repository.ArtifactFilenameFilter;
 
+import java.io.File;
+import java.io.FileFilter;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.util.Arrays;
+
 /**
  * @author Maria Catherine Tan
  */

Modified: continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/RetentionCountRepositoryPurgeExecutor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/RetentionCountRepositoryPurgeExecutor.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/RetentionCountRepositoryPurgeExecutor.java (original)
+++ continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/RetentionCountRepositoryPurgeExecutor.java Mon Aug 13 04:29:09 2012
@@ -19,12 +19,6 @@ package org.apache.continuum.purge.execu
  * under the License.
  */
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
 import org.apache.continuum.purge.repository.content.RepositoryManagedContent;
 import org.apache.maven.archiva.common.utils.VersionComparator;
 import org.apache.maven.archiva.common.utils.VersionUtil;
@@ -33,6 +27,12 @@ import org.apache.maven.archiva.model.Ve
 import org.apache.maven.archiva.repository.ContentNotFoundException;
 import org.apache.maven.archiva.repository.layout.LayoutException;
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+
 /**
  * Codes were taken from Archiva's RetentionCountRepository Purge and made some few changes.
  *

Modified: continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/repository/content/ManagedDefaultRepositoryContent.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/repository/content/ManagedDefaultRepositoryContent.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/repository/content/ManagedDefaultRepositoryContent.java (original)
+++ continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/repository/content/ManagedDefaultRepositoryContent.java Mon Aug 13 04:29:09 2012
@@ -19,11 +19,6 @@ package org.apache.continuum.purge.repos
  * under the License.
  */
 
-import java.io.File;
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.Set;
-
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.continuum.model.repository.LocalRepository;
@@ -39,6 +34,11 @@ import org.apache.maven.archiva.reposito
 import org.apache.maven.archiva.repository.content.PathParser;
 import org.apache.maven.archiva.repository.layout.LayoutException;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
+
 /**
  * Taken from Archiva's ManagedDefaultRepositoryContent and made some few changes.
  *
@@ -356,7 +356,7 @@ public class ManagedDefaultRepositoryCon
         if ( !repoDir.exists() )
         {
             throw new IOException( "Unable to gather the list of snapshot versions on a non-existant directory: " +
-                repoDir.getAbsolutePath() );
+                                       repoDir.getAbsolutePath() );
         }
 
         if ( !repoDir.isDirectory() )

Modified: continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/repository/content/ManagedLegacyRepositoryContent.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/repository/content/ManagedLegacyRepositoryContent.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/repository/content/ManagedLegacyRepositoryContent.java (original)
+++ continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/repository/content/ManagedLegacyRepositoryContent.java Mon Aug 13 04:29:09 2012
@@ -19,12 +19,6 @@ package org.apache.continuum.purge.repos
  * under the License.
  */
 
-import java.io.File;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
 import org.apache.commons.lang.StringUtils;
 import org.apache.continuum.model.repository.LocalRepository;
 import org.apache.continuum.purge.repository.utils.FileTypes;
@@ -37,6 +31,12 @@ import org.apache.maven.archiva.reposito
 import org.apache.maven.archiva.repository.content.PathParser;
 import org.apache.maven.archiva.repository.layout.LayoutException;
 
+import java.io.File;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
 /**
  * Taken from Archiva's ManagedLegacyRepositoryContent and made some few changes
  *

Modified: continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/repository/scanner/RepositoryScannerInstance.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/repository/scanner/RepositoryScannerInstance.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/repository/scanner/RepositoryScannerInstance.java (original)
+++ continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/repository/scanner/RepositoryScannerInstance.java Mon Aug 13 04:29:09 2012
@@ -19,8 +19,6 @@ package org.apache.continuum.purge.repos
  * under the License.
  */
 
-import java.io.File;
-
 import org.apache.continuum.model.repository.LocalRepository;
 import org.apache.continuum.purge.controller.PurgeController;
 import org.apache.maven.archiva.common.utils.BaseFile;
@@ -28,6 +26,8 @@ import org.codehaus.plexus.util.Director
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.File;
+
 /**
  * Codes were taken from Archiva and made some few changes
  */

Modified: continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/repository/utils/FileTypes.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/repository/utils/FileTypes.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/repository/utils/FileTypes.java (original)
+++ continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/repository/utils/FileTypes.java Mon Aug 13 04:29:09 2012
@@ -19,11 +19,11 @@ package org.apache.continuum.purge.repos
  * under the License.
  */
 
+import org.codehaus.plexus.util.SelectorUtils;
+
 import java.util.Arrays;
 import java.util.List;
 
-import org.codehaus.plexus.util.SelectorUtils;
-
 /**
  * Codes were taken from Archiva and made some changes.
  */
@@ -33,9 +33,9 @@ public class FileTypes
 
     private List<String> ignoredFileTypePatterns;
 
-    public static final List<String> DEFAULT_EXCLUSIONS =
-        Arrays.asList( "**/maven-metadata.xml", "**/maven-metadata-*.xml", "**/*.sha1", "**/*.asc", "**/*.md5",
-                       "**/*.pgp" );
+    public static final List<String> DEFAULT_EXCLUSIONS = Arrays.asList( "**/maven-metadata.xml",
+                                                                         "**/maven-metadata-*.xml", "**/*.sha1",
+                                                                         "**/*.asc", "**/*.md5", "**/*.pgp" );
 
     public List<String> getIgnoredFileTypePatterns()
     {

Modified: continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/repository/utils/FilenameParser.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/repository/utils/FilenameParser.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/repository/utils/FilenameParser.java (original)
+++ continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/repository/utils/FilenameParser.java Mon Aug 13 04:29:09 2012
@@ -19,11 +19,11 @@ package org.apache.continuum.purge.repos
  * under the License.
  */
 
+import org.apache.maven.archiva.common.utils.VersionUtil;
+
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.maven.archiva.common.utils.VersionUtil;
-
 /**
  * Codes were taken from Archiva's FilenameParser
  */
@@ -37,8 +37,8 @@ public class FilenameParser
 
     private static final Pattern mavenPluginPattern = Pattern.compile( "(maven-.*-plugin)|(.*-maven-plugin)" );
 
-    private static final Pattern extensionPattern =
-        Pattern.compile( "(\\.tar\\.gz$)|(\\.tar\\.bz2$)|(\\.[\\-a-z0-9]*$)", Pattern.CASE_INSENSITIVE );
+    private static final Pattern extensionPattern = Pattern.compile(
+        "(\\.tar\\.gz$)|(\\.tar\\.bz2$)|(\\.[\\-a-z0-9]*$)", Pattern.CASE_INSENSITIVE );
 
     private static final Pattern section = Pattern.compile( "([^-]*)" );
 

Modified: continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/repository/utils/LegacyPathParser.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/repository/utils/LegacyPathParser.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/repository/utils/LegacyPathParser.java (original)
+++ continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/repository/utils/LegacyPathParser.java Mon Aug 13 04:29:09 2012
@@ -57,8 +57,8 @@ public class LegacyPathParser
         {
             // Illegal Path Parts Length.
             throw new LayoutException( INVALID_ARTIFACT_PATH +
-                "legacy paths should only have 3 parts [groupId]/[type]s/[artifactId]-[version].[type], found " +
-                pathParts.length + " instead." );
+                                           "legacy paths should only have 3 parts [groupId]/[type]s/[artifactId]-[version].[type], found " +
+                                           pathParts.length + " instead." );
         }
 
         // The Group ID.
@@ -71,7 +71,7 @@ public class LegacyPathParser
         if ( !expectedType.endsWith( "s" ) )
         {
             throw new LayoutException( INVALID_ARTIFACT_PATH +
-                "legacy paths should have an expected type ending in [s] in the second part of the path." );
+                                           "legacy paths should have an expected type ending in [s] in the second part of the path." );
         }
 
         // The Filename.
@@ -148,8 +148,8 @@ public class LegacyPathParser
 
         // Set Type
         String defaultExtension = expectedType.substring( 0, expectedType.length() - 1 );
-        artifact.setType(
-            ArtifactExtensionMapping.mapExtensionAndClassifierToType( classifier, extension, defaultExtension ) );
+        artifact.setType( ArtifactExtensionMapping.mapExtensionAndClassifierToType( classifier, extension,
+                                                                                    defaultExtension ) );
 
         // Sanity Check: does it have an extension?
         if ( StringUtils.isEmpty( artifact.getType() ) )
@@ -170,8 +170,9 @@ public class LegacyPathParser
             if ( !expectedExtension.equals( extension ) )
             {
                 throw new LayoutException( INVALID_ARTIFACT_PATH + "mismatch on extension [" + extension +
-                    "] and layout specified type [" + artifact.getType() + "] (which maps to extension: [" +
-                    expectedExtension + "]) on path [" + path + "]" );
+                                               "] and layout specified type [" + artifact.getType() +
+                                               "] (which maps to extension: [" +
+                                               expectedExtension + "]) on path [" + path + "]" );
             }
         }
 

Modified: continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/task/PurgeTaskExecutor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/task/PurgeTaskExecutor.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/task/PurgeTaskExecutor.java (original)
+++ continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/task/PurgeTaskExecutor.java Mon Aug 13 04:29:09 2012
@@ -43,7 +43,7 @@ import org.codehaus.plexus.taskqueue.exe
  */
 public class PurgeTaskExecutor
     implements TaskExecutor, Contextualizable
-{                             
+{
     /**
      * @plexus.requirement
      */
@@ -61,8 +61,8 @@ public class PurgeTaskExecutor
     {
         PurgeTask purgeTask = (PurgeTask) task;
 
-        AbstractPurgeConfiguration purgeConfig =
-            purgeConfigurationService.getPurgeConfiguration( purgeTask.getPurgeConfigurationId() );
+        AbstractPurgeConfiguration purgeConfig = purgeConfigurationService.getPurgeConfiguration(
+            purgeTask.getPurgeConfigurationId() );
 
         try
         {
@@ -78,8 +78,8 @@ public class PurgeTaskExecutor
                         "Error while executing purge repository task: no repository set" );
                 }
 
-                PurgeController purgeController =
-                    (PurgeController) container.lookup( PurgeController.ROLE, "purge-repository" );
+                PurgeController purgeController = (PurgeController) container.lookup( PurgeController.ROLE,
+                                                                                      "purge-repository" );
 
                 purgeController.initializeExecutors( repoPurge );
 
@@ -96,8 +96,8 @@ public class PurgeTaskExecutor
             {
                 DirectoryPurgeConfiguration dirPurge = (DirectoryPurgeConfiguration) purgeConfig;
 
-                PurgeController purgeController =
-                    (PurgeController) container.lookup( PurgeController.ROLE, "purge-directory" );
+                PurgeController purgeController = (PurgeController) container.lookup( PurgeController.ROLE,
+                                                                                      "purge-directory" );
 
                 purgeController.initializeExecutors( dirPurge );
 
@@ -105,13 +105,13 @@ public class PurgeTaskExecutor
             }
             else if ( purgeConfig instanceof DistributedDirectoryPurgeConfiguration )
             {
-                DistributedDirectoryPurgeConfiguration dirPurge = ( DistributedDirectoryPurgeConfiguration ) purgeConfig;
-                
-                PurgeController purgeController = 
-                    ( PurgeController ) container.lookup( PurgeController.ROLE, "purge-distributed-directory" );
-                
+                DistributedDirectoryPurgeConfiguration dirPurge = (DistributedDirectoryPurgeConfiguration) purgeConfig;
+
+                PurgeController purgeController = (PurgeController) container.lookup( PurgeController.ROLE,
+                                                                                      "purge-distributed-directory" );
+
                 purgeController.initializeExecutors( dirPurge );
-                
+
                 purgeController.doPurge( dirPurge );
             }
 

Modified: continuum/trunk/continuum-purge/src/test/java/org/apache/continuum/purge/AbstractPurgeTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-purge/src/test/java/org/apache/continuum/purge/AbstractPurgeTest.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/src/test/java/org/apache/continuum/purge/AbstractPurgeTest.java (original)
+++ continuum/trunk/continuum-purge/src/test/java/org/apache/continuum/purge/AbstractPurgeTest.java Mon Aug 13 04:29:09 2012
@@ -19,14 +19,6 @@ package org.apache.continuum.purge;
  * under the License.
  */
 
-import java.io.File;
-import java.net.URL;
-import java.util.Map;
-import java.util.Properties;
-
-import javax.jdo.PersistenceManager;
-import javax.jdo.PersistenceManagerFactory;
-
 import org.apache.continuum.dao.DirectoryPurgeConfigurationDao;
 import org.apache.continuum.dao.DistributedDirectoryPurgeConfigurationDao;
 import org.apache.continuum.dao.LocalRepositoryDao;
@@ -39,6 +31,13 @@ import org.codehaus.plexus.jdo.JdoFactor
 import org.codehaus.plexus.spring.PlexusInSpringTestCase;
 import org.jpox.SchemaTool;
 
+import java.io.File;
+import java.net.URL;
+import java.util.Map;
+import java.util.Properties;
+import javax.jdo.PersistenceManager;
+import javax.jdo.PersistenceManagerFactory;
+
 /**
  * @author Maria Catherine Tan
  */
@@ -52,7 +51,7 @@ public abstract class AbstractPurgeTest
     private static final String TEST_DEFAULT_RELEASES_DIR = "target/working-directory";
 
     private static final String TEST_DEFAULT_BUILDOUTPUT_DIR = "target/build-output-directory";
-    
+
     protected static final String TEST_BUILD_AGENT_URL = "http://localhost:8181/continuum-buildagent/xmlrpc";
 
     protected static final int TEST_DAYS_OLDER = 30;
@@ -62,7 +61,7 @@ public abstract class AbstractPurgeTest
     protected static final String TEST_RELEASES_DIRECTORY_TYPE = "releases";
 
     protected static final String TEST_BUILDOUTPUT_DIRECTORY_TYPE = "buildOutput";
-    
+
     protected static final String TEST_WORKING_DIRECTORY_TYPE = "working";
 
     protected LocalRepositoryDao localRepositoryDao;
@@ -91,14 +90,14 @@ public abstract class AbstractPurgeTest
 
         localRepositoryDao = (LocalRepositoryDao) lookup( LocalRepositoryDao.class.getName() );
 
-        repositoryPurgeConfigurationDao =
-            (RepositoryPurgeConfigurationDao) lookup( RepositoryPurgeConfigurationDao.class );
+        repositoryPurgeConfigurationDao = (RepositoryPurgeConfigurationDao) lookup(
+            RepositoryPurgeConfigurationDao.class );
+
+        directoryPurgeConfigurationDao = (DirectoryPurgeConfigurationDao) lookup(
+            DirectoryPurgeConfigurationDao.class );
 
-        directoryPurgeConfigurationDao =
-            (DirectoryPurgeConfigurationDao) lookup( DirectoryPurgeConfigurationDao.class );
-        
-        distributedDirectoryPurgeConfigurationDao =
-            (DistributedDirectoryPurgeConfigurationDao) lookup( DistributedDirectoryPurgeConfigurationDao.class );
+        distributedDirectoryPurgeConfigurationDao = (DistributedDirectoryPurgeConfigurationDao) lookup(
+            DistributedDirectoryPurgeConfigurationDao.class );
 
         if ( localRepositoryDao.getAllLocalRepositories().size() == 0 )
         {
@@ -181,8 +180,8 @@ public abstract class AbstractPurgeTest
             System.setProperty( (String) entry.getKey(), (String) entry.getValue() );
         }
 
-        SchemaTool.createSchemaTables( new URL[]{getClass().getResource( "/package.jdo" )}, new URL[]{}, null,
-                                       false, null );
+        SchemaTool.createSchemaTables( new URL[]{getClass().getResource( "/package.jdo" )}, new URL[]{}, null, false,
+                                       null );
     }
 
     protected File getDefaultRepositoryLocation()

Modified: continuum/trunk/continuum-purge/src/test/java/org/apache/continuum/purge/DefaultPurgeConfigurationServiceTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-purge/src/test/java/org/apache/continuum/purge/DefaultPurgeConfigurationServiceTest.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/src/test/java/org/apache/continuum/purge/DefaultPurgeConfigurationServiceTest.java (original)
+++ continuum/trunk/continuum-purge/src/test/java/org/apache/continuum/purge/DefaultPurgeConfigurationServiceTest.java Mon Aug 13 04:29:09 2012
@@ -19,14 +19,14 @@ package org.apache.continuum.purge;
  * under the License.
  */
 
-import java.util.List;
-
 import org.apache.continuum.model.repository.DirectoryPurgeConfiguration;
 import org.apache.continuum.model.repository.DistributedDirectoryPurgeConfiguration;
 import org.apache.continuum.model.repository.RepositoryPurgeConfiguration;
 import org.apache.continuum.purge.repository.content.ManagedDefaultRepositoryContent;
 import org.apache.continuum.purge.repository.content.RepositoryManagedContent;
 
+import java.util.List;
+
 /**
  * @author Maria Catherine Tan
  */
@@ -56,8 +56,8 @@ public class DefaultPurgeConfigurationSe
 
         assertNotNull( repoConfig );
 
-        RepositoryPurgeConfiguration retrieved =
-            repositoryPurgeConfigurationDao.getRepositoryPurgeConfiguration( repoConfig.getId() );
+        RepositoryPurgeConfiguration retrieved = repositoryPurgeConfigurationDao.getRepositoryPurgeConfiguration(
+            repoConfig.getId() );
         assertEquals( repoConfig, retrieved );
 
         purgeConfigurationService.removeRepositoryPurgeConfiguration( repoConfig );
@@ -66,8 +66,8 @@ public class DefaultPurgeConfigurationSe
             purgeConfigurationService.getAllRepositoryPurgeConfigurations();
 
         assertFalse( "check if repo purge configuration was removed", repoConfigs.contains( repoConfig ) );
-        assertNotNull( "check if repository still exists",
-                       localRepositoryDao.getLocalRepository( defaultRepository.getId() ) );
+        assertNotNull( "check if repository still exists", localRepositoryDao.getLocalRepository(
+            defaultRepository.getId() ) );
     }
 
     public void testDirectoryPurgeConfiguration()
@@ -84,8 +84,8 @@ public class DefaultPurgeConfigurationSe
 
         assertNotNull( dirConfig );
 
-        DirectoryPurgeConfiguration retrieved =
-            directoryPurgeConfigurationDao.getDirectoryPurgeConfiguration( dirConfig.getId() );
+        DirectoryPurgeConfiguration retrieved = directoryPurgeConfigurationDao.getDirectoryPurgeConfiguration(
+            dirConfig.getId() );
         assertEquals( dirConfig, retrieved );
 
         dirConfig.setDirectoryType( TEST_BUILDOUTPUT_DIRECTORY_TYPE );
@@ -119,20 +119,22 @@ public class DefaultPurgeConfigurationSe
 
         dirConfig.setDirectoryType( TEST_WORKING_DIRECTORY_TYPE );
         purgeConfigurationService.updateDistributedDirectoryPurgeConfiguration( dirConfig );
-        retrieved = distributedDirectoryPurgeConfigurationDao.getDistributedDirectoryPurgeConfiguration( dirConfig.getId() );
+        retrieved = distributedDirectoryPurgeConfigurationDao.getDistributedDirectoryPurgeConfiguration(
+            dirConfig.getId() );
         assertEquals( dirConfig, retrieved );
 
         purgeConfigurationService.removeDistributedDirectoryPurgeConfiguration( dirConfig );
 
-        List<DistributedDirectoryPurgeConfiguration> dirConfigs = purgeConfigurationService.getAllDistributedDirectoryPurgeConfigurations();
+        List<DistributedDirectoryPurgeConfiguration> dirConfigs =
+            purgeConfigurationService.getAllDistributedDirectoryPurgeConfigurations();
         assertFalse( "check if dir purge configuration was removed", dirConfigs.contains( dirConfig ) );
     }
 
     public void testRepositoryManagedContent()
         throws Exception
     {
-        RepositoryManagedContent repo =
-            purgeConfigurationService.getManagedRepositoryContent( defaultRepository.getId() );
+        RepositoryManagedContent repo = purgeConfigurationService.getManagedRepositoryContent(
+            defaultRepository.getId() );
 
         assertTrue( "check repository managed content", ( repo instanceof ManagedDefaultRepositoryContent ) );
         assertEquals( "check repository of the managed content", defaultRepository, repo.getRepository() );

Modified: continuum/trunk/continuum-purge/src/test/java/org/apache/continuum/purge/executor/AbstractPurgeExecutorTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-purge/src/test/java/org/apache/continuum/purge/executor/AbstractPurgeExecutorTest.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/src/test/java/org/apache/continuum/purge/executor/AbstractPurgeExecutorTest.java (original)
+++ continuum/trunk/continuum-purge/src/test/java/org/apache/continuum/purge/executor/AbstractPurgeExecutorTest.java Mon Aug 13 04:29:09 2012
@@ -19,10 +19,6 @@ package org.apache.continuum.purge.execu
  * under the License.
  */
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
 import org.apache.commons.io.FileUtils;
 import org.apache.continuum.model.repository.DirectoryPurgeConfiguration;
 import org.apache.continuum.model.repository.RepositoryPurgeConfiguration;
@@ -30,6 +26,10 @@ import org.apache.continuum.purge.Abstra
 import org.apache.continuum.purge.task.PurgeTask;
 import org.codehaus.plexus.taskqueue.execution.TaskExecutor;
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @author Maria Catherine Tan
  */
@@ -351,8 +351,8 @@ public abstract class AbstractPurgeExecu
             // create maven-metadata* files
             for ( String metadata_extension : metadata_extensions )
             {
-                File metadata =
-                    new File( versionDir.getParentFile().getAbsolutePath(), TEST_MAVEN_METADATA + metadata_extension );
+                File metadata = new File( versionDir.getParentFile().getAbsolutePath(),
+                                          TEST_MAVEN_METADATA + metadata_extension );
                 metadata.createNewFile();
             }
         }

Modified: continuum/trunk/continuum-release/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-release/pom.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-release/pom.xml (original)
+++ continuum/trunk/continuum-release/pom.xml Mon Aug 13 04:29:09 2012
@@ -17,7 +17,8 @@ KIND, either express or implied.  See th
 specific language governing permissions and limitations
 under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>continuum</artifactId>
@@ -125,7 +126,7 @@ under the License.
       <artifactId>jetty-util</artifactId>
       <!-- TODO: change this to jetty.version when using Jetty 7 throughout -->
       <version>8.1.5.v20120716</version>
-    </dependency>  
+    </dependency>
     <!-- === Testing Dependencies === -->
     <dependency>
       <groupId>hsqldb</groupId>

Modified: continuum/trunk/continuum-release/src/main/java/org/apache/continuum/release/config/ContinuumPropertiesReleaseDescriptorStore.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-release/src/main/java/org/apache/continuum/release/config/ContinuumPropertiesReleaseDescriptorStore.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-release/src/main/java/org/apache/continuum/release/config/ContinuumPropertiesReleaseDescriptorStore.java (original)
+++ continuum/trunk/continuum-release/src/main/java/org/apache/continuum/release/config/ContinuumPropertiesReleaseDescriptorStore.java Mon Aug 13 04:29:09 2012
@@ -19,6 +19,14 @@ package org.apache.continuum.release.con
  * under the License.
  */
 
+import org.apache.maven.model.Scm;
+import org.apache.maven.shared.release.config.PropertiesReleaseDescriptorStore;
+import org.apache.maven.shared.release.config.ReleaseDescriptor;
+import org.apache.maven.shared.release.config.ReleaseDescriptorStoreException;
+import org.apache.maven.shared.release.config.ReleaseUtils;
+import org.codehaus.plexus.util.IOUtil;
+import org.eclipse.jetty.util.security.Password;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -33,14 +41,6 @@ import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.Set;
 
-import org.apache.maven.model.Scm;
-import org.apache.maven.shared.release.config.PropertiesReleaseDescriptorStore;
-import org.apache.maven.shared.release.config.ReleaseDescriptor;
-import org.apache.maven.shared.release.config.ReleaseDescriptorStoreException;
-import org.apache.maven.shared.release.config.ReleaseUtils;
-import org.codehaus.plexus.util.IOUtil;
-import org.eclipse.jetty.util.security.Password;
-
 public class ContinuumPropertiesReleaseDescriptorStore
     extends PropertiesReleaseDescriptorStore
 {
@@ -74,7 +74,7 @@ public class ContinuumPropertiesReleaseD
         releaseDescriptor.setCompletedPhase( properties.getProperty( "completedPhase" ) );
         releaseDescriptor.setScmSourceUrl( properties.getProperty( "scm.url" ) );
         releaseDescriptor.setScmUsername( properties.getProperty( "scm.username" ) );
-        
+
         String password = properties.getProperty( "scm.password" );
         if ( password != null && password.startsWith( "OBF:" ) )
         {
@@ -129,8 +129,8 @@ public class ContinuumPropertiesReleaseD
                         {
                             Scm scm = new Scm();
                             scm.setConnection( properties.getProperty( "project.scm." + key + ".connection" ) );
-                            scm.setDeveloperConnection(
-                                properties.getProperty( "project.scm." + key + ".developerConnection" ) );
+                            scm.setDeveloperConnection( properties.getProperty(
+                                "project.scm." + key + ".developerConnection" ) );
                             scm.setUrl( properties.getProperty( "project.scm." + key + ".url" ) );
                             scm.setTag( properties.getProperty( "project.scm." + key + ".tag" ) );
 
@@ -141,8 +141,8 @@ public class ContinuumPropertiesReleaseD
             }
             else if ( property.startsWith( "build.env." ) )
             {
-                releaseDescriptor.mapEnvironments( property.substring( "build.env.".length() ),
-                                                   properties.getProperty( property ) );
+                releaseDescriptor.mapEnvironments( property.substring( "build.env.".length() ), properties.getProperty(
+                    property ) );
             }
         }
 
@@ -304,10 +304,10 @@ public class ContinuumPropertiesReleaseD
 
             Map versionMap = (Map) currentEntry.getValue();
 
-            prop.setProperty( "dependency." + currentEntry.getKey() + ".release",
-                              (String) versionMap.get( ReleaseDescriptor.RELEASE_KEY ) );
-            prop.setProperty( "dependency." + currentEntry.getKey() + ".development",
-                              (String) versionMap.get( ReleaseDescriptor.DEVELOPMENT_KEY ) );
+            prop.setProperty( "dependency." + currentEntry.getKey() + ".release", (String) versionMap.get(
+                ReleaseDescriptor.RELEASE_KEY ) );
+            prop.setProperty( "dependency." + currentEntry.getKey() + ".development", (String) versionMap.get(
+                ReleaseDescriptor.DEVELOPMENT_KEY ) );
         }
     }
 

Modified: continuum/trunk/continuum-release/src/main/java/org/apache/continuum/release/config/ContinuumReleaseDescriptor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-release/src/main/java/org/apache/continuum/release/config/ContinuumReleaseDescriptor.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-release/src/main/java/org/apache/continuum/release/config/ContinuumReleaseDescriptor.java (original)
+++ continuum/trunk/continuum-release/src/main/java/org/apache/continuum/release/config/ContinuumReleaseDescriptor.java Mon Aug 13 04:29:09 2012
@@ -19,11 +19,11 @@ package org.apache.continuum.release.con
  * under the License.
  */
 
+import org.apache.maven.shared.release.config.ReleaseDescriptor;
+
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.maven.shared.release.config.ReleaseDescriptor;
-
 /**
  * @author <a href="mailto:ctan@apache.org">Maria Catherine Tan</a>
  */
@@ -51,7 +51,7 @@ public class ContinuumReleaseDescriptor
         return environments;
     }
 
-    public void mapEnvironments( String name, String value)
+    public void mapEnvironments( String name, String value )
     {
         if ( environments == null )
         {

Modified: continuum/trunk/continuum-release/src/main/java/org/apache/continuum/release/phase/AbstractContinuumRunGoalsPhase.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-release/src/main/java/org/apache/continuum/release/phase/AbstractContinuumRunGoalsPhase.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-release/src/main/java/org/apache/continuum/release/phase/AbstractContinuumRunGoalsPhase.java (original)
+++ continuum/trunk/continuum-release/src/main/java/org/apache/continuum/release/phase/AbstractContinuumRunGoalsPhase.java Mon Aug 13 04:29:09 2012
@@ -19,10 +19,6 @@ package org.apache.continuum.release.pha
  * under the License.
  */
 
-import java.io.File;
-import java.util.List;
-import java.util.Map;
-
 import org.apache.continuum.release.config.ContinuumReleaseDescriptor;
 import org.apache.continuum.utils.shell.ShellCommandHelper;
 import org.apache.maven.continuum.installation.InstallationService;
@@ -34,6 +30,10 @@ import org.apache.maven.shared.release.e
 import org.apache.maven.shared.release.phase.AbstractRunGoalsPhase;
 import org.codehaus.plexus.util.StringUtils;
 
+import java.io.File;
+import java.util.List;
+import java.util.Map;
+
 /**
  * @author <a href="mailto:ctan@apache.org">Maria Catherine Tan</a>
  */
@@ -58,7 +58,7 @@ public abstract class AbstractContinuumR
         throws ReleaseExecutionException
     {
         ReleaseResult result = new ReleaseResult();
-        
+
         try
         {
             String goals = getGoals( releaseDescriptor );
@@ -72,12 +72,12 @@ public abstract class AbstractContinuumR
                 {
                     environments = ( (ContinuumReleaseDescriptor) releaseDescriptor ).getEnvironments();
 
-                    executable = ( (ContinuumReleaseDescriptor) releaseDescriptor).getExecutable();
+                    executable = ( (ContinuumReleaseDescriptor) releaseDescriptor ).getExecutable();
                 }
                 shellCommandHelper.executeGoals( determineWorkingDirectory( workingDirectory,
-                								 releaseDescriptor.getScmRelativePathProjectDirectory() ),
-                                                 executable, goals, releaseDescriptor.isInteractive(), additionalArguments, result, 
-                                                 environments );
+                                                                            releaseDescriptor.getScmRelativePathProjectDirectory() ),
+                                                 executable, goals, releaseDescriptor.isInteractive(),
+                                                 additionalArguments, result, environments );
             }
         }
         catch ( Exception e )
@@ -90,23 +90,27 @@ public abstract class AbstractContinuumR
         return result;
     }
 
-	@Override
-	public ReleaseResult execute(ReleaseDescriptor arg0,
-			ReleaseEnvironment arg1, File arg2, String arg3)
-			throws ReleaseExecutionException {
-		return super.execute(arg0, arg1, arg2, arg3);
-	}
-
-	public ReleaseResult execute(ReleaseDescriptor releaseDescriptor,
-			ReleaseEnvironment releaseEnvironment, List reactorProjects)
-			throws ReleaseExecutionException, ReleaseFailureException {
-		
-		return execute(releaseDescriptor, new File(releaseDescriptor.getWorkingDirectory()), releaseDescriptor.getAdditionalArguments());
-	}
-
-	public ReleaseResult simulate(ReleaseDescriptor releaseDescriptor,
-			ReleaseEnvironment releaseEnvironment, List reactorProjects)
-			throws ReleaseExecutionException, ReleaseFailureException {
-		return execute(releaseDescriptor, new File(releaseDescriptor.getWorkingDirectory()), releaseDescriptor.getAdditionalArguments());
-	}
+    @Override
+    public ReleaseResult execute( ReleaseDescriptor arg0, ReleaseEnvironment arg1, File arg2, String arg3 )
+        throws ReleaseExecutionException
+    {
+        return super.execute( arg0, arg1, arg2, arg3 );
+    }
+
+    public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+                                  List reactorProjects )
+        throws ReleaseExecutionException, ReleaseFailureException
+    {
+
+        return execute( releaseDescriptor, new File( releaseDescriptor.getWorkingDirectory() ),
+                        releaseDescriptor.getAdditionalArguments() );
+    }
+
+    public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+                                   List reactorProjects )
+        throws ReleaseExecutionException, ReleaseFailureException
+    {
+        return execute( releaseDescriptor, new File( releaseDescriptor.getWorkingDirectory() ),
+                        releaseDescriptor.getAdditionalArguments() );
+    }
 }

Modified: continuum/trunk/continuum-release/src/main/java/org/apache/continuum/release/phase/RunPerformGoalsPhase.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-release/src/main/java/org/apache/continuum/release/phase/RunPerformGoalsPhase.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-release/src/main/java/org/apache/continuum/release/phase/RunPerformGoalsPhase.java (original)
+++ continuum/trunk/continuum-release/src/main/java/org/apache/continuum/release/phase/RunPerformGoalsPhase.java Mon Aug 13 04:29:09 2012
@@ -19,9 +19,6 @@ package org.apache.continuum.release.pha
  * under the License.
  */
 
-import java.io.File;
-import java.util.List;
-
 import org.apache.maven.settings.Settings;
 import org.apache.maven.shared.release.ReleaseExecutionException;
 import org.apache.maven.shared.release.ReleaseFailureException;
@@ -30,8 +27,12 @@ import org.apache.maven.shared.release.c
 import org.apache.maven.shared.release.env.ReleaseEnvironment;
 import org.codehaus.plexus.util.StringUtils;
 
+import java.io.File;
+import java.util.List;
+
 /**
  * Run Release Perform Goals
+ *
  * @plexus.component role="org.apache.maven.shared.release.phase.ReleasePhase" role-hint="run-release-perform-goals"
  */
 public class RunPerformGoalsPhase
@@ -43,11 +44,12 @@ public class RunPerformGoalsPhase
         return releaseDescriptor.getPerformGoals();
     }
 
-    public ReleaseResult execute(ReleaseDescriptor releaseDescriptor,
-			ReleaseEnvironment releaseEnvironment, List reactorProjects)
-			throws ReleaseExecutionException, ReleaseFailureException {
-		
-    	String additionalArguments = releaseDescriptor.getAdditionalArguments();
+    public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+                                  List reactorProjects )
+        throws ReleaseExecutionException, ReleaseFailureException
+    {
+
+        String additionalArguments = releaseDescriptor.getAdditionalArguments();
 
         if ( releaseDescriptor.isUseReleaseProfile() )
         {
@@ -60,10 +62,10 @@ public class RunPerformGoalsPhase
                 additionalArguments = "-DperformRelease=true";
             }
         }
-        
+
         return execute( releaseDescriptor, new File( releaseDescriptor.getCheckoutDirectory() ), additionalArguments );
-	}
-    
+    }
+
     public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects )
         throws ReleaseExecutionException, ReleaseFailureException
     {

Modified: continuum/trunk/continuum-release/src/main/java/org/apache/continuum/release/phase/RunPrepareGoalsPhase.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-release/src/main/java/org/apache/continuum/release/phase/RunPrepareGoalsPhase.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-release/src/main/java/org/apache/continuum/release/phase/RunPrepareGoalsPhase.java (original)
+++ continuum/trunk/continuum-release/src/main/java/org/apache/continuum/release/phase/RunPrepareGoalsPhase.java Mon Aug 13 04:29:09 2012
@@ -19,17 +19,18 @@ package org.apache.continuum.release.pha
  * under the License.
  */
 
-import java.io.File;
-import java.util.List;
-
 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.env.ReleaseEnvironment;
 
+import java.io.File;
+import java.util.List;
+
 /**
  * Run Release Preparation Goals
+ *
  * @plexus.component role="org.apache.maven.shared.release.phase.ReleasePhase" role-hint="run-release-prepare-goals"
  */
 public class RunPrepareGoalsPhase
@@ -41,13 +42,14 @@ public class RunPrepareGoalsPhase
         return releaseDescriptor.getPreparationGoals();
     }
 
-    public ReleaseResult execute(ReleaseDescriptor releaseDescriptor,
-			ReleaseEnvironment releaseEnvironment, List reactorProjects)
-			throws ReleaseExecutionException, ReleaseFailureException {
-		
-    	return execute( releaseDescriptor, new File( releaseDescriptor.getWorkingDirectory() ), 
-                releaseDescriptor.getAdditionalArguments() );
-	}
+    public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+                                  List reactorProjects )
+        throws ReleaseExecutionException, ReleaseFailureException
+    {
+
+        return execute( releaseDescriptor, new File( releaseDescriptor.getWorkingDirectory() ),
+                        releaseDescriptor.getAdditionalArguments() );
+    }
 
     public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                                    List reactorProjects )

Modified: continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java (original)
+++ continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java Mon Aug 13 04:29:09 2012
@@ -19,15 +19,6 @@ package org.apache.maven.continuum.relea
  * under the License.
  */
 
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
 import org.apache.commons.lang.BooleanUtils;
 import org.apache.continuum.model.release.ReleaseListenerSummary;
 import org.apache.continuum.model.repository.LocalRepository;
@@ -37,9 +28,6 @@ import org.apache.maven.continuum.model.
 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.model.Model;
-import org.apache.maven.model.Plugin;
-import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
 import org.apache.maven.scm.manager.ScmManager;
 import org.apache.maven.scm.provider.ScmProvider;
 import org.apache.maven.scm.repository.ScmRepository;
@@ -47,8 +35,6 @@ import org.apache.maven.shared.release.R
 import org.apache.maven.shared.release.config.ReleaseDescriptor;
 import org.apache.maven.shared.release.config.ReleaseDescriptorStore;
 import org.apache.maven.shared.release.config.ReleaseDescriptorStoreException;
-import org.apache.maven.shared.release.versions.DefaultVersionInfo;
-import org.apache.maven.shared.release.versions.VersionInfo;
 import org.codehaus.plexus.PlexusConstants;
 import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
@@ -59,10 +45,12 @@ import org.codehaus.plexus.taskqueue.Tas
 import org.codehaus.plexus.taskqueue.TaskQueue;
 import org.codehaus.plexus.taskqueue.TaskQueueException;
 import org.codehaus.plexus.taskqueue.execution.TaskQueueExecutor;
-import org.codehaus.plexus.util.ReaderFactory;
 import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.plexus.util.xml.Xpp3Dom;
-import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+
+import java.io.File;
+import java.util.Hashtable;
+import java.util.Map;
+import java.util.Properties;
 
 /**
  * @author Jason van Zyl
@@ -72,11 +60,13 @@ import org.codehaus.plexus.util.xml.pull
 public class DefaultContinuumReleaseManager
     implements ContinuumReleaseManager, Contextualizable
 {
-    
+
     private static final String PLEXUS_KEY_PERFORM_RELEASE_TASKQUEUE_EXECUTOR = "perform-release";
+
     private static final String PLEXUS_KEY_PREPARE_RELEASE_TASKQUEUE_EXECUTOR = "prepare-release";
+
     private static final String PLEXUS_KEY_ROLLBACK_RELEASE_TASKQUEUE_EXECUTOR = "rollback-release";
-    
+
     /**
      * @plexus.requirement
      */
@@ -136,9 +126,8 @@ public class DefaultContinuumReleaseMana
         String releaseId = project.getGroupId() + ":" + project.getArtifactId();
         String id = releaseId;
 
-        ReleaseDescriptor descriptor =
-            getReleaseDescriptor( project, releaseProperties, relVersions, devVersions, environments, workingDirectory,
-                                  executable );
+        ReleaseDescriptor descriptor = getReleaseDescriptor( project, releaseProperties, relVersions, devVersions,
+                                                             environments, workingDirectory, executable );
 
         if ( listener == null )
         {
@@ -156,8 +145,8 @@ public class DefaultContinuumReleaseMana
 
         try
         {
-            prepareReleaseQueue.put(
-                new PrepareReleaseProjectTask( releaseId, descriptor, (ReleaseManagerListener) listener ) );
+            prepareReleaseQueue.put( new PrepareReleaseProjectTask( releaseId, descriptor,
+                                                                    (ReleaseManagerListener) listener ) );
         }
         catch ( TaskQueueException e )
         {
@@ -217,9 +206,9 @@ public class DefaultContinuumReleaseMana
         {
             getListeners().put( releaseId, listener );
 
-            performReleaseQueue.put(
-                new PerformReleaseProjectTask( releaseId, descriptor, buildDirectory, goals, useReleaseProfile,
-                                               (ReleaseManagerListener) listener, repository ) );
+            performReleaseQueue.put( new PerformReleaseProjectTask( releaseId, descriptor, buildDirectory, goals,
+                                                                    useReleaseProfile,
+                                                                    (ReleaseManagerListener) listener, repository ) );
         }
         catch ( TaskQueueException e )
         {
@@ -298,8 +287,8 @@ public class DefaultContinuumReleaseMana
         descriptor.setPreparationGoals( releaseProperties.getProperty( "preparation-goals" ) );
         descriptor.setAdditionalArguments( releaseProperties.getProperty( "arguments" ) );
         descriptor.setAddSchema( Boolean.valueOf( releaseProperties.getProperty( "add-schema" ) ) );
-        descriptor.setAutoVersionSubmodules(
-            Boolean.valueOf( releaseProperties.getProperty( "auto-version-submodules" ) ) );
+        descriptor.setAutoVersionSubmodules( Boolean.valueOf( releaseProperties.getProperty(
+            "auto-version-submodules" ) ) );
 
         String useEditMode = releaseProperties.getProperty( "use-edit-mode" );
         if ( BooleanUtils.toBoolean( useEditMode ) )
@@ -315,8 +304,8 @@ public class DefaultContinuumReleaseMana
 
             if ( StringUtils.isNotEmpty( args ) )
             {
-                descriptor.setAdditionalArguments( args + 
-                                                   " \"-Dmaven.repo.local=" + repository.getLocation() + "\"" );
+                descriptor.setAdditionalArguments( args +
+                                                       " \"-Dmaven.repo.local=" + repository.getLocation() + "\"" );
             }
             else
             {
@@ -339,7 +328,8 @@ public class DefaultContinuumReleaseMana
         }
         if ( releaseProperties.containsKey( "use-release-profile" ) )
         {
-            descriptor.setUseReleaseProfile( Boolean.valueOf( releaseProperties.getProperty( "use-release-profile" ) ) );
+            descriptor.setUseReleaseProfile( Boolean.valueOf( releaseProperties.getProperty(
+                "use-release-profile" ) ) );
         }
 
         //forced properties
@@ -405,53 +395,60 @@ public class DefaultContinuumReleaseMana
             listenerSummary.setPhases( listener.getPhases() );
             listenerSummary.setCompletedPhases( listener.getCompletedPhases() );
             listenerSummary.setUsername( listener.getUsername() );
-    
+
             return listenerSummary;
         }
 
         return null;
     }
-    
-    public boolean isExecutingRelease() throws Exception
+
+    public boolean isExecutingRelease()
+        throws Exception
     {
-        return prepareReleaseQueue.getQueueSnapshot().size() > 0 || 
-            performReleaseQueue.getQueueSnapshot().size() > 0 || 
+        return prepareReleaseQueue.getQueueSnapshot().size() > 0 ||
+            performReleaseQueue.getQueueSnapshot().size() > 0 ||
             rollbackReleaseQueue.getQueueSnapshot().size() > 0 ||
-            getPerformReleaseTaskQueueExecutor().getCurrentTask() != null || 
+            getPerformReleaseTaskQueueExecutor().getCurrentTask() != null ||
             getPrepareReleaseTaskQueueExecutor().getCurrentTask() != null ||
             getRollbackReleaseTaskQueueExecutor().getCurrentTask() != null;
     }
-    
 
-    public TaskQueueExecutor getPerformReleaseTaskQueueExecutor() throws TaskQueueManagerException
+
+    public TaskQueueExecutor getPerformReleaseTaskQueueExecutor()
+        throws TaskQueueManagerException
     {
         try
         {
-            return (TaskQueueExecutor) container.lookup( TaskQueueExecutor.class, PLEXUS_KEY_PERFORM_RELEASE_TASKQUEUE_EXECUTOR );
+            return (TaskQueueExecutor) container.lookup( TaskQueueExecutor.class,
+                                                         PLEXUS_KEY_PERFORM_RELEASE_TASKQUEUE_EXECUTOR );
         }
         catch ( ComponentLookupException e )
         {
             throw new TaskQueueManagerException( e.getMessage(), e );
         }
     }
-    
-    public TaskQueueExecutor getPrepareReleaseTaskQueueExecutor() throws TaskQueueManagerException
+
+    public TaskQueueExecutor getPrepareReleaseTaskQueueExecutor()
+        throws TaskQueueManagerException
     {
         try
         {
-            return (TaskQueueExecutor) container.lookup( TaskQueueExecutor.class, PLEXUS_KEY_PREPARE_RELEASE_TASKQUEUE_EXECUTOR );
+            return (TaskQueueExecutor) container.lookup( TaskQueueExecutor.class,
+                                                         PLEXUS_KEY_PREPARE_RELEASE_TASKQUEUE_EXECUTOR );
         }
         catch ( ComponentLookupException e )
         {
             throw new TaskQueueManagerException( e.getMessage(), e );
         }
     }
-    
-    public TaskQueueExecutor getRollbackReleaseTaskQueueExecutor() throws TaskQueueManagerException
+
+    public TaskQueueExecutor getRollbackReleaseTaskQueueExecutor()
+        throws TaskQueueManagerException
     {
         try
         {
-            return (TaskQueueExecutor) container.lookup( TaskQueueExecutor.class, PLEXUS_KEY_ROLLBACK_RELEASE_TASKQUEUE_EXECUTOR );
+            return (TaskQueueExecutor) container.lookup( TaskQueueExecutor.class,
+                                                         PLEXUS_KEY_ROLLBACK_RELEASE_TASKQUEUE_EXECUTOR );
         }
         catch ( ComponentLookupException e )
         {

Modified: continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultReleaseManagerListener.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultReleaseManagerListener.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultReleaseManagerListener.java (original)
+++ continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultReleaseManagerListener.java Mon Aug 13 04:29:09 2012
@@ -19,12 +19,12 @@ package org.apache.maven.continuum.relea
  * under the License.
  */
 
+import org.apache.maven.shared.release.ReleaseManagerListener;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.maven.shared.release.ReleaseManagerListener;
-
 /**
  * @author Edwin Punzalan
  * @version $Id$
@@ -43,7 +43,7 @@ public class DefaultReleaseManagerListen
     private String error;
 
     private int state;
-    
+
     private String username;
 
     public void goalStart( String name, List phases )
@@ -112,12 +112,12 @@ public class DefaultReleaseManagerListen
     {
         return state;
     }
-    
+
     public void setUsername( String username )
     {
         this.username = username;
     }
-    
+
     public String getUsername()
     {
         return username;

Modified: continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java (original)
+++ continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java Mon Aug 13 04:29:09 2012
@@ -121,9 +121,9 @@ public class PerformReleaseTaskExecutor
             throw new TaskExecutionException( "Failed to build reactor projects.", e );
         }
 
-        ReleaseResult result =
-            releaseManager.performWithResult( descriptor, new DefaultReleaseEnvironment().setSettings( settings ),
-                                              reactorProjects, listener );
+        ReleaseResult result = releaseManager.performWithResult( descriptor,
+                                                                 new DefaultReleaseEnvironment().setSettings(
+                                                                     settings ), reactorProjects, listener );
 
         //override to show the actual start time
         result.setStartTime( getStartTime() );
@@ -175,8 +175,8 @@ public class PerformReleaseTaskExecutor
 
             try
             {
-                MavenProject reactorProject =
-                    projectBuilder.build( pomFile, getLocalRepository(), getProfileManager( settings ) );
+                MavenProject reactorProject = projectBuilder.build( pomFile, getLocalRepository(), getProfileManager(
+                    settings ) );
 
                 reactorProjects.add( reactorProject );
 

Modified: continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PrepareReleaseTaskExecutor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PrepareReleaseTaskExecutor.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PrepareReleaseTaskExecutor.java (original)
+++ continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PrepareReleaseTaskExecutor.java Mon Aug 13 04:29:09 2012
@@ -19,8 +19,6 @@ package org.apache.maven.continuum.relea
  * under the License.
  */
 
-import java.util.ArrayList;
-
 import org.apache.maven.continuum.release.tasks.PrepareReleaseProjectTask;
 import org.apache.maven.continuum.release.tasks.ReleaseProjectTask;
 import org.apache.maven.shared.release.ReleaseResult;
@@ -29,6 +27,8 @@ import org.apache.maven.shared.release.e
 import org.apache.maven.shared.release.env.ReleaseEnvironment;
 import org.codehaus.plexus.taskqueue.execution.TaskExecutionException;
 
+import java.util.ArrayList;
+
 /**
  * @author Edwin Punzalan
  * @version $Id$
@@ -43,12 +43,10 @@ public class PrepareReleaseTaskExecutor
 
         ReleaseDescriptor descriptor = prepareTask.getDescriptor();
 
-       
         ReleaseEnvironment releaseEnvironment = new DefaultReleaseEnvironment();
-        releaseEnvironment.setSettings(settings);
-        ReleaseResult result = releaseManager.prepareWithResult( descriptor, releaseEnvironment, new ArrayList(), false, false,
-                                                                 prepareTask.getListener() );
-        
+        releaseEnvironment.setSettings( settings );
+        ReleaseResult result = releaseManager.prepareWithResult( descriptor, releaseEnvironment, new ArrayList(), false,
+                                                                 false, prepareTask.getListener() );
 
         //override to show the actual start time
         result.setStartTime( getStartTime() );

Modified: continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/RollbackReleaseTaskExecutor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/RollbackReleaseTaskExecutor.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/RollbackReleaseTaskExecutor.java (original)
+++ continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/RollbackReleaseTaskExecutor.java Mon Aug 13 04:29:09 2012
@@ -19,14 +19,14 @@ package org.apache.maven.continuum.relea
  * under the License.
  */
 
-import java.util.ArrayList;
-
 import org.apache.maven.continuum.release.tasks.ReleaseProjectTask;
 import org.apache.maven.shared.release.ReleaseExecutionException;
 import org.apache.maven.shared.release.ReleaseFailureException;
 import org.apache.maven.shared.release.ReleaseManagerListener;
 import org.codehaus.plexus.taskqueue.execution.TaskExecutionException;
 
+import java.util.ArrayList;
+
 /**
  * @author Edwin Punzalan
  * @version $Id$



Mime
View raw message