You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2011/05/30 12:20:19 UTC
svn commit: r1129114 - in /archiva/trunk/archiva-modules:
archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/
archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/co...
Author: olamy
Date: Mon May 30 10:20:18 2011
New Revision: 1129114
URL: http://svn.apache.org/viewvc?rev=1129114&view=rev
Log:
[MRM-1473] remove use of plexus-spring
start working on archiva-core-consumers
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ArchivaConfiguration.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRemoveConsumer.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRenameConsumer.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurge.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/resources/META-INF/spring-context.xml
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/AbstractArtifactConsumerTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/ArtifactMissingChecksumsConsumerTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/MetadataUpdateConsumerTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/DaysOldRepositoryPurgeTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/RetentionCountRepositoryPurgeTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/CacheFailuresTransferTest.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletTest.xml
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ArchivaConfiguration.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ArchivaConfiguration.java?rev=1129114&r1=1129113&r2=1129114&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ArchivaConfiguration.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ArchivaConfiguration.java Mon May 30 10:20:18 2011
@@ -27,8 +27,6 @@ import org.codehaus.plexus.registry.Regi
*/
public interface ArchivaConfiguration
{
- String ROLE = ArchivaConfiguration.class.getName();
-
/**
* Get the configuration.
*
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java?rev=1129114&r1=1129113&r2=1129114&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java Mon May 30 10:20:18 2011
@@ -28,11 +28,10 @@ import org.apache.maven.archiva.configur
import org.apache.maven.archiva.consumers.AbstractMonitoredConsumer;
import org.apache.maven.archiva.consumers.ConsumerException;
import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
import org.codehaus.plexus.registry.Registry;
import org.codehaus.plexus.registry.RegistryListener;
+import javax.annotation.PostConstruct;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
@@ -46,7 +45,7 @@ import java.util.List;
*/
public class ArtifactMissingChecksumsConsumer
extends AbstractMonitoredConsumer
- implements KnownRepositoryContentConsumer, RegistryListener, Initializable
+ implements KnownRepositoryContentConsumer, RegistryListener
{
private String id;
@@ -76,6 +75,10 @@ public class ArtifactMissingChecksumsCon
this.description = description;
this.configuration = configuration;
this.filetypes = filetypes;
+
+ configuration.addChangeListener( this );
+
+ initIncludes();
}
public String getId()
@@ -202,7 +205,6 @@ public class ArtifactMissingChecksumsCon
}
public void initialize()
- throws InitializationException
{
configuration.addChangeListener( this );
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRemoveConsumer.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRemoveConsumer.java?rev=1129114&r1=1129113&r2=1129114&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRemoveConsumer.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRemoveConsumer.java Mon May 30 10:20:18 2011
@@ -28,11 +28,13 @@ import org.apache.maven.archiva.configur
import org.apache.maven.archiva.consumers.AbstractMonitoredConsumer;
import org.apache.maven.archiva.consumers.ConsumerException;
import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
import org.codehaus.plexus.registry.Registry;
import org.codehaus.plexus.registry.RegistryListener;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Service;
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
import java.io.File;
import java.util.ArrayList;
import java.util.Date;
@@ -42,32 +44,36 @@ import java.util.List;
* AutoRemoveConsumer
*
* @version $Id$
- * @plexus.component role="org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer"
+ * plexus.component role="org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer"
* role-hint="auto-remove"
* instantiation-strategy="per-lookup"
*/
+@Service("knownRepositoryContentConsumer#auto-remove")
+@Scope("prototype")
public class AutoRemoveConsumer
extends AbstractMonitoredConsumer
- implements KnownRepositoryContentConsumer, RegistryListener, Initializable
+ implements KnownRepositoryContentConsumer, RegistryListener
{
/**
- * @plexus.configuration default-value="auto-remove"
+ * plexus.configuration default-value="auto-remove"
*/
- private String id;
+ private String id = "auto-remove";
/**
- * @plexus.configuration default-value="Automatically Remove File from Filesystem."
+ * plexus.configuration default-value="Automatically Remove File from Filesystem."
*/
- private String description;
+ private String description = "Automatically Remove File from Filesystem.";
/**
- * @plexus.requirement
+ * plexus.requirement
*/
+ @Inject
private ArchivaConfiguration configuration;
/**
- * @plexus.requirement
+ * plexus.requirement
*/
+ @Inject
private FileTypes filetypes;
private File repositoryDir;
@@ -158,9 +164,9 @@ public class AutoRemoveConsumer
includes.addAll( filetypes.getFileTypePatterns( FileTypes.AUTO_REMOVE ) );
}
+ @PostConstruct
public void initialize()
- throws InitializationException
- {
+ {
configuration.addChangeListener( this );
initIncludes();
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRenameConsumer.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRenameConsumer.java?rev=1129114&r1=1129113&r2=1129114&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRenameConsumer.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRenameConsumer.java Mon May 30 10:20:18 2011
@@ -24,6 +24,8 @@ import org.apache.maven.archiva.configur
import org.apache.maven.archiva.consumers.AbstractMonitoredConsumer;
import org.apache.maven.archiva.consumers.ConsumerException;
import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Service;
import java.io.File;
import java.io.IOException;
@@ -38,23 +40,25 @@ import java.util.Map;
* AutoRenameConsumer
*
* @version $Id$
- * @plexus.component role="org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer"
+ * plexus.component role="org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer"
* role-hint="auto-rename"
* instantiation-strategy="per-lookup"
*/
+@Service("knownRepositoryContentConsumer#auto-rename")
+@Scope("prototype")
public class AutoRenameConsumer
extends AbstractMonitoredConsumer
implements KnownRepositoryContentConsumer
{
/**
- * @plexus.configuration default-value="auto-rename"
+ * plexus.configuration default-value="auto-rename"
*/
- private String id;
+ private String id = "auto-rename";
/**
- * @plexus.configuration default-value="Automatically rename common artifact mistakes."
+ * plexus.configuration default-value="Automatically rename common artifact mistakes."
*/
- private String description;
+ private String description = "Automatically rename common artifact mistakes.";
private static final String RENAME_FAILURE = "rename_failure";
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java?rev=1129114&r1=1129113&r2=1129114&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java Mon May 30 10:20:18 2011
@@ -43,55 +43,64 @@ import org.apache.maven.archiva.reposito
import org.apache.maven.archiva.repository.layout.LayoutException;
import org.apache.maven.archiva.repository.metadata.MetadataTools;
import org.apache.maven.archiva.repository.metadata.RepositoryMetadataException;
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
import org.codehaus.plexus.registry.Registry;
import org.codehaus.plexus.registry.RegistryListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
/**
* MetadataUpdaterConsumer will create and update the metadata present within the repository.
*
* @version $Id$
- * @plexus.component role="org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer"
+ * plexus.component role="org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer"
* role-hint="metadata-updater"
* instantiation-strategy="per-lookup"
*/
+@Service("knownRepositoryContentConsumer#metadata-updater")
+@Scope("prototype")
public class MetadataUpdaterConsumer
extends AbstractMonitoredConsumer
- implements KnownRepositoryContentConsumer, RegistryListener, Initializable
+ implements KnownRepositoryContentConsumer, RegistryListener
{
private Logger log = LoggerFactory.getLogger( MetadataUpdaterConsumer.class );
/**
- * @plexus.configuration default-value="metadata-updater"
+ * plexus.configuration default-value="metadata-updater"
*/
- private String id;
+ private String id = "metadata-updater";
/**
- * @plexus.configuration default-value="Update / Create maven-metadata.xml files"
+ * plexus.configuration default-value="Update / Create maven-metadata.xml files"
*/
- private String description;
+ private String description = "Update / Create maven-metadata.xml files";
/**
- * @plexus.requirement
+ * plexus.requirement
*/
+ @Inject
private RepositoryContentFactory repositoryFactory;
/**
- * @plexus.requirement
+ * plexus.requirement
*/
+ @Inject
private MetadataTools metadataTools;
/**
- * @plexus.requirement
+ * plexus.requirement
*/
+ @Inject
private ArchivaConfiguration configuration;
/**
- * @plexus.requirement
+ * plexus.requirement
*/
+ @Inject
private FileTypes filetypes;
private static final String TYPE_METADATA_BAD_INTERNAL_REF = "metadata-bad-internal-ref";
@@ -309,8 +318,8 @@ public class MetadataUpdaterConsumer
includes.addAll( filetypes.getFileTypePatterns( FileTypes.ARTIFACTS ) );
}
+ @PostConstruct
public void initialize()
- throws InitializationException
{
configuration.addChangeListener( this );
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java?rev=1129114&r1=1129113&r2=1129114&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java Mon May 30 10:20:18 2011
@@ -19,6 +19,8 @@ package org.apache.maven.archiva.consume
* under the License.
*/
+import org.apache.archiva.common.plexusbridge.PlexusSisuBridge;
+import org.apache.archiva.common.plexusbridge.PlexusSisuBridgeException;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.maven.archiva.consumers.AbstractMonitoredConsumer;
import org.apache.maven.archiva.consumers.ConsumerException;
@@ -26,9 +28,11 @@ import org.apache.maven.archiva.consumer
import org.codehaus.plexus.digest.ChecksumFile;
import org.codehaus.plexus.digest.Digester;
import org.codehaus.plexus.digest.DigesterException;
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Service;
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
@@ -41,13 +45,15 @@ import java.util.List;
* ValidateChecksumConsumer - validate the provided checksum against the file it represents.
*
* @version $Id$
- * @plexus.component role="org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer"
- * role-hint="validate-checksum"
- * instantiation-strategy="per-lookup"
+ * plexus.component role="org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer"
+ * role-hint="validate-checksum"
+ * instantiation-strategy="per-lookup"
*/
+@Service( "knownRepositoryContentConsumer#validate-checksum" )
+@Scope( "prototype" )
public class ValidateChecksumConsumer
extends AbstractMonitoredConsumer
- implements KnownRepositoryContentConsumer, Initializable
+ implements KnownRepositoryContentConsumer
{
private static final String NOT_VALID_CHECKSUM = "checksum-not-valid";
@@ -58,25 +64,29 @@ public class ValidateChecksumConsumer
private static final String CHECKSUM_IO_ERROR = "checksum-io-error";
/**
- * @plexus.configuration default-value="validate-checksums"
+ * plexus.configuration default-value="validate-checksums"
*/
- private String id;
+ private String id = "validate-checksums";
/**
- * @plexus.configuration default-value="Validate checksums against file."
+ * plexus.configuration default-value="Validate checksums against file."
*/
- private String description;
+ private String description = "Validate checksums against file.";
/**
- * @plexus.requirement
+ * plexus.requirement
*/
+ @Inject
private ChecksumFile checksum;
/**
- * @plexus.requirement role="org.codehaus.plexus.digest.Digester"
+ * plexus.requirement role="org.codehaus.plexus.digest.Digester"
*/
private List<Digester> digesterList;
+ @Inject
+ private PlexusSisuBridge plexusSisuBridge;
+
private File repositoryDir;
private List<String> includes = new ArrayList<String>();
@@ -160,9 +170,11 @@ public class ValidateChecksumConsumer
processFile( path );
}
+ @PostConstruct
public void initialize()
- throws InitializationException
+ throws PlexusSisuBridgeException
{
+ digesterList = plexusSisuBridge.lookupList( Digester.class );
for ( Iterator<Digester> itDigesters = digesterList.iterator(); itDigesters.hasNext(); )
{
Digester digester = itDigesters.next();
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurge.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurge.java?rev=1129114&r1=1129113&r2=1129114&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurge.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurge.java Mon May 30 10:20:18 2011
@@ -29,7 +29,7 @@ public interface RepositoryPurge
*
* @param path path to the scanned artifact
*/
- public void process( String path )
+ void process( String path )
throws RepositoryPurgeException;
}
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java?rev=1129114&r1=1129113&r2=1129114&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java Mon May 30 10:20:18 2011
@@ -34,11 +34,14 @@ import org.apache.maven.archiva.reposito
import org.apache.maven.archiva.repository.RepositoryException;
import org.apache.maven.archiva.repository.RepositoryNotFoundException;
import org.apache.maven.archiva.repository.metadata.MetadataTools;
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
import org.codehaus.plexus.registry.Registry;
import org.codehaus.plexus.registry.RegistryListener;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Service;
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
@@ -47,43 +50,49 @@ import java.util.List;
/**
* Consumer for removing old snapshots in the repository based on the criteria
* specified by the user.
- *
- * @plexus.component role="org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer"
+ * <p/>
+ * plexus.component role="org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer"
* role-hint="repository-purge"
* instantiation-strategy="per-lookup"
*/
+@Service( "knownRepositoryContentConsumer#repository-purge" )
+@Scope( "prototype" )
public class RepositoryPurgeConsumer
extends AbstractMonitoredConsumer
- implements KnownRepositoryContentConsumer, RegistryListener, Initializable
+ implements KnownRepositoryContentConsumer, RegistryListener
{
/**
- * @plexus.configuration default-value="repository-purge"
+ * plexus.configuration default-value="repository-purge"
*/
- private String id;
+ private String id = "repository-purge";
/**
- * @plexus.configuration default-value="Purge repository of old snapshots"
+ * plexus.configuration default-value="Purge repository of old snapshots"
*/
- private String description;
+ private String description = "Purge repository of old snapshots";
/**
- * @plexus.requirement
+ * plexus.requirement
*/
+ @Inject
private ArchivaConfiguration configuration;
/**
- * @plexus.requirement
+ * plexus.requirement
*/
- private RepositoryContentFactory repositoryFactory;
+ @Inject
+ private RepositoryContentFactory repositoryContentFactory;
/**
- * @plexus.requirement
+ * plexus.requirement
*/
+ @Inject
private MetadataTools metadataTools;
/**
- * @plexus.requirement
+ * plexus.requirement
*/
+ @Inject
private FileTypes filetypes;
private List<String> includes = new ArrayList<String>();
@@ -94,16 +103,20 @@ public class RepositoryPurgeConsumer
private boolean deleteReleasedSnapshots;
+ @Inject
+ private ApplicationContext applicationContext;
+
/**
- * @plexus.requirement role="org.apache.archiva.repository.events.RepositoryListener"
+ * plexus.requirement role="org.apache.archiva.repository.events.RepositoryListener"
*/
private List<RepositoryListener> listeners = Collections.emptyList();
/**
* TODO: this could be multiple implementations and needs to be configured.
*
- * @plexus.requirement
+ * plexus.requirement
*/
+ @Inject
private RepositorySessionFactory repositorySessionFactory;
private RepositorySession repositorySession;
@@ -139,7 +152,7 @@ public class RepositoryPurgeConsumer
ManagedRepositoryContent repositoryContent;
try
{
- repositoryContent = repositoryFactory.getManagedRepositoryContent( repository.getId() );
+ repositoryContent = repositoryContentFactory.getManagedRepositoryContent( repository.getId() );
}
catch ( RepositoryNotFoundException e )
{
@@ -159,12 +172,13 @@ public class RepositoryPurgeConsumer
}
else
{
- repoPurge = new RetentionCountRepositoryPurge( repositoryContent, repository.getRetentionCount(),
- repositorySession, listeners );
+ repoPurge =
+ new RetentionCountRepositoryPurge( repositoryContent, repository.getRetentionCount(), repositorySession,
+ listeners );
}
cleanUp = new CleanupReleasedSnapshotsRepositoryPurge( repositoryContent, metadataTools, configuration,
- repositoryFactory, repositorySession, listeners );
+ repositoryContentFactory, repositorySession, listeners );
deleteReleasedSnapshots = repository.isDeleteReleasedSnapshots();
}
@@ -229,9 +243,11 @@ public class RepositoryPurgeConsumer
includes.addAll( filetypes.getFileTypePatterns( FileTypes.ARTIFACTS ) );
}
+ @PostConstruct
public void initialize()
- throws InitializationException
{
+ this.listeners =
+ new ArrayList<RepositoryListener>( applicationContext.getBeansOfType( RepositoryListener.class ).values() );
configuration.addChangeListener( this );
initIncludes();
@@ -242,4 +258,94 @@ public class RepositoryPurgeConsumer
// we need to check all files for deletion, especially if not modified
return true;
}
+
+ public ArchivaConfiguration getConfiguration()
+ {
+ return configuration;
+ }
+
+ public void setConfiguration( ArchivaConfiguration configuration )
+ {
+ this.configuration = configuration;
+ }
+
+ public RepositoryContentFactory getRepositoryContentFactory()
+ {
+ return repositoryContentFactory;
+ }
+
+ public void setRepositoryContentFactory( RepositoryContentFactory repositoryContentFactory )
+ {
+ this.repositoryContentFactory = repositoryContentFactory;
+ }
+
+ public MetadataTools getMetadataTools()
+ {
+ return metadataTools;
+ }
+
+ public void setMetadataTools( MetadataTools metadataTools )
+ {
+ this.metadataTools = metadataTools;
+ }
+
+ public FileTypes getFiletypes()
+ {
+ return filetypes;
+ }
+
+ public void setFiletypes( FileTypes filetypes )
+ {
+ this.filetypes = filetypes;
+ }
+
+ public RepositoryPurge getRepoPurge()
+ {
+ return repoPurge;
+ }
+
+ public void setRepoPurge( RepositoryPurge repoPurge )
+ {
+ this.repoPurge = repoPurge;
+ }
+
+ public RepositoryPurge getCleanUp()
+ {
+ return cleanUp;
+ }
+
+ public void setCleanUp( RepositoryPurge cleanUp )
+ {
+ this.cleanUp = cleanUp;
+ }
+
+ public boolean isDeleteReleasedSnapshots()
+ {
+ return deleteReleasedSnapshots;
+ }
+
+ public void setDeleteReleasedSnapshots( boolean deleteReleasedSnapshots )
+ {
+ this.deleteReleasedSnapshots = deleteReleasedSnapshots;
+ }
+
+ public RepositorySessionFactory getRepositorySessionFactory()
+ {
+ return repositorySessionFactory;
+ }
+
+ public void setRepositorySessionFactory( RepositorySessionFactory repositorySessionFactory )
+ {
+ this.repositorySessionFactory = repositorySessionFactory;
+ }
+
+ public RepositorySession getRepositorySession()
+ {
+ return repositorySession;
+ }
+
+ public void setRepositorySession( RepositorySession repositorySession )
+ {
+ this.repositorySession = repositorySession;
+ }
}
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/resources/META-INF/spring-context.xml?rev=1129114&r1=1129113&r2=1129114&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/resources/META-INF/spring-context.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/resources/META-INF/spring-context.xml Mon May 30 10:20:18 2011
@@ -27,6 +27,9 @@
http://www.springframework.org/schema/context/spring-context-3.0.xsd"
default-lazy-init="true">
+ <context:annotation-config/>
+ <context:component-scan base-package="org.apache.maven.archiva.consumers.core"/>
+
<bean id="artifactMissingChecksumsConsumer" class="org.apache.maven.archiva.consumers.core.ArtifactMissingChecksumsConsumer" scope="prototype">
<constructor-arg>
<value>create-missing-checksums</value>
@@ -41,4 +44,5 @@
<ref bean="fileTypes"/>
</constructor-arg>
</bean>
+ <alias name="artifactMissingChecksumsConsumer" alias="knownRepositoryContentConsumer#artifact-missing-checksums-consumer"/>
</beans>
\ No newline at end of file
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java?rev=1129114&r1=1129113&r2=1129114&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java Mon May 30 10:20:18 2011
@@ -1,24 +1,26 @@
package org.apache.archiva.metadata.repository;
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
+import org.springframework.stereotype.Service;
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied. See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+@Service("repositorySessionFactory#test")
public class TestRepositorySessionFactory
implements RepositorySessionFactory
{
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/AbstractArtifactConsumerTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/AbstractArtifactConsumerTest.java?rev=1129114&r1=1129113&r2=1129114&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/AbstractArtifactConsumerTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/AbstractArtifactConsumerTest.java Mon May 30 10:20:18 2011
@@ -19,37 +19,53 @@ package org.apache.maven.archiva.consume
* under the License.
*/
-import java.io.File;
-
+import junit.framework.TestCase;
import org.apache.maven.archiva.common.utils.BaseFile;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.FileType;
import org.apache.maven.archiva.configuration.FileTypes;
import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
import org.apache.maven.archiva.consumers.functors.ConsumerWantsFilePredicate;
-import org.codehaus.plexus.spring.PlexusInSpringTestCase;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.context.ApplicationContext;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import javax.inject.Inject;
+import java.io.File;
+@RunWith( SpringJUnit4ClassRunner.class )
+@ContextConfiguration( locations = {"classpath*:/META-INF/spring-context.xml","classpath:/spring-context.xml"} )
public abstract class AbstractArtifactConsumerTest
- extends PlexusInSpringTestCase
+ extends TestCase
{
private File repoLocation;
protected KnownRepositoryContentConsumer consumer;
- protected void setUp()
+ @Inject
+ protected ApplicationContext applicationContext;
+
+ @Inject
+ ArchivaConfiguration archivaConfiguration;
+
+ @Before
+ public void setUp()
throws Exception
{
super.setUp();
- ArchivaConfiguration archivaConfiguration = (ArchivaConfiguration) lookup( ArchivaConfiguration.ROLE );
FileType fileType =
(FileType) archivaConfiguration.getConfiguration().getRepositoryScanning().getFileTypes().get( 0 );
assertEquals( FileTypes.ARTIFACTS, fileType.getId() );
fileType.addPattern( "**/*.xml" );
- repoLocation = getTestFile( "target/test-" + getName() + "/test-repo" );
+ repoLocation = new File( "target/test-" + getName() + "/test-repo" );
}
+ @Test
public void testConsumption()
{
File localFile =
@@ -62,6 +78,7 @@ public abstract class AbstractArtifactCo
assertFalse( predicate.evaluate( consumer ) );
}
+ @Test
public void testConsumptionOfOtherMetadata()
{
File localFile =
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/ArtifactMissingChecksumsConsumerTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/ArtifactMissingChecksumsConsumerTest.java?rev=1129114&r1=1129113&r2=1129114&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/ArtifactMissingChecksumsConsumerTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/ArtifactMissingChecksumsConsumerTest.java Mon May 30 10:20:18 2011
@@ -4,6 +4,9 @@ import org.apache.archiva.checksum.Check
import org.apache.archiva.checksum.ChecksummedFile;
import org.apache.commons.io.FileUtils;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
+import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
+import org.junit.Before;
+import org.junit.Test;
import java.io.File;
import java.util.Calendar;
@@ -32,21 +35,23 @@ public class ArtifactMissingChecksumsCon
{
private ManagedRepositoryConfiguration repoConfig;
- @Override
- protected void setUp()
+ @Before
+ public void setUp()
throws Exception
{
- super.setUp();
+ //super.setUp();
repoConfig = new ManagedRepositoryConfiguration();
repoConfig.setId( "test-repo" );
repoConfig.setName( "Test Repository" );
repoConfig.setLayout( "default" );
- repoConfig.setLocation( new File( getBasedir(), "target/test-classes/test-repo/" ).getPath() );
+ repoConfig.setLocation( new File( "target/test-classes/test-repo/" ).getPath() );
- consumer = (ArtifactMissingChecksumsConsumer) lookup( "artifactMissingChecksumsConsumer" );
+ consumer = applicationContext.getBean( "knownRepositoryContentConsumer#artifact-missing-checksums-consumer",
+ KnownRepositoryContentConsumer.class );
}
+ @Test
public void testNoExistingChecksums()
throws Exception
{
@@ -69,10 +74,11 @@ public class ArtifactMissingChecksumsCon
assertTrue( md5File.exists() );
}
+ @Test
public void testExistingIncorrectChecksums()
throws Exception
{
- File newLocation = getTestFile( "target/test-repo" );
+ File newLocation = new File( "target/test-repo" );
FileUtils.deleteDirectory( newLocation );
FileUtils.copyDirectory( new File( repoConfig.getLocation() ), newLocation );
repoConfig.setLocation( newLocation.getAbsolutePath() );
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/MetadataUpdateConsumerTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/MetadataUpdateConsumerTest.java?rev=1129114&r1=1129113&r2=1129114&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/MetadataUpdateConsumerTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/MetadataUpdateConsumerTest.java Mon May 30 10:20:18 2011
@@ -20,16 +20,16 @@ package org.apache.maven.archiva.consume
*/
import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
+import org.junit.Before;
public class MetadataUpdateConsumerTest
extends AbstractArtifactConsumerTest
{
- protected void setUp()
+ @Before
+ public void setUp()
throws Exception
{
- super.setUp();
-
- consumer = (KnownRepositoryContentConsumer) lookup( KnownRepositoryContentConsumer.class.getName(),
- "metadata-updater" );
+ consumer = applicationContext.getBean( "knownRepositoryContentConsumer#metadata-updater",
+ KnownRepositoryContentConsumer.class );
}
}
\ No newline at end of file
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java?rev=1129114&r1=1129113&r2=1129114&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java Mon May 30 10:20:18 2011
@@ -19,15 +19,23 @@ package org.apache.maven.archiva.consume
* under the License.
*/
+import junit.framework.TestCase;
import org.apache.archiva.metadata.repository.MetadataRepository;
import org.apache.archiva.metadata.repository.RepositorySession;
import org.apache.archiva.repository.events.RepositoryListener;
import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.maven.archiva.repository.ManagedRepositoryContent;
-import org.codehaus.plexus.spring.PlexusInSpringTestCase;
import org.easymock.MockControl;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.runner.RunWith;
+import org.springframework.context.ApplicationContext;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import javax.inject.Inject;
import java.io.File;
import java.io.IOException;
@@ -36,8 +44,10 @@ import static org.mockito.Mockito.when;
/**
*/
+@RunWith( SpringJUnit4ClassRunner.class )
+@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
public abstract class AbstractRepositoryPurgeTest
- extends PlexusInSpringTestCase
+ extends TestCase
{
public static final String TEST_REPO_ID = "test-repo";
@@ -80,8 +90,11 @@ public abstract class AbstractRepository
protected MetadataRepository metadataRepository;
- @Override
- protected void setUp()
+ @Inject
+ protected ApplicationContext applicationContext;
+
+ @Before
+ public void setUp()
throws Exception
{
super.setUp();
@@ -95,8 +108,8 @@ public abstract class AbstractRepository
when( repositorySession.getRepository() ).thenReturn( metadataRepository );
}
- @Override
- protected void tearDown()
+ @After
+ public void tearDown()
throws Exception
{
super.tearDown();
@@ -110,7 +123,7 @@ public abstract class AbstractRepository
config.setId( repoId );
config.setName( repoName );
config.setDaysOlder( TEST_DAYS_OLDER );
- config.setLocation( getTestFile( "target/test-" + getName() + "/" + repoId ).getAbsolutePath() );
+ config.setLocation( new File( "target/test-" + getName() + "/" + repoId ).getAbsolutePath() );
config.setReleases( true );
config.setSnapshots( true );
config.setDeleteReleasedSnapshots( true );
@@ -124,7 +137,7 @@ public abstract class AbstractRepository
{
if ( repo == null )
{
- repo = (ManagedRepositoryContent) lookup( ManagedRepositoryContent.class, "default" );
+ repo = applicationContext.getBean( "managedRepositoryContent#default", ManagedRepositoryContent.class );
repo.setRepository( getRepoConfiguration( TEST_REPO_ID, TEST_REPO_NAME ) );
}
@@ -143,7 +156,7 @@ public abstract class AbstractRepository
protected File getTestRepoRoot()
{
- return getTestFile( "target/test-" + getName() + "/" + TEST_REPO_ID );
+ return new File( "target/test-" + getName() + "/" + TEST_REPO_ID );
}
protected String prepareTestRepos()
@@ -151,12 +164,18 @@ public abstract class AbstractRepository
{
File testDir = getTestRepoRoot();
FileUtils.deleteDirectory( testDir );
- FileUtils.copyDirectory( getTestFile( "target/test-classes/" + TEST_REPO_ID ), testDir );
+ FileUtils.copyDirectory( new File( "target/test-classes/" + TEST_REPO_ID ), testDir );
- File releasesTestDir = getTestFile( "target/test-" + getName() + "/" + RELEASES_TEST_REPO_ID );
+ File releasesTestDir = new File( "target/test-" + getName() + "/" + RELEASES_TEST_REPO_ID );
FileUtils.deleteDirectory( releasesTestDir );
- FileUtils.copyDirectory( getTestFile( "target/test-classes/" + RELEASES_TEST_REPO_ID ), releasesTestDir );
+ FileUtils.copyDirectory( new File( "target/test-classes/" + RELEASES_TEST_REPO_ID ), releasesTestDir );
return testDir.getAbsolutePath();
}
+
+ @Override
+ public String getName()
+ {
+ return StringUtils.substringAfterLast( getClass().getName(), "." );
+ }
}
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java?rev=1129114&r1=1129113&r2=1129114&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java Mon May 30 10:20:18 2011
@@ -27,7 +27,11 @@ import org.apache.maven.archiva.reposito
import org.apache.maven.archiva.repository.metadata.MetadataTools;
import org.custommonkey.xmlunit.XMLAssert;
import org.easymock.MockControl;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.test.context.ContextConfiguration;
+import javax.inject.Inject;
import java.io.File;
import java.util.Collections;
import java.util.List;
@@ -35,6 +39,8 @@ import java.util.List;
/**
*/
+@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml",
+ "classpath:/spring-context-cleanup-released-snapshots.xml" } )
public class CleanupReleasedSnapshotsRepositoryPurgeTest
extends AbstractRepositoryPurgeTest
{
@@ -51,27 +57,31 @@ public class CleanupReleasedSnapshotsRep
public static final String PATH_TO_RELEASED_SNAPSHOT_IN_SAME_REPO =
"org/apache/maven/plugins/maven-plugin-plugin/2.3-SNAPSHOT/maven-plugin-plugin-2.3-SNAPSHOT.jar";
- @Override
- protected void setUp()
+ @Inject
+ MetadataTools metadataTools;
+
+ @Before
+ public void setUp()
throws Exception
{
super.setUp();
- MetadataTools metadataTools = (MetadataTools) lookup( MetadataTools.class );
- RepositoryContentFactory factory = (RepositoryContentFactory) lookup( RepositoryContentFactory.class,
- "cleanup-released-snapshots" );
+ RepositoryContentFactory factory =
+ applicationContext.getBean( "repositoryContentFactory#cleanup-released-snapshots", RepositoryContentFactory.class );
- archivaConfiguration = (ArchivaConfiguration) lookup( ArchivaConfiguration.class,
- "cleanup-released-snapshots" );
+ archivaConfiguration =
+ applicationContext.getBean( "archivaConfiguration#cleanup-released-snapshots", ArchivaConfiguration.class );
listenerControl = MockControl.createControl( RepositoryListener.class );
listener = (RepositoryListener) listenerControl.getMock();
List<RepositoryListener> listeners = Collections.singletonList( listener );
- repoPurge = new CleanupReleasedSnapshotsRepositoryPurge( getRepository(), metadataTools, archivaConfiguration,
- factory, repositorySession, listeners );
+ repoPurge =
+ new CleanupReleasedSnapshotsRepositoryPurge( getRepository(), metadataTools, archivaConfiguration, factory,
+ repositorySession, listeners );
}
+ @Test
public void testReleasedSnapshotsExistsInSameRepo()
throws Exception
{
@@ -128,6 +138,7 @@ public class CleanupReleasedSnapshotsRep
XMLAssert.assertXpathEvaluatesTo( "20070315032817", "//metadata/versioning/lastUpdated", metadataXml );
}
+ @Test
public void testNonArtifactFile()
throws Exception
{
@@ -151,6 +162,7 @@ public class CleanupReleasedSnapshotsRep
assertTrue( file.exists() );
}
+ @Test
public void testReleasedSnapshotsExistsInDifferentRepo()
throws Exception
{
@@ -182,9 +194,9 @@ public class CleanupReleasedSnapshotsRep
assertDeleted( projectRoot + "/1.0-SNAPSHOT/released-artifact-in-diff-repo-1.0-SNAPSHOT.pom.md5" );
assertDeleted( projectRoot + "/1.0-SNAPSHOT/released-artifact-in-diff-repo-1.0-SNAPSHOT.pom.sha1" );
- String releasesProjectRoot = getTestFile(
- "target/test-" + getName() + "/releases-test-repo-one" ).getAbsolutePath() +
- "/org/apache/archiva/released-artifact-in-diff-repo";
+ String releasesProjectRoot =
+ new File( "target/test-" + getName() + "/releases-test-repo-one" ).getAbsolutePath()
+ + "/org/apache/archiva/released-artifact-in-diff-repo";
// check if the released version was not removed
assertExists( releasesProjectRoot + "/1.0" );
@@ -196,6 +208,7 @@ public class CleanupReleasedSnapshotsRep
assertExists( releasesProjectRoot + "/1.0/released-artifact-in-diff-repo-1.0.pom.sha1" );
}
+ @Test
public void testHigherSnapshotExistsInSameRepo()
throws Exception
{
@@ -237,8 +250,8 @@ public class CleanupReleasedSnapshotsRep
String metadataXml = FileUtils.readFileToString( artifactMetadataFile, null );
- String expectedVersions = "<expected><versions><version>2.0.3-SNAPSHOT</version>" +
- "<version>2.0.4-SNAPSHOT</version></versions></expected>";
+ String expectedVersions = "<expected><versions><version>2.0.3-SNAPSHOT</version>"
+ + "<version>2.0.4-SNAPSHOT</version></versions></expected>";
XMLAssert.assertXpathEvaluatesTo( "2.0.4-SNAPSHOT", "//metadata/versioning/latest", metadataXml );
XMLAssert.assertXpathsEqual( "//expected/versions/version", expectedVersions,
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/DaysOldRepositoryPurgeTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/DaysOldRepositoryPurgeTest.java?rev=1129114&r1=1129113&r2=1129114&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/DaysOldRepositoryPurgeTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/DaysOldRepositoryPurgeTest.java Mon May 30 10:20:18 2011
@@ -22,6 +22,8 @@ package org.apache.maven.archiva.consume
import org.apache.archiva.repository.events.RepositoryListener;
import org.apache.commons.lang.time.DateUtils;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
+import org.junit.After;
+import org.junit.Test;
import java.io.File;
import java.text.SimpleDateFormat;
@@ -46,6 +48,7 @@ public class DaysOldRepositoryPurgeTest
}
}
+ @Test
public void testByLastModified()
throws Exception
{
@@ -107,6 +110,7 @@ public class DaysOldRepositoryPurgeTest
assertDeleted( projectRoot + "/2.2-SNAPSHOT/maven-install-plugin-2.2-20061118.060401-2.pom.sha1" );
}
+ @Test
public void testOrderOfDeletion()
throws Exception
{
@@ -157,6 +161,7 @@ public class DaysOldRepositoryPurgeTest
assertExists( projectRoot + "/1.1.2-SNAPSHOT/maven-assembly-plugin-1.1.2-20070615.105019-3.pom.md5" );
}
+ @Test
public void testMetadataDrivenSnapshots()
throws Exception
{
@@ -218,7 +223,8 @@ public class DaysOldRepositoryPurgeTest
}
}
- protected void tearDown()
+ @After
+ public void tearDown()
throws Exception
{
super.tearDown();
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java?rev=1129114&r1=1129113&r2=1129114&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java Mon May 30 10:20:18 2011
@@ -31,20 +31,26 @@ import org.apache.maven.archiva.configur
import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
import org.apache.maven.archiva.consumers.functors.ConsumerWantsFilePredicate;
import org.custommonkey.xmlunit.XMLAssert;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.test.context.ContextConfiguration;
import java.io.File;
/**
*/
+@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context-purge-consumer-test.xml" } )
public class RepositoryPurgeConsumerTest
extends AbstractRepositoryPurgeTest
{
+ @Test
public void testConsumption()
throws Exception
{
assertNotConsumed( "org/apache/maven/plugins/maven-plugin-plugin/2.4.1/maven-metadata.xml" );
}
+ @Test
public void testConsumptionOfOtherMetadata()
throws Exception
{
@@ -54,20 +60,22 @@ public class RepositoryPurgeConsumerTest
private void assertNotConsumed( String path )
throws Exception
{
- ArchivaConfiguration archivaConfiguration = (ArchivaConfiguration) lookup( ArchivaConfiguration.ROLE );
+ ArchivaConfiguration archivaConfiguration = applicationContext.getBean( ArchivaConfiguration.class );
+
FileType fileType =
(FileType) archivaConfiguration.getConfiguration().getRepositoryScanning().getFileTypes().get( 0 );
assertEquals( FileTypes.ARTIFACTS, fileType.getId() );
fileType.addPattern( "**/*.xml" );
// trigger reload
- FileTypes fileTypes = (FileTypes) lookup( FileTypes.class );
+ FileTypes fileTypes = applicationContext.getBean( FileTypes.class );
fileTypes.afterConfigurationChange( null, "repositoryScanning.fileTypes", null );
- KnownRepositoryContentConsumer repoPurgeConsumer = (KnownRepositoryContentConsumer) lookup(
- KnownRepositoryContentConsumer.class, "repository-purge" );
+ KnownRepositoryContentConsumer repoPurgeConsumer =
+ applicationContext.getBean( "knownRepositoryContentConsumer#repository-purge",
+ KnownRepositoryContentConsumer.class );
- File repoLocation = getTestFile( "target/test-" + getName() + "/test-repo" );
+ File repoLocation = new File( "target/test-" + getName() + "/test-repo" );
File localFile = new File( repoLocation, path );
@@ -88,11 +96,13 @@ public class RepositoryPurgeConsumerTest
}
}
+ @Test
public void testConsumerByRetentionCount()
throws Exception
{
- KnownRepositoryContentConsumer repoPurgeConsumer = (KnownRepositoryContentConsumer) lookup(
- KnownRepositoryContentConsumer.class, "repo-purge-consumer-by-retention-count" );
+ KnownRepositoryContentConsumer repoPurgeConsumer =
+ applicationContext.getBean( "knownRepositoryContentConsumer#repo-purge-consumer-by-retention-count",
+ KnownRepositoryContentConsumer.class );
ManagedRepositoryConfiguration repoConfiguration = getRepoConfiguration( TEST_REPO_ID, TEST_REPO_NAME );
repoConfiguration.setDaysOlder( 0 ); // force days older off to allow retention count purge to execute.
@@ -141,18 +151,20 @@ public class RepositoryPurgeConsumerTest
private void addRepoToConfiguration( String configHint, ManagedRepositoryConfiguration repoConfiguration )
throws Exception
{
- ArchivaConfiguration archivaConfiguration = (ArchivaConfiguration) lookup( ArchivaConfiguration.class,
- configHint );
+ ArchivaConfiguration archivaConfiguration =
+ applicationContext.getBean( "archivaConfiguration#" + configHint, ArchivaConfiguration.class );
Configuration configuration = archivaConfiguration.getConfiguration();
configuration.removeManagedRepository( configuration.findManagedRepositoryById( repoConfiguration.getId() ) );
configuration.addManagedRepository( repoConfiguration );
}
+ @Test
public void testConsumerByDaysOld()
throws Exception
{
- KnownRepositoryContentConsumer repoPurgeConsumer = (KnownRepositoryContentConsumer) lookup(
- KnownRepositoryContentConsumer.class, "repo-purge-consumer-by-days-old" );
+ KnownRepositoryContentConsumer repoPurgeConsumer =
+ applicationContext.getBean( "knownRepositoryContentConsumer#repo-purge-consumer-by-days-old",
+ KnownRepositoryContentConsumer.class );
ManagedRepositoryConfiguration repoConfiguration = getRepoConfiguration( TEST_REPO_ID, TEST_REPO_NAME );
repoConfiguration.setDaysOlder( TEST_DAYS_OLDER );
@@ -202,11 +214,13 @@ public class RepositoryPurgeConsumerTest
*
* @throws Exception
*/
+ @Test
public void testReleasedSnapshotsWereNotCleaned()
throws Exception
{
- KnownRepositoryContentConsumer repoPurgeConsumer = (KnownRepositoryContentConsumer) lookup(
- KnownRepositoryContentConsumer.class, "repo-purge-consumer-by-retention-count" );
+ KnownRepositoryContentConsumer repoPurgeConsumer =
+ applicationContext.getBean( "knownRepositoryContentConsumer#repo-purge-consumer-by-retention-count",
+ KnownRepositoryContentConsumer.class );
ManagedRepositoryConfiguration repoConfiguration = getRepoConfiguration( TEST_REPO_ID, TEST_REPO_NAME );
repoConfiguration.setDeleteReleasedSnapshots( false ); // Set to NOT delete released snapshots.
@@ -243,11 +257,13 @@ public class RepositoryPurgeConsumerTest
XMLAssert.assertXpathEvaluatesTo( "20070315032817", "//metadata/versioning/lastUpdated", metadataXml );
}
+ @Test
public void testReleasedSnapshotsWereCleaned()
throws Exception
{
- KnownRepositoryContentConsumer repoPurgeConsumer = (KnownRepositoryContentConsumer) lookup(
- KnownRepositoryContentConsumer.class, "repo-purge-consumer-by-days-old" );
+ KnownRepositoryContentConsumer repoPurgeConsumer =
+ applicationContext.getBean( "knownRepositoryContentConsumer#repo-purge-consumer-by-days-old",
+ KnownRepositoryContentConsumer.class );
ManagedRepositoryConfiguration repoConfiguration = getRepoConfiguration( TEST_REPO_ID, TEST_REPO_NAME );
repoConfiguration.setDeleteReleasedSnapshots( true );
@@ -285,13 +301,13 @@ public class RepositoryPurgeConsumerTest
XMLAssert.assertXpathEvaluatesTo( "20070315032817", "//metadata/versioning/lastUpdated", metadataXml );
}
- @Override
- protected void setUp()
+ @Before
+ public void setUp()
throws Exception
{
super.setUp();
- TestRepositorySessionFactory factory = (TestRepositorySessionFactory) lookup( RepositorySessionFactory.class );
+ TestRepositorySessionFactory factory = applicationContext.getBean( TestRepositorySessionFactory.class );
factory.setRepository( metadataRepository );
}
}
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/RetentionCountRepositoryPurgeTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/RetentionCountRepositoryPurgeTest.java?rev=1129114&r1=1129113&r2=1129114&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/RetentionCountRepositoryPurgeTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/RetentionCountRepositoryPurgeTest.java Mon May 30 10:20:18 2011
@@ -21,6 +21,8 @@ package org.apache.maven.archiva.consume
import org.apache.archiva.repository.events.RepositoryListener;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
+import org.junit.Before;
+import org.junit.Test;
import java.util.Collections;
import java.util.List;
@@ -31,7 +33,8 @@ import java.util.List;
public class RetentionCountRepositoryPurgeTest
extends AbstractRepositoryPurgeTest
{
- protected void setUp()
+ @Before
+ public void setUp()
throws Exception
{
super.setUp();
@@ -45,6 +48,7 @@ public class RetentionCountRepositoryPur
/**
* Test if the artifact to be processed was a jar.
*/
+ @Test
public void testIfAJarWasFound()
throws Exception
{
@@ -101,6 +105,7 @@ public class RetentionCountRepositoryPur
/**
* Test if the artifact to be processed is a pom
*/
+ @Test
public void testIfAPomWasFound()
throws Exception
{
@@ -149,6 +154,7 @@ public class RetentionCountRepositoryPur
assertExists( versionRoot + "/castor-anttasks-1.1.2-20070506.163513-2-sources.jar.sha1" );
}
+ @Test
public void testOrderOfDeletion()
throws Exception
{
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/CacheFailuresTransferTest.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/CacheFailuresTransferTest.xml?rev=1129114&r1=1129113&r2=1129114&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/CacheFailuresTransferTest.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/CacheFailuresTransferTest.xml Mon May 30 10:20:18 2011
@@ -59,7 +59,7 @@
<requirement>
<role>org.apache.maven.archiva.repository.RepositoryContentFactory</role>
<role-hint>mocked</role-hint>
- <field-name>repositoryFactory</field-name>
+ <field-name>repositoryContentFactory</field-name>
</requirement>
<requirement>
<role>org.apache.maven.archiva.repository.metadata.MetadataTools</role>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.xml?rev=1129114&r1=1129113&r2=1129114&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.xml Mon May 30 10:20:18 2011
@@ -103,7 +103,7 @@
</requirement>
<requirement>
<role>org.apache.maven.archiva.repository.RepositoryContentFactory</role>
- <field-name>repositoryFactory</field-name>
+ <field-name>repositoryContentFactory</field-name>
</requirement>
<requirement>
<role>org.apache.maven.archiva.repository.content.RepositoryRequest</role>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletTest.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletTest.xml?rev=1129114&r1=1129113&r2=1129114&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletTest.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletTest.xml Mon May 30 10:20:18 2011
@@ -115,7 +115,7 @@
</requirement>
<requirement>
<role>org.apache.maven.archiva.repository.RepositoryContentFactory</role>
- <field-name>repositoryFactory</field-name>
+ <field-name>repositoryContentFactory</field-name>
</requirement>
<requirement>
<role>org.apache.maven.archiva.repository.content.RepositoryRequest</role>