Author: oching
Date: Sun Oct 12 23:13:27 2008
New Revision: 703920
URL: http://svn.apache.org/viewvc?rev=703920&view=rev
Log:
- implement deleteArtifact in AdministrationServiceImpl
- updated test cases for artifact delete
Added:
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/default-repo/
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/default-repo/org/
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/default-repo/org/apache/
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/default-repo/org/apache/archiva/
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/default-repo/org/apache/archiva/archiva-test/
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/default-repo/org/apache/archiva/archiva-test/1.0/
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/default-repo/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.jar
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/default-repo/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.jar.md5
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/default-repo/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.jar.sha1
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/default-repo/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.pom
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/default-repo/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.pom.md5
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/default-repo/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.pom.sha1
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/default-repo/org/apache/archiva/archiva-test/1.0/maven-metadata.xml
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/default-repo/org/apache/archiva/archiva-test/1.0/maven-metadata.xml.md5
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/default-repo/org/apache/archiva/archiva-test/1.0/maven-metadata.xml.sha1
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/default-repo/org/apache/archiva/archiva-test/1.1/
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/default-repo/org/apache/archiva/archiva-test/1.1/archiva-test-1.1.jar
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/default-repo/org/apache/archiva/archiva-test/1.1/archiva-test-1.1.pom
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/legacy-repo/
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/legacy-repo/org.apache.archiva/
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/legacy-repo/org.apache.archiva/jars/
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/legacy-repo/org.apache.archiva/jars/archiva-diff-1.0.jar
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/legacy-repo/org.apache.archiva/jars/archiva-test-1.0.jar
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/legacy-repo/org.apache.archiva/jars/archiva-test-1.1.jar
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/legacy-repo/org.apache.archiva/poms/
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/legacy-repo/org.apache.archiva/poms/archiva-diff-1.0.pom
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/legacy-repo/org.apache.archiva/poms/archiva-test-1.0.pom
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/legacy-repo/org.apache.archiva/poms/archiva-test-1.1.pom
Modified:
archiva/branches/MRM-124/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractLegacyRepositoryContent.java
archiva/branches/MRM-124/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ManagedDefaultRepositoryContent.java
archiva/branches/MRM-124/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ManagedLegacyRepositoryContent.java
archiva/branches/MRM-124/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/constraints/ArtifactVersionsConstraint.java
archiva/branches/MRM-124/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/ArtifactVersionsConstraintTest.java
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImplTest.java
Modified:
archiva/branches/MRM-124/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractLegacyRepositoryContent.java
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractLegacyRepositoryContent.java?rev=703920&r1=703919&r2=703920&view=diff
==============================================================================
---
archiva/branches/MRM-124/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractLegacyRepositoryContent.java
(original)
+++
archiva/branches/MRM-124/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractLegacyRepositoryContent.java
Sun Oct 12 23:13:27 2008
@@ -117,4 +117,9 @@
// Default process.
return type + "s";
}
+
+ public void setLegacyPathParser( PathParser parser )
+ {
+ this.legacyPathParser = parser;
+ }
}
Modified:
archiva/branches/MRM-124/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ManagedDefaultRepositoryContent.java
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ManagedDefaultRepositoryContent.java?rev=703920&r1=703919&r2=703920&view=diff
==============================================================================
---
archiva/branches/MRM-124/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ManagedDefaultRepositoryContent.java
(original)
+++
archiva/branches/MRM-124/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ManagedDefaultRepositoryContent.java
Sun Oct 12 23:13:27 2008
@@ -78,6 +78,10 @@
// TODO: log this somewhere?
}
}
+ else
+ {
+ throw new ContentNotFoundException( "Unable to delete non-existing
project directory." );
+ }
}
public String getId()
Modified:
archiva/branches/MRM-124/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ManagedLegacyRepositoryContent.java
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ManagedLegacyRepositoryContent.java?rev=703920&r1=703919&r2=703920&view=diff
==============================================================================
---
archiva/branches/MRM-124/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ManagedLegacyRepositoryContent.java
(original)
+++
archiva/branches/MRM-124/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ManagedLegacyRepositoryContent.java
Sun Oct 12 23:13:27 2008
@@ -454,4 +454,9 @@
}
}
}
+
+ public void setFileTypes( FileTypes fileTypes )
+ {
+ this.filetypes = fileTypes;
+ }
}
Modified:
archiva/branches/MRM-124/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/constraints/ArtifactVersionsConstraint.java
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/constraints/ArtifactVersionsConstraint.java?rev=703920&r1=703919&r2=703920&view=diff
==============================================================================
---
archiva/branches/MRM-124/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/constraints/ArtifactVersionsConstraint.java
(original)
+++
archiva/branches/MRM-124/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/constraints/ArtifactVersionsConstraint.java
Sun Oct 12 23:13:27 2008
@@ -35,18 +35,20 @@
private String sortColumn = "repositoryId";
- public ArtifactVersionsConstraint( String repoId, String groupId, String
artifactId )
+ public ArtifactVersionsConstraint( String repoId, String groupId, String
artifactId, boolean includeWhenGathered )
{
if( repoId != null )
{
- whereClause = "repositoryId.equals(selectedRepoId) &&
groupId.equals(selectedGroupId) && artifactId.equals(selectedArtifactId) " +
- "&& whenGathered != null";
+ whereClause = "repositoryId.equals(selectedRepoId) &&
groupId.equals(selectedGroupId) && artifactId.equals(selectedArtifactId) "
+ + ( includeWhenGathered ? "&& whenGathered != null" : "" );
declParams = new String[] { "String selectedRepoId", "String
selectedGroupId", "String selectedArtifactId" };
params = new Object[] { repoId, groupId, artifactId };
}
else
{
- whereClause = "groupId.equals(selectedGroupId) &&
artifactId.equals(selectedArtifactId) && this.whenGathered != null";
+ whereClause =
+ "groupId.equals(selectedGroupId) &&
artifactId.equals(selectedArtifactId) " +
+ ( includeWhenGathered ? "&& whenGathered != null" : "" );
declParams = new String[] { "String selectedGroupId", "String
selectedArtifactId" };
params = new Object[] { groupId, artifactId };
}
@@ -54,7 +56,7 @@
public ArtifactVersionsConstraint( String repoId, String groupId, String
artifactId, String sortColumn )
{
- this( repoId, groupId, artifactId );
+ this( repoId, groupId, artifactId, true );
this.sortColumn = sortColumn;
}
Modified:
archiva/branches/MRM-124/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/ArtifactVersionsConstraintTest.java
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/ArtifactVersionsConstraintTest.java?rev=703920&r1=703919&r2=703920&view=diff
==============================================================================
---
archiva/branches/MRM-124/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/ArtifactVersionsConstraintTest.java
(original)
+++
archiva/branches/MRM-124/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/ArtifactVersionsConstraintTest.java
Sun Oct 12 23:13:27 2008
@@ -87,14 +87,14 @@
{
populateDb();
assertConstraint( "Artifacts By Repository", 3,
- new ArtifactVersionsConstraint( null,
"org.apache.archiva", "artifact-one" ) );
+ new ArtifactVersionsConstraint( null,
"org.apache.archiva", "artifact-one", true ) );
}
public void testQueryAllVersionsOfArtifactInARepo() throws Exception
{
populateDb();
assertConstraint( "Artifacts By Repository", 2,
- new ArtifactVersionsConstraint( TEST_REPO,
"org.apache.archiva", "artifact-one" ) );
+ new ArtifactVersionsConstraint( TEST_REPO,
"org.apache.archiva", "artifact-one", true ) );
}
private void assertConstraint( String msg, int count,
ArtifactVersionsConstraint constraint )
Modified:
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java?rev=703920&r1=703919&r2=703920&view=diff
==============================================================================
---
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java
(original)
+++
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java
Sun Oct 12 23:13:27 2008
@@ -32,11 +32,22 @@
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.maven.archiva.configuration.RemoteRepositoryConfiguration;
import org.apache.maven.archiva.configuration.RepositoryScanningConfiguration;
+import org.apache.maven.archiva.consumers.ConsumerException;
import org.apache.maven.archiva.consumers.DatabaseCleanupConsumer;
import org.apache.maven.archiva.consumers.DatabaseUnprocessedArtifactConsumer;
import org.apache.maven.archiva.consumers.InvalidRepositoryContentConsumer;
import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
+import org.apache.maven.archiva.database.ArchivaDatabaseException;
+import org.apache.maven.archiva.database.ArtifactDAO;
+import
org.apache.maven.archiva.database.constraints.ArtifactVersionsConstraint;
import org.apache.maven.archiva.database.updater.DatabaseConsumers;
+import org.apache.maven.archiva.model.ArchivaArtifact;
+import org.apache.maven.archiva.model.VersionedReference;
+import org.apache.maven.archiva.repository.ContentNotFoundException;
+import org.apache.maven.archiva.repository.ManagedRepositoryContent;
+import org.apache.maven.archiva.repository.RepositoryContentFactory;
+import org.apache.maven.archiva.repository.RepositoryException;
+import org.apache.maven.archiva.repository.RepositoryNotFoundException;
import org.apache.maven.archiva.repository.scanner.RepositoryContentConsumers;
import org.apache.maven.archiva.scheduled.ArchivaTaskScheduler;
import org.apache.maven.archiva.scheduled.DefaultArchivaTaskScheduler;
@@ -74,6 +85,26 @@
private ArchivaTaskScheduler taskScheduler;
/**
+ * @plexus.requirement
+ */
+ private RepositoryContentFactory repoFactory;
+
+ /**
+ * @plexus.requirement role-hint="jdo"
+ */
+ private ArtifactDAO artifactDAO;
+
+ /**
+ * @plexus.requirement role-hint="not-present-remove-db-artifact"
+ */
+ private DatabaseCleanupConsumer cleanupArtifacts;
+
+ /**
+ * @plexus.requirement role-hint="not-present-remove-db-project"
+ */
+ private DatabaseCleanupConsumer cleanupProjects;
+
+ /**
* @see AdministrationService#configureDatabaseConsumer(String, boolean)
*/
public boolean configureDatabaseConsumer( String consumerId, boolean
enable ) throws Exception
@@ -190,12 +221,76 @@
/**
* @see AdministrationService#deleteArtifact(String, String, String,
String)
*/
- public boolean deleteArtifact( String repoId, String groupId, String
artifactId, String version ) throws Exception
+ public boolean deleteArtifact( String repoId, String groupId, String
artifactId, String version )
+ throws Exception
{
- // TODO implement delete artifact in Archiva
+ Configuration config = archivaConfiguration.getConfiguration();
+ ManagedRepositoryConfiguration repoConfig =
config.findManagedRepositoryById( repoId );
- // TODO Auto-generated method stub
- return false;
+ if( repoConfig == null )
+ {
+ throw new Exception( "Repository does not exist." );
+ }
+
+ try
+ {
+ ManagedRepositoryContent repoContent =
repoFactory.getManagedRepositoryContent( repoId );
+ VersionedReference ref = new VersionedReference();
+ ref.setGroupId( groupId );
+ ref.setArtifactId( artifactId );
+ ref.setVersion( version );
+
+ // delete from file system
+ repoContent.deleteVersion( ref );
+
+ ArtifactVersionsConstraint constraint = new
ArtifactVersionsConstraint( repoId, groupId, artifactId, false );
+ List<ArchivaArtifact> artifacts = null;
+
+ try
+ {
+ artifacts = artifactDAO.queryArtifacts( constraint );
+ if( artifacts == null )
+ {
+ return true;
+ }
+ }
+ catch ( ArchivaDatabaseException e )
+ {
+ throw new Exception( "Error occurred while cleaning up
database." );
+ }
+
+ // cleanup db manually? or use the cleanup consumers as what is
done now?
+ for( ArchivaArtifact artifact : artifacts )
+ {
+ if( artifact.getVersion().equals( version ) )
+ {
+ try
+ {
+ cleanupArtifacts.processArchivaArtifact( artifact );
+ cleanupProjects.processArchivaArtifact( artifact );
+ }
+ catch ( ConsumerException ce )
+ {
+ // log error
+ continue;
+ }
+ }
+ }
+ }
+ catch ( ContentNotFoundException e )
+ {
+ throw new Exception( "Artifact does not exist." );
+ }
+ catch ( RepositoryNotFoundException e )
+ {
+ throw new Exception( "Repository does not exist." );
+ }
+ catch ( RepositoryException e )
+ {
+ throw new Exception( "Repository exception occurred." );
+ }
+
+ return true;
}
/**
@@ -370,5 +465,25 @@
public void setTaskScheduler( ArchivaTaskScheduler taskScheduler )
{
this.taskScheduler = taskScheduler;
+ }
+
+ public void setRepoFactory( RepositoryContentFactory repoFactory )
+ {
+ this.repoFactory = repoFactory;
+ }
+
+ public void setArtifactDAO( ArtifactDAO artifactDAO )
+ {
+ this.artifactDAO = artifactDAO;
+ }
+
+ public void setCleanupArtifacts( DatabaseCleanupConsumer cleanupArtifacts )
+ {
+ this.cleanupArtifacts = cleanupArtifacts;
+ }
+
+ public void setCleanupProjects( DatabaseCleanupConsumer cleanupProjects )
+ {
+ this.cleanupProjects = cleanupProjects;
}
}
Modified:
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImplTest.java
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImplTest.java?rev=703920&r1=703919&r2=703920&view=diff
==============================================================================
---
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImplTest.java
(original)
+++
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImplTest.java
Sun Oct 12 23:13:27 2008
@@ -19,6 +19,7 @@
* under the License.
*/
+import java.io.File;
import java.util.ArrayList;
import java.util.List;
@@ -27,6 +28,7 @@
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.Configuration;
import org.apache.maven.archiva.configuration.DatabaseScanningConfiguration;
+import org.apache.maven.archiva.configuration.FileTypes;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.maven.archiva.configuration.RemoteRepositoryConfiguration;
import org.apache.maven.archiva.configuration.RepositoryScanningConfiguration;
@@ -34,7 +36,16 @@
import org.apache.maven.archiva.consumers.DatabaseUnprocessedArtifactConsumer;
import org.apache.maven.archiva.consumers.InvalidRepositoryContentConsumer;
import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
+import org.apache.maven.archiva.database.ArtifactDAO;
import org.apache.maven.archiva.database.updater.DatabaseConsumers;
+import org.apache.maven.archiva.model.ArchivaArtifact;
+import org.apache.maven.archiva.model.ArchivaArtifactModel;
+import org.apache.maven.archiva.model.ArtifactReference;
+import org.apache.maven.archiva.repository.RepositoryContentFactory;
+import
org.apache.maven.archiva.repository.content.ManagedDefaultRepositoryContent;
+import
org.apache.maven.archiva.repository.content.ManagedLegacyRepositoryContent;
+import org.apache.maven.archiva.repository.content.PathParser;
+import org.apache.maven.archiva.repository.layout.LayoutException;
import org.apache.maven.archiva.repository.scanner.RepositoryContentConsumers;
import org.apache.maven.archiva.scheduled.ArchivaTaskScheduler;
import org.apache.maven.archiva.scheduled.tasks.DatabaseTask;
@@ -98,6 +109,19 @@
private DatabaseCleanupConsumer cleanupIndexConsumer;
private DatabaseCleanupConsumer cleanupDbConsumer;
+
+ // delete artifact
+ private MockControl repoFactoryControl;
+
+ private RepositoryContentFactory repositoryFactory;
+
+ private MockControl artifactDaoControl;
+
+ private ArtifactDAO artifactDao;
+
+ private MockControl cleanupControl;
+
+ private DatabaseCleanupConsumer cleanupConsumer;
protected void setUp()
throws Exception
@@ -137,11 +161,25 @@
processArtifactConsumer = ( DatabaseUnprocessedArtifactConsumer )
unprocessedConsumersControl.getMock();
processPomConsumer = ( DatabaseUnprocessedArtifactConsumer )
unprocessedConsumersControl.getMock();
+ // delete artifact
+ repoFactoryControl = MockClassControl.createControl(
RepositoryContentFactory.class );
+ repositoryFactory = ( RepositoryContentFactory )
repoFactoryControl.getMock();
+
+ artifactDaoControl = MockControl.createControl( ArtifactDAO.class );
+ artifactDao = ( ArtifactDAO ) artifactDaoControl.getMock();
+
+ cleanupControl = MockClassControl.createControl(
DatabaseCleanupConsumer.class );
+ cleanupConsumer = ( DatabaseCleanupConsumer ) cleanupControl.getMock();
+
service = new AdministrationServiceImpl();
service.setArchivaConfiguration( archivaConfig );
service.setRepoConsumersUtil( repoConsumersUtil );
service.setDbConsumersUtil( dbConsumersUtil );
service.setTaskScheduler( taskScheduler );
+ service.setRepoFactory( repositoryFactory );
+ service.setArtifactDAO( artifactDao );
+ service.setCleanupArtifacts( cleanupConsumer );
+ service.setCleanupProjects( cleanupConsumer );
}
/* Tests for database consumers */
@@ -420,19 +458,37 @@
/* Tests for delete artifact */
- /* public void testDeleteArtifactArtifactExists()
+ public void testDeleteM2ArtifactArtifactExists()
throws Exception
{
+ File file = new File( getBasedir(),
"/target/test-classes/default-repo/" );
+ assertTrue( file.exists() );
+
+ ManagedRepositoryConfiguration managedRepo = createManagedRepo(
"internal", "default", "Internal Repository", true, false );
+ managedRepo.setLocation( file.getAbsolutePath() );
+
archivaConfigControl.expectAndReturn(
archivaConfig.getConfiguration(), config );
- configControl.expectAndReturn( config.findManagedRepositoryById(
"internal" ),
- createManagedRepo( "internal",
"default", "Internal Repository", true, false ) );
+ configControl.expectAndReturn( config.findManagedRepositoryById(
"internal" ), managedRepo );
- // TODO
- // - mock checking of artifact existence in the repo
- // - mock artifact delete
+ ManagedDefaultRepositoryContent repoContent = new
ManagedDefaultRepositoryContent();
+ repoContent.setRepository( managedRepo );
+
+ repoFactoryControl.expectAndReturn(
repositoryFactory.getManagedRepositoryContent( "internal" ), repoContent );
+
+ List<ArchivaArtifact> artifacts = getArtifacts();
+ artifactDao.queryArtifacts( null );
+ artifactDaoControl.setMatcher( MockControl.ALWAYS_MATCHER );
+ artifactDaoControl.setReturnValue( artifacts );
+
+ cleanupConsumer.processArchivaArtifact( artifacts.get( 0 ) );
+ cleanupControl.setVoidCallable( 2 );
+
archivaConfigControl.replay();
configControl.replay();
+ repoFactoryControl.replay();
+ artifactDaoControl.replay();
+ cleanupControl.replay();
try
{
@@ -440,29 +496,115 @@
assertTrue( success );
}
catch ( Exception e )
- {
+ {
fail( "An exception should not have been thrown." );
}
archivaConfigControl.verify();
configControl.verify();
+ repoFactoryControl.verify();
+ artifactDaoControl.verify();
+ cleanupControl.verify();
+
+ assertFalse( new File( getBasedir(),
"/target/test-classes/default-repo/org/apache/archiva/archiva-test/1.0"
).exists() );
+ assertTrue( new File( getBasedir(),
"/target/test-classes/default-repo/org/apache/archiva/archiva-test/1.1"
).exists() );
}
+ public void testDeleteM1ArtifactArtifactExists()
+ throws Exception
+ {
+ MockControl fileTypesControl = MockClassControl.createControl(
FileTypes.class );
+ FileTypes fileTypes = ( FileTypes ) fileTypesControl.getMock();
+
+ MockControl pathParserControl = MockClassControl.createControl(
PathParser.class );
+ PathParser parser = ( PathParser ) pathParserControl.getMock();
+
+ File file = new File( getBasedir(),
"/target/test-classes/legacy-repo/" );
+ assertTrue( file.exists() );
+
+ ManagedRepositoryConfiguration managedRepo = createManagedRepo(
"internal", "legacy", "Internal Repository", true, false );
+ managedRepo.setLocation( file.getAbsolutePath() );
+
+ archivaConfigControl.expectAndReturn(
archivaConfig.getConfiguration(), config );
+ configControl.expectAndReturn( config.findManagedRepositoryById(
"internal" ), managedRepo );
+
+ ManagedLegacyRepositoryContent repoContent = new
ManagedLegacyRepositoryContent();
+ repoContent.setRepository( managedRepo );
+ repoContent.setFileTypes( fileTypes );
+ repoContent.setLegacyPathParser( parser );
+
+ repoFactoryControl.expectAndReturn(
repositoryFactory.getManagedRepositoryContent( "internal" ), repoContent );
+
+ recordInManagedLegacyRepoContent( fileTypesControl, fileTypes,
pathParserControl, parser );
+
+ List<ArchivaArtifact> artifacts = getArtifacts();
+
+ artifactDao.queryArtifacts( null );
+ artifactDaoControl.setMatcher( MockControl.ALWAYS_MATCHER );
+ artifactDaoControl.setReturnValue( artifacts );
+
+ cleanupConsumer.processArchivaArtifact( artifacts.get( 0 ) );
+ cleanupControl.setVoidCallable( 2 );
+
+ archivaConfigControl.replay();
+ configControl.replay();
+ repoFactoryControl.replay();
+ artifactDaoControl.replay();
+ cleanupControl.replay();
+ fileTypesControl.replay();
+ pathParserControl.replay();
+
+ try
+ {
+ boolean success = service.deleteArtifact( "internal",
"org.apache.archiva", "archiva-test", "1.0" );
+ assertTrue( success );
+ }
+ catch ( Exception e )
+ {
+ fail( "An exception should not have been thrown." );
+ }
+
+ archivaConfigControl.verify();
+ configControl.verify();
+ repoFactoryControl.verify();
+ artifactDaoControl.verify();
+ cleanupControl.verify();
+ fileTypesControl.verify();
+ pathParserControl.verify();
+
+ assertFalse( new File( getBasedir(),
"/target/test-classes/legacy-repo/org.apache.archiva/jars/archiva-test-1.0.jar"
).exists() );
+ assertFalse( new File( getBasedir(),
"/target/test-classes/legacy-repo/org.apache.archiva/poms/archiva-test-1.0.pom"
).exists() );
+
+ assertTrue( new File( getBasedir(),
"/target/test-classes/legacy-repo/org.apache.archiva/jars/archiva-test-1.1.jar"
).exists() );
+ assertTrue( new File( getBasedir(),
"/target/test-classes/legacy-repo/org.apache.archiva/jars/archiva-diff-1.0.jar"
).exists() );
+ assertTrue( new File( getBasedir(),
"/target/test-classes/legacy-repo/org.apache.archiva/poms/archiva-test-1.1.pom"
).exists() );
+ assertTrue( new File( getBasedir(),
"/target/test-classes/legacy-repo/org.apache.archiva/poms/archiva-diff-1.0.pom"
).exists() );
+ }
+
public void testDeleteArtifactArtifactDoesNotExist()
throws Exception
{
+ File file = new File( getBasedir(),
"/target/test-classes/default-repo/" );
+ assertTrue( file.exists() );
+
+ ManagedRepositoryConfiguration managedRepo = createManagedRepo(
"internal", "default", "Internal Repository", true, false );
+ managedRepo.setLocation( file.getAbsolutePath() );
+
archivaConfigControl.expectAndReturn(
archivaConfig.getConfiguration(), config );
- configControl.expectAndReturn( config.findManagedRepositoryById(
"internal" ),
- createManagedRepo( "internal",
"default", "Internal Repository", true, false ) );
+ configControl.expectAndReturn( config.findManagedRepositoryById(
"internal" ), managedRepo );
+
+ ManagedDefaultRepositoryContent repoContent = new
ManagedDefaultRepositoryContent();
+ repoContent.setRepository( managedRepo );
- // TODO mock checking of artifact existence in the repo
+ repoFactoryControl.expectAndReturn(
repositoryFactory.getManagedRepositoryContent( "internal" ), repoContent );
archivaConfigControl.replay();
configControl.replay();
+ repoFactoryControl.replay();
try
{
- service.deleteArtifact( "internal", "org.apache.archiva",
"archiva-test", "1.0" );
+ service.deleteArtifact( "internal", "org.apache.archiva",
"archiva-non-existing", "1.0" );
fail( "An exception should have been thrown." );
}
catch ( Exception e )
@@ -472,20 +614,21 @@
archivaConfigControl.verify();
configControl.verify();
+ repoFactoryControl.verify();
}
public void testDeleteArtifacRepositoryDoesNotExist()
throws Exception
- {
+ {
archivaConfigControl.expectAndReturn(
archivaConfig.getConfiguration(), config );
- configControl.expectAndReturn( config.findManagedRepositoryById(
"internal" ), null );
+ configControl.expectAndReturn( config.findManagedRepositoryById(
"non-existing-repo" ), null );
archivaConfigControl.replay();
configControl.replay();
try
{
- service.deleteArtifact( "internal", "org.apache.archiva",
"archiva-test", "1.0" );
+ service.deleteArtifact( "non-existing-repo", "org.apache.archiva",
"archiva-test", "1.0" );
fail( "An exception should have been thrown." );
}
catch ( Exception e )
@@ -496,7 +639,6 @@
archivaConfigControl.verify();
configControl.verify();
}
- */
/* Tests for repository scanning */
@@ -757,4 +899,61 @@
unprocessedConsumersControl.expectAndReturn(
processArtifactConsumer.getId(), "process-artifact" );
unprocessedConsumersControl.expectAndReturn(
processPomConsumer.getId(), "process-pom" );
}
+
+ private List<ArchivaArtifact> getArtifacts()
+ {
+ List<ArchivaArtifact> artifacts = new ArrayList<ArchivaArtifact>();
+
+ ArchivaArtifactModel model = new ArchivaArtifactModel();
+ model.setRepositoryId( "internal" );
+ model.setGroupId( "org.apache.archiva" );
+ model.setArtifactId( "archiva-test" );
+ model.setVersion( "1.0" );
+ model.setType( "jar" );
+
+ ArchivaArtifact artifact = new ArchivaArtifact( model );
+ artifacts.add( artifact );
+ return artifacts;
+ }
+
+ private void recordInManagedLegacyRepoContent( MockControl
fileTypesControl, FileTypes fileTypes,
+ MockControl
pathParserControl, PathParser parser )
+ throws LayoutException
+ {
+ fileTypesControl.expectAndReturn( fileTypes.matchesArtifactPattern(
"org.apache.archiva/poms/archiva-test-1.0.pom" ), true );
+ fileTypesControl.expectAndReturn( fileTypes.matchesArtifactPattern(
"org.apache.archiva/poms/archiva-test-1.1.pom" ), true );
+ fileTypesControl.expectAndReturn( fileTypes.matchesArtifactPattern(
"org.apache.archiva/poms/archiva-diff-1.0.pom" ), true );
+ fileTypesControl.expectAndReturn( fileTypes.matchesArtifactPattern(
"org.apache.archiva/jars/archiva-diff-1.0.jar" ), true );
+ fileTypesControl.expectAndReturn( fileTypes.matchesArtifactPattern(
"org.apache.archiva/jars/archiva-test-1.0.jar" ), true );
+ fileTypesControl.expectAndReturn( fileTypes.matchesArtifactPattern(
"org.apache.archiva/jars/archiva-test-1.1.jar" ), true );
+
+ ArtifactReference aRef = createArtifactReference("archiva-test",
"org.apache.archiva", "1.1", "pom");
+ pathParserControl.expectAndReturn( parser.toArtifactReference(
"org.apache.archiva/poms/archiva-test-1.1.pom" ), aRef );
+
+ aRef = createArtifactReference("archiva-test", "org.apache.archiva",
"1.0", "pom");
+ pathParserControl.expectAndReturn( parser.toArtifactReference(
"org.apache.archiva/poms/archiva-test-1.0.pom" ), aRef );
+
+ aRef = createArtifactReference("archiva-diff", "org.apache.archiva",
"1.0", "pom");
+ pathParserControl.expectAndReturn( parser.toArtifactReference(
"org.apache.archiva/poms/archiva-diff-1.0.pom" ), aRef );
+
+ aRef = createArtifactReference("archiva-diff", "org.apache.archiva",
"1.0", "jar");
+ pathParserControl.expectAndReturn( parser.toArtifactReference(
"org.apache.archiva/jars/archiva-diff-1.0.jar" ), aRef );
+
+ aRef = createArtifactReference("archiva-test", "org.apache.archiva",
"1.0", "jar");
+ pathParserControl.expectAndReturn( parser.toArtifactReference(
"org.apache.archiva/jars/archiva-test-1.0.jar" ), aRef );
+
+ aRef = createArtifactReference("archiva-test", "org.apache.archiva",
"1.1", "jar");
+ pathParserControl.expectAndReturn( parser.toArtifactReference(
"org.apache.archiva/jars/archiva-test-1.1.jar" ), aRef );
+ }
+
+ private ArtifactReference createArtifactReference( String artifactId,
String groupId, String version, String type )
+ {
+ ArtifactReference aRef = new ArtifactReference();
+ aRef.setArtifactId( artifactId );
+ aRef.setGroupId( groupId );
+ aRef.setType( type );
+ aRef.setVersion( version );
+
+ return aRef;
+ }
}
\ No newline at end of file
Added:
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/default-repo/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.jar
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/default-repo/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.jar?rev=703920&view=auto
==============================================================================
(empty)
Added:
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/default-repo/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.jar.md5
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/default-repo/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.jar.md5?rev=703920&view=auto
==============================================================================
(empty)
Added:
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/default-repo/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.jar.sha1
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/default-repo/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.jar.sha1?rev=703920&view=auto
==============================================================================
(empty)
Added:
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/default-repo/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.pom
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/default-repo/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.pom?rev=703920&view=auto
==============================================================================
(empty)
Added:
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/default-repo/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.pom.md5
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/default-repo/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.pom.md5?rev=703920&view=auto
==============================================================================
(empty)
Added:
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/default-repo/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.pom.sha1
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/default-repo/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.pom.sha1?rev=703920&view=auto
==============================================================================
(empty)
Added:
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/default-repo/org/apache/archiva/archiva-test/1.0/maven-metadata.xml
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/default-repo/org/apache/archiva/archiva-test/1.0/maven-metadata.xml?rev=703920&view=auto
==============================================================================
(empty)
Added:
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/default-repo/org/apache/archiva/archiva-test/1.0/maven-metadata.xml.md5
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/default-repo/org/apache/archiva/archiva-test/1.0/maven-metadata.xml.md5?rev=703920&view=auto
==============================================================================
(empty)
Added:
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/default-repo/org/apache/archiva/archiva-test/1.0/maven-metadata.xml.sha1
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/default-repo/org/apache/archiva/archiva-test/1.0/maven-metadata.xml.sha1?rev=703920&view=auto
==============================================================================
(empty)
Added:
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/default-repo/org/apache/archiva/archiva-test/1.1/archiva-test-1.1.jar
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/default-repo/org/apache/archiva/archiva-test/1.1/archiva-test-1.1.jar?rev=703920&view=auto
==============================================================================
(empty)
Added:
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/default-repo/org/apache/archiva/archiva-test/1.1/archiva-test-1.1.pom
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/default-repo/org/apache/archiva/archiva-test/1.1/archiva-test-1.1.pom?rev=703920&view=auto
==============================================================================
(empty)
Added:
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/legacy-repo/org.apache.archiva/jars/archiva-diff-1.0.jar
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/legacy-repo/org.apache.archiva/jars/archiva-diff-1.0.jar?rev=703920&view=auto
==============================================================================
(empty)
Added:
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/legacy-repo/org.apache.archiva/jars/archiva-test-1.0.jar
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/legacy-repo/org.apache.archiva/jars/archiva-test-1.0.jar?rev=703920&view=auto
==============================================================================
(empty)
Added:
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/legacy-repo/org.apache.archiva/jars/archiva-test-1.1.jar
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/legacy-repo/org.apache.archiva/jars/archiva-test-1.1.jar?rev=703920&view=auto
==============================================================================
(empty)
Added:
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/legacy-repo/org.apache.archiva/poms/archiva-diff-1.0.pom
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/legacy-repo/org.apache.archiva/poms/archiva-diff-1.0.pom?rev=703920&view=auto
==============================================================================
(empty)
Added:
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/legacy-repo/org.apache.archiva/poms/archiva-test-1.0.pom
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/legacy-repo/org.apache.archiva/poms/archiva-test-1.0.pom?rev=703920&view=auto
==============================================================================
(empty)
Added:
archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/legacy-repo/org.apache.archiva/poms/archiva-test-1.1.pom
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/resources/legacy-repo/org.apache.archiva/poms/archiva-test-1.1.pom?rev=703920&view=auto
==============================================================================
(empty)
