continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From batkin...@apache.org
Subject svn commit: r1672523 - in /continuum/trunk: continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/ continuum-buildagent/continuum-buildagent-core/src/test/java/org/apache/continuum/buildagent/manager/ cont...
Date Fri, 10 Apr 2015 00:02:01 GMT
Author: batkinson
Date: Fri Apr 10 00:02:00 2015
New Revision: 1672523

URL: http://svn.apache.org/r1672523
Log:
Split dir/repo purgers into packages and removed unnecessary inheritance.

Added:
    continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/dir/
    continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/dir/DaysOldDirectoryPurgeExecutor.java
      - copied, changed from r1672522, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/DaysOldDirectoryPurgeExecutor.java
    continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/dir/DirectoryPurgeExecutorFactory.java
      - copied, changed from r1672522, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/DirectoryPurgeExecutorFactory.java
    continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/dir/DirectoryPurgeExecutorFactoryImpl.java
      - copied, changed from r1672522, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/DirectoryPurgeExecutorFactoryImpl.java
    continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/dir/RetentionCountDirectoryPurgeExecutor.java
      - copied, changed from r1672522, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/RetentionCountDirectoryPurgeExecutor.java
    continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/dir/agent/
    continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/dir/agent/DirectoryPurgeExecutorFactoryImpl.java
      - copied, changed from r1672522, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/agent/DirectoryPurgeExecutorFactoryImpl.java
    continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/repo/
    continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/repo/AbstractRepositoryPurgeExecutor.java
      - copied, changed from r1672522, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/AbstractContinuumPurgeExecutor.java
    continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/repo/DaysOldRepositoryPurgeExecutor.java
      - copied, changed from r1672522, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/DaysOldRepositoryPurgeExecutor.java
    continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/repo/ReleasedSnapshotsRepositoryPurgeExecutor.java
      - copied, changed from r1672522, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/ReleasedSnapshotsRepositoryPurgeExecutor.java
    continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/repo/RepositoryPurgeExecutorFactory.java
      - copied, changed from r1672522, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/RepositoryPurgeExecutorFactory.java
    continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/repo/RepositoryPurgeExecutorFactoryImpl.java
      - copied, changed from r1672522, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/RepositoryPurgeExecutorFactoryImpl.java
    continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/repo/RetentionCountRepositoryPurgeExecutor.java
      - copied, changed from r1672522, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/RetentionCountRepositoryPurgeExecutor.java
    continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/repo/ScanningPurgeExecutor.java
      - copied, changed from r1672522, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/ScanningPurgeExecutor.java
Removed:
    continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/AbstractContinuumPurgeExecutor.java
    continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/DaysOldDirectoryPurgeExecutor.java
    continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/DaysOldRepositoryPurgeExecutor.java
    continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/DirectoryPurgeExecutorFactory.java
    continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/DirectoryPurgeExecutorFactoryImpl.java
    continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/ReleasedSnapshotsRepositoryPurgeExecutor.java
    continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/RepositoryPurgeExecutorFactory.java
    continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/RepositoryPurgeExecutorFactoryImpl.java
    continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/RetentionCountDirectoryPurgeExecutor.java
    continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/RetentionCountRepositoryPurgeExecutor.java
    continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/ScanningPurgeExecutor.java
    continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/agent/DirectoryPurgeExecutorFactoryImpl.java
Modified:
    continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/DefaultBuildAgentPurgeManager.java
    continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/test/java/org/apache/continuum/buildagent/manager/BuildAgentPurgeManagerTest.java
    continuum/trunk/continuum-core/src/main/java/org/apache/continuum/purge/controller/DirectoryPurgeController.java
    continuum/trunk/continuum-core/src/main/java/org/apache/continuum/purge/controller/RepositoryPurgeController.java
    continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/CleanAllPurgeExecutor.java

Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/DefaultBuildAgentPurgeManager.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/DefaultBuildAgentPurgeManager.java?rev=1672523&r1=1672522&r2=1672523&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/DefaultBuildAgentPurgeManager.java
(original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/DefaultBuildAgentPurgeManager.java
Fri Apr 10 00:02:00 2015
@@ -24,8 +24,8 @@ import org.apache.continuum.buildagent.c
 import org.apache.continuum.buildagent.model.LocalRepository;
 import org.apache.continuum.purge.executor.ContinuumPurgeExecutor;
 import org.apache.continuum.purge.executor.ContinuumPurgeExecutorException;
-import org.apache.continuum.purge.executor.DirectoryPurgeExecutorFactory;
-import org.apache.continuum.purge.executor.RepositoryPurgeExecutorFactory;
+import org.apache.continuum.purge.executor.dir.DirectoryPurgeExecutorFactory;
+import org.apache.continuum.purge.executor.repo.RepositoryPurgeExecutorFactory;
 import org.apache.continuum.purge.repository.content.RepositoryManagedContent;
 import org.apache.continuum.purge.repository.content.RepositoryManagedContentFactory;
 import org.apache.continuum.utils.m2.LocalRepositoryHelper;

Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/test/java/org/apache/continuum/buildagent/manager/BuildAgentPurgeManagerTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/test/java/org/apache/continuum/buildagent/manager/BuildAgentPurgeManagerTest.java?rev=1672523&r1=1672522&r2=1672523&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/test/java/org/apache/continuum/buildagent/manager/BuildAgentPurgeManagerTest.java
(original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/test/java/org/apache/continuum/buildagent/manager/BuildAgentPurgeManagerTest.java
Fri Apr 10 00:02:00 2015
@@ -21,7 +21,7 @@ package org.apache.continuum.buildagent.
 
 import org.apache.commons.io.FileUtils;
 import org.apache.continuum.buildagent.configuration.BuildAgentConfigurationService;
-import org.apache.continuum.purge.executor.agent.DirectoryPurgeExecutorFactoryImpl;
+import org.apache.continuum.purge.executor.dir.agent.DirectoryPurgeExecutorFactoryImpl;
 import org.codehaus.plexus.spring.PlexusInSpringTestCase;
 
 import java.io.File;

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/continuum/purge/controller/DirectoryPurgeController.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/continuum/purge/controller/DirectoryPurgeController.java?rev=1672523&r1=1672522&r2=1672523&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/continuum/purge/controller/DirectoryPurgeController.java
(original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/continuum/purge/controller/DirectoryPurgeController.java
Fri Apr 10 00:02:00 2015
@@ -23,7 +23,7 @@ import org.apache.continuum.model.reposi
 import org.apache.continuum.model.repository.DirectoryPurgeConfiguration;
 import org.apache.continuum.purge.executor.ContinuumPurgeExecutor;
 import org.apache.continuum.purge.executor.ContinuumPurgeExecutorException;
-import org.apache.continuum.purge.executor.DirectoryPurgeExecutorFactory;
+import org.apache.continuum.purge.executor.dir.DirectoryPurgeExecutorFactory;
 import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.component.annotations.Requirement;
 import org.slf4j.Logger;

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/continuum/purge/controller/RepositoryPurgeController.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/continuum/purge/controller/RepositoryPurgeController.java?rev=1672523&r1=1672522&r2=1672523&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/continuum/purge/controller/RepositoryPurgeController.java
(original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/continuum/purge/controller/RepositoryPurgeController.java
Fri Apr 10 00:02:00 2015
@@ -25,7 +25,7 @@ import org.apache.continuum.purge.PurgeC
 import org.apache.continuum.purge.PurgeConfigurationServiceException;
 import org.apache.continuum.purge.executor.ContinuumPurgeExecutor;
 import org.apache.continuum.purge.executor.ContinuumPurgeExecutorException;
-import org.apache.continuum.purge.executor.RepositoryPurgeExecutorFactory;
+import org.apache.continuum.purge.executor.repo.RepositoryPurgeExecutorFactory;
 import org.apache.continuum.purge.repository.content.RepositoryManagedContent;
 import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.component.annotations.Requirement;

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=1672523&r1=1672522&r2=1672523&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
Fri Apr 10 00:02:00 2015
@@ -35,7 +35,7 @@ import java.io.IOException;
  * @author Maria Catherine Tan
  */
 public class CleanAllPurgeExecutor
-    extends AbstractContinuumPurgeExecutor
+    implements ContinuumPurgeExecutor
 {
     private Logger log = LoggerFactory.getLogger( CleanAllPurgeExecutor.class );
 

Copied: continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/dir/DaysOldDirectoryPurgeExecutor.java
(from r1672522, 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/dir/DaysOldDirectoryPurgeExecutor.java?p2=continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/dir/DaysOldDirectoryPurgeExecutor.java&p1=continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/DaysOldDirectoryPurgeExecutor.java&r1=1672522&r2=1672523&rev=1672523&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/dir/DaysOldDirectoryPurgeExecutor.java
Fri Apr 10 00:02:00 2015
@@ -1,4 +1,4 @@
-package org.apache.continuum.purge.executor;
+package org.apache.continuum.purge.executor.dir;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,6 +24,8 @@ import org.apache.commons.io.comparator.
 import org.apache.commons.io.filefilter.DirectoryFileFilter;
 import org.apache.commons.lang.time.DateUtils;
 import org.apache.continuum.purge.ContinuumPurgeConstants;
+import org.apache.continuum.purge.executor.ContinuumPurgeExecutor;
+import org.apache.continuum.purge.executor.ContinuumPurgeExecutorException;
 import org.apache.maven.archiva.consumers.core.repository.ArtifactFilenameFilter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -39,7 +41,6 @@ import java.util.Calendar;
  * @author Maria Catherine Tan
  */
 public class DaysOldDirectoryPurgeExecutor
-    extends AbstractContinuumPurgeExecutor
     implements ContinuumPurgeExecutor
 {
     private Logger log = LoggerFactory.getLogger( DaysOldDirectoryPurgeExecutor.class );

Copied: continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/dir/DirectoryPurgeExecutorFactory.java
(from r1672522, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/DirectoryPurgeExecutorFactory.java)
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/dir/DirectoryPurgeExecutorFactory.java?p2=continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/dir/DirectoryPurgeExecutorFactory.java&p1=continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/DirectoryPurgeExecutorFactory.java&r1=1672522&r2=1672523&rev=1672523&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/DirectoryPurgeExecutorFactory.java
(original)
+++ continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/dir/DirectoryPurgeExecutorFactory.java
Fri Apr 10 00:02:00 2015
@@ -1,4 +1,4 @@
-package org.apache.continuum.purge.executor;
+package org.apache.continuum.purge.executor.dir;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,6 +19,8 @@ package org.apache.continuum.purge.execu
  * under the License.
  */
 
+import org.apache.continuum.purge.executor.ContinuumPurgeExecutor;
+
 public interface DirectoryPurgeExecutorFactory
 {
     ContinuumPurgeExecutor create( boolean deleteAll, int daysOld, int retentionCount, String
dirType );

Copied: continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/dir/DirectoryPurgeExecutorFactoryImpl.java
(from r1672522, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/DirectoryPurgeExecutorFactoryImpl.java)
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/dir/DirectoryPurgeExecutorFactoryImpl.java?p2=continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/dir/DirectoryPurgeExecutorFactoryImpl.java&p1=continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/DirectoryPurgeExecutorFactoryImpl.java&r1=1672522&r2=1672523&rev=1672523&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/DirectoryPurgeExecutorFactoryImpl.java
(original)
+++ continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/dir/DirectoryPurgeExecutorFactoryImpl.java
Fri Apr 10 00:02:00 2015
@@ -1,4 +1,4 @@
-package org.apache.continuum.purge.executor;
+package org.apache.continuum.purge.executor.dir;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,6 +19,8 @@ package org.apache.continuum.purge.execu
  * under the License.
  */
 
+import org.apache.continuum.purge.executor.CleanAllPurgeExecutor;
+import org.apache.continuum.purge.executor.ContinuumPurgeExecutor;
 import org.codehaus.plexus.component.annotations.Component;
 
 @Component( role = DirectoryPurgeExecutorFactory.class )

Copied: continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/dir/RetentionCountDirectoryPurgeExecutor.java
(from r1672522, 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/dir/RetentionCountDirectoryPurgeExecutor.java?p2=continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/dir/RetentionCountDirectoryPurgeExecutor.java&p1=continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/RetentionCountDirectoryPurgeExecutor.java&r1=1672522&r2=1672523&rev=1672523&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/dir/RetentionCountDirectoryPurgeExecutor.java
Fri Apr 10 00:02:00 2015
@@ -1,4 +1,4 @@
-package org.apache.continuum.purge.executor;
+package org.apache.continuum.purge.executor.dir;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -23,6 +23,8 @@ 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.continuum.purge.executor.ContinuumPurgeExecutor;
+import org.apache.continuum.purge.executor.ContinuumPurgeExecutorException;
 import org.apache.maven.archiva.consumers.core.repository.ArtifactFilenameFilter;
 
 import java.io.File;
@@ -35,7 +37,6 @@ import java.util.Arrays;
  * @author Maria Catherine Tan
  */
 public class RetentionCountDirectoryPurgeExecutor
-    extends AbstractContinuumPurgeExecutor
     implements ContinuumPurgeExecutor
 {
     private final int retentionCount;

Copied: continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/dir/agent/DirectoryPurgeExecutorFactoryImpl.java
(from r1672522, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/agent/DirectoryPurgeExecutorFactoryImpl.java)
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/dir/agent/DirectoryPurgeExecutorFactoryImpl.java?p2=continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/dir/agent/DirectoryPurgeExecutorFactoryImpl.java&p1=continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/agent/DirectoryPurgeExecutorFactoryImpl.java&r1=1672522&r2=1672523&rev=1672523&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/agent/DirectoryPurgeExecutorFactoryImpl.java
(original)
+++ continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/dir/agent/DirectoryPurgeExecutorFactoryImpl.java
Fri Apr 10 00:02:00 2015
@@ -1,4 +1,4 @@
-package org.apache.continuum.purge.executor.agent;
+package org.apache.continuum.purge.executor.dir.agent;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -27,6 +27,7 @@ import org.apache.commons.io.filefilter.
 import org.apache.commons.io.filefilter.WildcardFileFilter;
 import org.apache.continuum.purge.executor.ContinuumPurgeExecutor;
 import org.apache.continuum.purge.executor.ContinuumPurgeExecutorException;
+import org.apache.continuum.purge.executor.dir.DirectoryPurgeExecutorFactory;
 import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.util.FileUtils;
 import org.slf4j.Logger;
@@ -42,9 +43,9 @@ import java.util.Set;
 /**
  * Enables creation of purge executors for distributed agent working directories.
  */
-@Component( role = org.apache.continuum.purge.executor.DirectoryPurgeExecutorFactory.class,
hint = "distributed" )
+@Component( role = DirectoryPurgeExecutorFactory.class, hint = "distributed" )
 public class DirectoryPurgeExecutorFactoryImpl
-    implements org.apache.continuum.purge.executor.DirectoryPurgeExecutorFactory
+    implements DirectoryPurgeExecutorFactory
 {
     public static final String WORKING_TYPE = "working";
 

Copied: continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/repo/AbstractRepositoryPurgeExecutor.java
(from r1672522, 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/repo/AbstractRepositoryPurgeExecutor.java?p2=continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/repo/AbstractRepositoryPurgeExecutor.java&p1=continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/AbstractContinuumPurgeExecutor.java&r1=1672522&r2=1672523&rev=1672523&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/repo/AbstractRepositoryPurgeExecutor.java
Fri Apr 10 00:02:00 2015
@@ -1,4 +1,4 @@
-package org.apache.continuum.purge.executor;
+package org.apache.continuum.purge.executor.repo;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,6 +20,7 @@ package org.apache.continuum.purge.execu
  */
 
 import org.apache.continuum.purge.ContinuumPurgeConstants;
+import org.apache.continuum.purge.executor.ContinuumPurgeExecutor;
 import org.apache.continuum.purge.repository.content.RepositoryManagedContent;
 import org.apache.maven.archiva.consumers.core.repository.ArtifactFilenameFilter;
 import org.apache.maven.archiva.model.ArtifactReference;
@@ -35,10 +36,10 @@ import java.util.Set;
  *
  * @author Maria Catherine Tan
  */
-public abstract class AbstractContinuumPurgeExecutor
+public abstract class AbstractRepositoryPurgeExecutor
     implements ContinuumPurgeExecutor
 {
-    private static final Logger log = LoggerFactory.getLogger( AbstractContinuumPurgeExecutor.class
);
+    private static final Logger log = LoggerFactory.getLogger( AbstractRepositoryPurgeExecutor.class
);
 
     public void purge( Set<ArtifactReference> references, RepositoryManagedContent
repository )
     {

Copied: continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/repo/DaysOldRepositoryPurgeExecutor.java
(from r1672522, 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/repo/DaysOldRepositoryPurgeExecutor.java?p2=continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/repo/DaysOldRepositoryPurgeExecutor.java&p1=continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/DaysOldRepositoryPurgeExecutor.java&r1=1672522&r2=1672523&rev=1672523&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/repo/DaysOldRepositoryPurgeExecutor.java
Fri Apr 10 00:02:00 2015
@@ -1,4 +1,4 @@
-package org.apache.continuum.purge.executor;
+package org.apache.continuum.purge.executor.repo;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,6 +20,8 @@ package org.apache.continuum.purge.execu
  */
 
 import org.apache.commons.lang.time.DateUtils;
+import org.apache.continuum.purge.executor.ContinuumPurgeExecutor;
+import org.apache.continuum.purge.executor.ContinuumPurgeExecutorException;
 import org.apache.continuum.purge.repository.content.RepositoryManagedContent;
 import org.apache.maven.archiva.common.utils.VersionComparator;
 import org.apache.maven.archiva.common.utils.VersionUtil;
@@ -47,7 +49,7 @@ import java.util.regex.Matcher;
  * @author Maria Catherine Tan
  */
 public class DaysOldRepositoryPurgeExecutor
-    extends AbstractContinuumPurgeExecutor
+    extends AbstractRepositoryPurgeExecutor
     implements ContinuumPurgeExecutor
 {
     private static final Logger log = LoggerFactory.getLogger( DaysOldRepositoryPurgeExecutor.class
);

Copied: continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/repo/ReleasedSnapshotsRepositoryPurgeExecutor.java
(from r1672522, 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/repo/ReleasedSnapshotsRepositoryPurgeExecutor.java?p2=continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/repo/ReleasedSnapshotsRepositoryPurgeExecutor.java&p1=continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/ReleasedSnapshotsRepositoryPurgeExecutor.java&r1=1672522&r2=1672523&rev=1672523&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/repo/ReleasedSnapshotsRepositoryPurgeExecutor.java
Fri Apr 10 00:02:00 2015
@@ -1,4 +1,4 @@
-package org.apache.continuum.purge.executor;
+package org.apache.continuum.purge.executor.repo;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,6 +20,7 @@ package org.apache.continuum.purge.execu
  */
 
 import org.apache.continuum.purge.ContinuumPurgeConstants;
+import org.apache.continuum.purge.executor.ContinuumPurgeExecutorException;
 import org.apache.continuum.purge.repository.content.RepositoryManagedContent;
 import org.apache.maven.archiva.common.utils.VersionComparator;
 import org.apache.maven.archiva.common.utils.VersionUtil;
@@ -42,7 +43,7 @@ import java.util.List;
  * @author Maria Catherine Tan
  */
 public class ReleasedSnapshotsRepositoryPurgeExecutor
-    extends AbstractContinuumPurgeExecutor
+    extends AbstractRepositoryPurgeExecutor
 {
     private Logger log = LoggerFactory.getLogger( ReleasedSnapshotsRepositoryPurgeExecutor.class
);
 

Copied: continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/repo/RepositoryPurgeExecutorFactory.java
(from r1672522, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/RepositoryPurgeExecutorFactory.java)
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/repo/RepositoryPurgeExecutorFactory.java?p2=continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/repo/RepositoryPurgeExecutorFactory.java&p1=continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/RepositoryPurgeExecutorFactory.java&r1=1672522&r2=1672523&rev=1672523&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/RepositoryPurgeExecutorFactory.java
(original)
+++ continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/repo/RepositoryPurgeExecutorFactory.java
Fri Apr 10 00:02:00 2015
@@ -1,4 +1,4 @@
-package org.apache.continuum.purge.executor;
+package org.apache.continuum.purge.executor.repo;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,6 +19,7 @@ package org.apache.continuum.purge.execu
  * under the License.
  */
 
+import org.apache.continuum.purge.executor.ContinuumPurgeExecutor;
 import org.apache.continuum.purge.repository.content.RepositoryManagedContent;
 
 public interface RepositoryPurgeExecutorFactory

Copied: continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/repo/RepositoryPurgeExecutorFactoryImpl.java
(from r1672522, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/RepositoryPurgeExecutorFactoryImpl.java)
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/repo/RepositoryPurgeExecutorFactoryImpl.java?p2=continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/repo/RepositoryPurgeExecutorFactoryImpl.java&p1=continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/RepositoryPurgeExecutorFactoryImpl.java&r1=1672522&r2=1672523&rev=1672523&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/RepositoryPurgeExecutorFactoryImpl.java
(original)
+++ continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/repo/RepositoryPurgeExecutorFactoryImpl.java
Fri Apr 10 00:02:00 2015
@@ -1,4 +1,4 @@
-package org.apache.continuum.purge.executor;
+package org.apache.continuum.purge.executor.repo;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,6 +20,9 @@ package org.apache.continuum.purge.execu
  */
 
 import org.apache.continuum.purge.ContinuumPurgeConstants;
+import org.apache.continuum.purge.executor.CleanAllPurgeExecutor;
+import org.apache.continuum.purge.executor.ContinuumPurgeExecutor;
+import org.apache.continuum.purge.executor.MultiplexedPurgeExecutor;
 import org.apache.continuum.purge.repository.content.RepositoryManagedContent;
 import org.apache.continuum.purge.repository.scanner.RepositoryScanner;
 import org.codehaus.plexus.component.annotations.Component;

Copied: continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/repo/RetentionCountRepositoryPurgeExecutor.java
(from r1672522, 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/repo/RetentionCountRepositoryPurgeExecutor.java?p2=continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/repo/RetentionCountRepositoryPurgeExecutor.java&p1=continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/RetentionCountRepositoryPurgeExecutor.java&r1=1672522&r2=1672523&rev=1672523&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/repo/RetentionCountRepositoryPurgeExecutor.java
Fri Apr 10 00:02:00 2015
@@ -1,4 +1,4 @@
-package org.apache.continuum.purge.executor;
+package org.apache.continuum.purge.executor.repo;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,6 +19,8 @@ package org.apache.continuum.purge.execu
  * under the License.
  */
 
+import org.apache.continuum.purge.executor.ContinuumPurgeExecutor;
+import org.apache.continuum.purge.executor.ContinuumPurgeExecutorException;
 import org.apache.continuum.purge.repository.content.RepositoryManagedContent;
 import org.apache.maven.archiva.common.utils.VersionComparator;
 import org.apache.maven.archiva.common.utils.VersionUtil;
@@ -39,7 +41,7 @@ import java.util.Set;
  * @author Maria Catherine Tan
  */
 public class RetentionCountRepositoryPurgeExecutor
-    extends AbstractContinuumPurgeExecutor
+    extends AbstractRepositoryPurgeExecutor
     implements ContinuumPurgeExecutor
 {
     private final int retentionCount;

Copied: continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/repo/ScanningPurgeExecutor.java
(from r1672522, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/ScanningPurgeExecutor.java)
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/repo/ScanningPurgeExecutor.java?p2=continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/repo/ScanningPurgeExecutor.java&p1=continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/ScanningPurgeExecutor.java&r1=1672522&r2=1672523&rev=1672523&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/ScanningPurgeExecutor.java
(original)
+++ continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/repo/ScanningPurgeExecutor.java
Fri Apr 10 00:02:00 2015
@@ -1,4 +1,4 @@
-package org.apache.continuum.purge.executor;
+package org.apache.continuum.purge.executor.repo;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,6 +19,8 @@ package org.apache.continuum.purge.execu
  * under the License.
  */
 
+import org.apache.continuum.purge.executor.ContinuumPurgeExecutor;
+import org.apache.continuum.purge.executor.ContinuumPurgeExecutorException;
 import org.apache.continuum.purge.repository.scanner.RepositoryScanner;
 import org.apache.continuum.purge.repository.scanner.ScannerHandler;
 import org.slf4j.Logger;



Mime
View raw message